diff --git a/README.md b/README.md
index c39edb8..0864166 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ An HTML5 web component for editing/viewing [RDF](https://www.w3.org/RDF/) data t
 <html>
   <head>
     <!-- load web component -->
-    <script src="https://cdn.jsdelivr.net/npm/@ulb-darmstadt/shacl-form/dist/index.js" type="module"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@ulb-darmstadt/shacl-form/dist/form-default.js" type="module"></script>
   </head>
   <body>
     <!--
@@ -63,7 +63,7 @@ data-language | Language to use if shapes contain langStrings, e.g. in `sh:name`
 data-loading | Text to display while the web component is initializing. Default: `"Loading..."`
 data&#x2011;ignore&#x2011;owl&#x2011;imports | By default, `owl:imports` URLs are fetched and the resulting RDF triples are added to the shapes graph. Setting this attribute to any value disables this feature
 data-mode | When set to `"view"`, turns the web component into a viewer that displays the given data graph without editing functionality
-data-collapse | When this attribute is present, `sh:group`s and properties with `sh:node` and `sh:maxCount` > 1 are displayed in a collapsible accordion-like widget to reduce visual complexity of the form. The collapsible element is initially shown closed, except when the attribute value is `"open"`
+data-collapse | When this attribute is present, `sh:group`s and properties with `sh:node` and `sh:maxCount` > 1 are displayed in a collapsible accordion-like widget to reduce visual complexity of the form. The collapsible element is initially shown closed, except when this attribute's value is `"open"`
 data-submit-button | [Only used in edit mode] Whether to add a submit button to the form. The value of this attribute is used as the button label. `submit` events will only fire after successful validation
 
 ### Element functions
@@ -101,8 +101,8 @@ Class hierarchies can be built using `rdfs:subClassOf` or `skos:broader`.
 
 Theme | Import statement
 --- | ---
-Default (custom CSS) | `import '@ulb-darmstadt/shacl-form/index.js'`
-[Bootstrap](./src/themes/bootstrap.ts) [alpha status] | `import '@ulb-darmstadt/shacl-form/bootstrap.js'`
-[Material Design](./src/themes/material.ts) [alpha status] | `import '@ulb-darmstadt/shacl-form/material.js'`
+Default (slightly customized default browser styles) | `import '@ulb-darmstadt/shacl-form/form-default.js'`
+[Bootstrap](./src/themes/bootstrap.ts) [alpha status] | `import '@ulb-darmstadt/shacl-form/form-bootstrap.js'`
+[Material Design](./src/themes/material.ts) [alpha status] | `import '@ulb-darmstadt/shacl-form/form-material.js'`
 
 Custom themes can be employed by extending class [Theme](./src/theme.ts), then calling function `setTheme()` on the `<shacl-form>` element.
\ No newline at end of file
diff --git a/demo/theme-bootstrap.html b/demo/theme-bootstrap.html
index f42d5ce..46646d6 100644
--- a/demo/theme-bootstrap.html
+++ b/demo/theme-bootstrap.html
@@ -8,7 +8,7 @@
             }
             body { font-family: sans-serif; }
         </style>
-        <script type="module" src="https://cdn.jsdelivr.net/npm/@ulb-darmstadt/shacl-form/dist/bootstrap.js"></script>
+        <script type="module" src="https://cdn.jsdelivr.net/npm/@ulb-darmstadt/shacl-form/dist/form-bootstrap.js"></script>
     </head>
     <body>
         <shacl-form id="shacl-form" data-shapes-url="complex-example.ttl" data-submit-button></shacl-form>
diff --git a/demo/theme-default.html b/demo/theme-default.html
index 54a4172..1ee5ad5 100644
--- a/demo/theme-default.html
+++ b/demo/theme-default.html
@@ -4,7 +4,7 @@
         <style>
             body { font-family: sans-serif; }
         </style>
-        <script type="module" src="https://cdn.jsdelivr.net/npm/@ulb-darmstadt/shacl-form/dist/index.js"></script>
+        <script type="module" src="https://cdn.jsdelivr.net/npm/@ulb-darmstadt/shacl-form/dist/form-default.js"></script>
     </head>
     <body>
         <shacl-form id="shacl-form" data-shapes-url="complex-example.ttl" data-submit-button></shacl-form>
diff --git a/demo/theme-material.html b/demo/theme-material.html
index 1a77282..63fb648 100644
--- a/demo/theme-material.html
+++ b/demo/theme-material.html
@@ -5,7 +5,7 @@
             body { font-family: sans-serif; }
         </style>
         <link href=" https://cdn.jsdelivr.net/npm/roboto-font@0.1.0/css/fonts.min.css " rel="stylesheet">
-        <script type="module" src="https://cdn.jsdelivr.net/npm/@ulb-darmstadt/shacl-form/dist/material.js"></script>
+        <script type="module" src="https://cdn.jsdelivr.net/npm/@ulb-darmstadt/shacl-form/dist/form-material.js"></script>
     </head>
     <body>
         <shacl-form id="shacl-form" data-shapes-url="complex-example.ttl" data-submit-button></shacl-form>
diff --git a/package-lock.json b/package-lock.json
index e5eaa81..9ef4a0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,25 +1,29 @@
 {
     "name": "@ulb-darmstadt/shacl-form",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@ulb-darmstadt/shacl-form",
-            "version": "1.2.1",
+            "version": "1.3.0",
             "license": "MIT",
             "dependencies": {
-                "@mapbox/mapbox-gl-draw": "^1.4.2",
+                "@mapbox/mapbox-gl-draw": "^1.4.3",
                 "@material/web": "^1.0.1",
                 "bootstrap": "^5.3.2",
                 "jsonld": "^8.3.1",
                 "mapbox-gl": "^2.15.0",
-                "n3": "^1.17.0",
-                "rdf-validate-shacl": "^0.4.5",
-                "uuid": "^9.0.0"
+                "n3": "^1.17.2",
+                "rdf-validate-shacl": "^0.5.1",
+                "uuid": "^9.0.1"
             },
             "devDependencies": {
+                "@types/jsonld": "^1.5.11",
+                "@types/mapbox__mapbox-gl-draw": "^1.4.5",
                 "@types/n3": "^1.16.0",
+                "@types/rdf-validate-shacl": "^0.4.5",
+                "@types/uuid": "^9.0.6",
                 "raw-loader": "^4.0.2",
                 "rimraf": "^5.0.1",
                 "ts-loader": "^9.4.4",
@@ -297,42 +301,81 @@
             }
         },
         "node_modules/@rdfjs/data-model": {
-            "version": "1.3.4",
-            "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-1.3.4.tgz",
-            "integrity": "sha512-iKzNcKvJotgbFDdti7GTQDCYmL7GsGldkYStiP0K8EYtN7deJu5t7U11rKTz+nR7RtesUggT+lriZ7BakFv8QQ==",
-            "dependencies": {
-                "@rdfjs/types": ">=1.0.1"
-            },
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-2.0.1.tgz",
+            "integrity": "sha512-oRDYpy7/fJ9NNjS+M7m+dbnhi4lOWYGbBiM/A+u9bBExnN6ifXUF5mUsFxwZaQulmwTDaMhKERdV6iKTBUMgtw==",
             "bin": {
                 "rdfjs-data-model-test": "bin/test.js"
             }
         },
         "node_modules/@rdfjs/dataset": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-1.1.1.tgz",
-            "integrity": "sha512-BNwCSvG0cz0srsG5esq6CQKJc1m8g/M0DZpLuiEp0MMpfwguXX7VeS8TCg4UUG3DV/DqEvhy83ZKSEjdsYseeA==",
-            "dependencies": {
-                "@rdfjs/data-model": "^1.2.0"
-            },
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-2.0.1.tgz",
+            "integrity": "sha512-hDIaXpUmU/ZdofX/BMFDAchkhN/AjmP5dMCOuVL2VCqWuFjeQxd2KV84E4+7S2Biw8tjEFhPBeQZP7KW+ARV7Q==",
             "bin": {
                 "rdfjs-dataset-test": "bin/test.js"
             }
         },
-        "node_modules/@rdfjs/namespace": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@rdfjs/namespace/-/namespace-1.1.0.tgz",
-            "integrity": "sha512-utO5rtaOKxk8B90qzaQ0N+J5WrCI28DtfAY/zExCmXE7cOfC5uRI/oMKbLaVEPj2P7uArekt/T4IPATtj7Tjug==",
+        "node_modules/@rdfjs/environment": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/@rdfjs/environment/-/environment-0.1.2.tgz",
+            "integrity": "sha512-R4N73kaoaOt3XvgLy2Cb98bJUgMJv/wRsUPGDxeogbtalkENPmo3X5to/rKQEwOjnj+jw+ILzN2webUHb8pvEw==",
             "dependencies": {
-                "@rdfjs/data-model": "^1.1.0"
-            },
+                "@rdfjs/data-model": "^2.0.1",
+                "@rdfjs/dataset": "^2.0.1",
+                "@rdfjs/fetch-lite": "^3.2.1",
+                "@rdfjs/namespace": "^2.0.0",
+                "@rdfjs/sink-map": "^2.0.0",
+                "@rdfjs/term-map": "^2.0.0",
+                "@rdfjs/term-set": "^2.0.1"
+            }
+        },
+        "node_modules/@rdfjs/fetch-lite": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/@rdfjs/fetch-lite/-/fetch-lite-3.2.1.tgz",
+            "integrity": "sha512-cnCuSkEpMGsSbkd3+bIKheCKTDE4iBSGG6l/Inp0qg4y5WMLtcffKtSUzWhq09cAajm0dWs+5W3EGPNBqF5A4w==",
+            "dependencies": {
+                "is-stream": "^3.0.0",
+                "nodeify-fetch": "^3.1.0",
+                "readable-stream": "^4.2.0"
+            }
+        },
+        "node_modules/@rdfjs/fetch-lite/node_modules/is-stream": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+            "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
             "engines": {
-                "node": ">=6"
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@rdfjs/namespace": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@rdfjs/namespace/-/namespace-2.0.0.tgz",
+            "integrity": "sha512-cBBvNrlSOah4z7u2vS74Lxng/ivELy6tNPjx+G/Ag14up8z5xmX8njn+U/mJ+nlcXO7nDGK4rgaAq7jtl9S3CQ==",
+            "dependencies": {
+                "@rdfjs/data-model": "^2.0.0"
+            }
+        },
+        "node_modules/@rdfjs/sink-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@rdfjs/sink-map/-/sink-map-2.0.0.tgz",
+            "integrity": "sha512-5Ahs1Ky6fglsqewpo89K7CFxD4EvFvAHdI/E5HJTu0L4tCUlvnZsmyKem4iYPDWdwsKplmUdORonUz75qPgd1g=="
+        },
+        "node_modules/@rdfjs/term-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@rdfjs/term-map/-/term-map-2.0.0.tgz",
+            "integrity": "sha512-z0K8AgLsJGTrh+dGkXNl/oT9vBdMei4xq1MIeGN360oimA81Q+ruQUKFCbYNRRZS03tVHPBzqXUal/DezFGPEA==",
+            "dependencies": {
+                "@rdfjs/to-ntriples": "^2.0.0"
             }
         },
         "node_modules/@rdfjs/term-set": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@rdfjs/term-set/-/term-set-1.1.0.tgz",
-            "integrity": "sha512-QQ4yzVe1Rvae/GN9SnOhweHNpaxQtnAjeOVciP/yJ0Gfxtbphy2tM56ZsRLV04Qq5qMcSclZIe6irYyEzx/UwQ==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@rdfjs/term-set/-/term-set-2.0.1.tgz",
+            "integrity": "sha512-ZD8IwSY7tPpevs2iaQEsesAu8c7TO4GKHQHObbehUE4odKa9BuhuimdNuYwBoyVprTtHARaW6VW+0Jsu7ehD+Q==",
             "dependencies": {
                 "@rdfjs/to-ntriples": "^2.0.0"
             }
@@ -350,6 +393,18 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/@tpluscode/rdf-ns-builders": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@tpluscode/rdf-ns-builders/-/rdf-ns-builders-4.2.0.tgz",
+            "integrity": "sha512-vSl+/38M3GKUV2mJ5HXfCxLUkoI3baRrBgLZnCKQPQUsptxzQGRxxIKFVHIIC3Dv+VA6V21/XLPl5Hik+nyRQQ==",
+            "dependencies": {
+                "@rdfjs/data-model": "^2",
+                "@rdfjs/namespace": "^2",
+                "@rdfjs/types": "*",
+                "@types/rdfjs__namespace": "^2.0.2",
+                "@zazuko/prefixes": "^2.0.1"
+            }
+        },
         "node_modules/@types/body-parser": {
             "version": "1.19.4",
             "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
@@ -369,6 +424,15 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/@types/clownface": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@types/clownface/-/clownface-2.0.3.tgz",
+            "integrity": "sha512-QTgH8F01lV29LSNvM6KVVdZVWaDcQ47JEZeeKp3ksRpoE5fOayXnt+3Yp+kdU4H/cpSM1KmKY6UiXVjUqYXwRg==",
+            "dev": true,
+            "dependencies": {
+                "rdf-js": "^4.0.2"
+            }
+        },
         "node_modules/@types/connect": {
             "version": "3.4.37",
             "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz",
@@ -438,6 +502,12 @@
                 "@types/send": "*"
             }
         },
+        "node_modules/@types/geojson": {
+            "version": "7946.0.12",
+            "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.12.tgz",
+            "integrity": "sha512-uK2z1ZHJyC0nQRbuovXFt4mzXDwf27vQeUWNhfKGwRcWW429GOhP8HxUHlM6TLH4bzmlv/HlEjpvJh3JfmGsAA==",
+            "dev": true
+        },
         "node_modules/@types/http-errors": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz",
@@ -459,6 +529,31 @@
             "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==",
             "dev": true
         },
+        "node_modules/@types/jsonld": {
+            "version": "1.5.11",
+            "resolved": "https://registry.npmjs.org/@types/jsonld/-/jsonld-1.5.11.tgz",
+            "integrity": "sha512-/B5yjthc6MEJMR4+TUtaj5LgE3bByVSNIXvPcUxiecj5F7GZKQJS5oery5rbOni7T9QBpjDF0RufCcVVlCe4hw==",
+            "dev": true
+        },
+        "node_modules/@types/mapbox__mapbox-gl-draw": {
+            "version": "1.4.5",
+            "resolved": "https://registry.npmjs.org/@types/mapbox__mapbox-gl-draw/-/mapbox__mapbox-gl-draw-1.4.5.tgz",
+            "integrity": "sha512-TnJMtupXFJQMdVasqJyJYuNuFthyW0TurJ1hyT1ccNxkTH1osQYH2VM2PlJcB8B0rFPv6pl3YjW/PJv+6EKIOg==",
+            "dev": true,
+            "dependencies": {
+                "@types/geojson": "*",
+                "@types/mapbox-gl": "*"
+            }
+        },
+        "node_modules/@types/mapbox-gl": {
+            "version": "2.7.17",
+            "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.17.tgz",
+            "integrity": "sha512-5lDO2W6glPCqiRuqKh0a7MPOwnVt1/KWcYnxsL3z5rmjuOcFdHEa+KzUwCzqsAlbAegIIhgQiREZzJ9o1ze1gQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/geojson": "*"
+            }
+        },
         "node_modules/@types/mime": {
             "version": "1.3.4",
             "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz",
@@ -495,6 +590,25 @@
             "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==",
             "dev": true
         },
+        "node_modules/@types/rdf-validate-shacl": {
+            "version": "0.4.5",
+            "resolved": "https://registry.npmjs.org/@types/rdf-validate-shacl/-/rdf-validate-shacl-0.4.5.tgz",
+            "integrity": "sha512-FZJofxrEP4Ak4nR16RzfcLpmmVMFoc4rXAsapm1s9Rn45bxPikcm+UGjGyoGRSGheSb0HoZAWDSF+00tZwXhEg==",
+            "dev": true,
+            "dependencies": {
+                "@rdfjs/types": "*",
+                "@types/clownface": "*",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/rdfjs__namespace": {
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/@types/rdfjs__namespace/-/rdfjs__namespace-2.0.8.tgz",
+            "integrity": "sha512-py5L7+crlnuhd86DSxkw8jDAIHLf5YNfSXiLM5fe0aleleoP9X/L15Zrbz9k2Yr3ODY+lhboOLVGyyhfH43/Sw==",
+            "dependencies": {
+                "@rdfjs/types": "*"
+            }
+        },
         "node_modules/@types/retry": {
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
@@ -545,6 +659,12 @@
             "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.5.tgz",
             "integrity": "sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA=="
         },
+        "node_modules/@types/uuid": {
+            "version": "9.0.6",
+            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.6.tgz",
+            "integrity": "sha512-BT2Krtx4xaO6iwzwMFUYvWBWkV2pr37zD68Vmp1CDV196MzczBRxuEpD6Pr395HAgebC/co7hOphs53r8V7jew==",
+            "dev": true
+        },
         "node_modules/@types/ws": {
             "version": "8.5.8",
             "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
@@ -554,6 +674,11 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/@vocabulary/sh": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@vocabulary/sh/-/sh-1.1.3.tgz",
+            "integrity": "sha512-ofUNi/TS8ppI4Z/PPPSpmkJ65jXLIdTv+T8pLrz8wYeTV8JHA4eQLErwLuawktKDKXVWdMR4L9boHa3Xi5IKGw=="
+        },
         "node_modules/@webassemblyjs/ast": {
             "version": "1.11.6",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
@@ -756,6 +881,11 @@
             "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
             "dev": true
         },
+        "node_modules/@zazuko/prefixes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/@zazuko/prefixes/-/prefixes-2.1.0.tgz",
+            "integrity": "sha512-dm0/YBNzuwJUm8cXoF3Dn9DfQetnRDaOJ8NdlgLY645OaUddCzUAAYcanm+xZmEo1SWX+/Tp3jbScwCaN2b/aQ=="
+        },
         "node_modules/abort-controller": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
@@ -1247,12 +1377,11 @@
             }
         },
         "node_modules/clownface": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/clownface/-/clownface-1.5.1.tgz",
-            "integrity": "sha512-Ko8N/UFsnhEGmPlyE1bUFhbRhVgDbxqlIjcqxtLysc4dWaY0A7iCdg3savhAxs7Lheb7FCygIyRh7ADYZWVIng==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/clownface/-/clownface-2.0.1.tgz",
+            "integrity": "sha512-8RVfn/LZEl7BTDhIEIamz13Bhm5YahA1qiJigMb0HYGaiKnsVV0PpLBz0kzqyAI0+IzOlYbCLMFOAc1dkQfwgQ==",
             "dependencies": {
-                "@rdfjs/data-model": "^1.1.0",
-                "@rdfjs/namespace": "^1.0.0"
+                "@rdfjs/environment": "^0.1.2"
             }
         },
         "node_modules/color-convert": {
@@ -2741,6 +2870,11 @@
                 "node": ">=8"
             }
         },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+        },
         "node_modules/lodash.isequal": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
@@ -2950,9 +3084,9 @@
             "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw=="
         },
         "node_modules/n3": {
-            "version": "1.17.1",
-            "resolved": "https://registry.npmjs.org/n3/-/n3-1.17.1.tgz",
-            "integrity": "sha512-HlanMWpvN2kcTrFuU3GPObyY7qrVQWy2Hp7l4GSXJlcQapjQMR7OM4kCr788pTQzNIpiHS3JRvyZ2YUcYJ82rA==",
+            "version": "1.17.2",
+            "resolved": "https://registry.npmjs.org/n3/-/n3-1.17.2.tgz",
+            "integrity": "sha512-BxSM52wYFqXrbQQT5WUEzKUn6qpYV+2L4XZLfn3Gblz2kwZ09S+QxC33WNdVEQy2djenFL8SNkrjejEKlvI6+Q==",
             "dependencies": {
                 "queue-microtask": "^1.1.2",
                 "readable-stream": "^4.0.0"
@@ -3026,6 +3160,17 @@
             "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
             "dev": true
         },
+        "node_modules/nodeify-fetch": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/nodeify-fetch/-/nodeify-fetch-3.1.0.tgz",
+            "integrity": "sha512-ZV81vM//sEgTgXwVZlOONzcOCdTGQ53mV65FVSNXgPQHa8oCwRLtLbnGxL/1S/Yw90bcXUDKMz00jEnaeazo+A==",
+            "dependencies": {
+                "lodash": "^4.17.21",
+                "node-fetch": "^3.2.10",
+                "readable-stream": "^4.2.0",
+                "stream-chunks": "^1.0.0"
+            }
+        },
         "node_modules/normalize-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3463,6 +3608,15 @@
                 "@rdfjs/types": "*"
             }
         },
+        "node_modules/rdf-js": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/rdf-js/-/rdf-js-4.0.2.tgz",
+            "integrity": "sha512-ApvlFa/WsQh8LpPK/6hctQwG06Z9ztQQGWVtrcrf9L6+sejHNXLPOqL+w7q3hF+iL0C4sv3AX1PUtGkLNzyZ0Q==",
+            "dev": true,
+            "dependencies": {
+                "@rdfjs/types": "*"
+            }
+        },
         "node_modules/rdf-literal": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/rdf-literal/-/rdf-literal-1.3.1.tgz",
@@ -3473,29 +3627,27 @@
             }
         },
         "node_modules/rdf-validate-datatype": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/rdf-validate-datatype/-/rdf-validate-datatype-0.1.5.tgz",
-            "integrity": "sha512-gU+cD+AT1LpFwbemuEmTDjwLyFwJDiw21XHyIofKhFnEpXODjShBuxhgDGnZqW3qIEwu/vECjOecuD60e5ngiQ==",
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/rdf-validate-datatype/-/rdf-validate-datatype-0.2.0.tgz",
+            "integrity": "sha512-Ru7OcqxkPHgMwBrqw/RXCOqJ+hPaL1foelcgdDy5eFdNonP2D6YDLkYlODaeiSo2dgCnUvrD1k/QGi3Spa82fg==",
             "dependencies": {
-                "@rdfjs/namespace": "^1.1.0",
-                "@rdfjs/to-ntriples": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10.4"
+                "@rdfjs/term-map": "^2.0.0",
+                "@tpluscode/rdf-ns-builders": "3 - 4"
             }
         },
         "node_modules/rdf-validate-shacl": {
-            "version": "0.4.5",
-            "resolved": "https://registry.npmjs.org/rdf-validate-shacl/-/rdf-validate-shacl-0.4.5.tgz",
-            "integrity": "sha512-tGYnssuPzmsPua1dju4hEtGkT1zouvwzVTNrFhNiqj2aZFO5pQ7lvLd9Cv9H9vKAlpIdC/x0zL6btxG3PCss0w==",
-            "dependencies": {
-                "@rdfjs/dataset": "^1.1.1",
-                "@rdfjs/namespace": "^1.0.0",
-                "@rdfjs/term-set": "^1.1.0",
-                "clownface": "^1.4.0",
+            "version": "0.5.1",
+            "resolved": "https://registry.npmjs.org/rdf-validate-shacl/-/rdf-validate-shacl-0.5.1.tgz",
+            "integrity": "sha512-KpXLqfkf8BkNy4H7Yxhy+fd3BpedQpRIrPH0SoYhGBUhMR5JNNt8Va+eda1CsiA9DnnfDadXBxQVyKkuSFwhTA==",
+            "dependencies": {
+                "@rdfjs/environment": "^0.1.2",
+                "@rdfjs/namespace": "^2.0.0",
+                "@rdfjs/term-set": "^2.0.1",
+                "@vocabulary/sh": "^1.0.1",
+                "clownface": "^2.0.0",
                 "debug": "^4.3.2",
                 "rdf-literal": "^1.3.0",
-                "rdf-validate-datatype": "^0.1.5"
+                "rdf-validate-datatype": "^0.2.0"
             }
         },
         "node_modules/readable-stream": {
@@ -4048,6 +4200,15 @@
                 "node": ">= 0.8"
             }
         },
+        "node_modules/stream-chunks": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/stream-chunks/-/stream-chunks-1.0.0.tgz",
+            "integrity": "sha512-/G+kinLx3pKXChtuko82taA4gZo56zFG2b2BbhmugmS0TUPBL40c5b2vjonS+gAHYK/cSKM9m0WTvAJYgDUeNw==",
+            "dependencies": {
+                "buffer": "^6.0.3",
+                "string_decoder": "^1.3.0"
+            }
+        },
         "node_modules/string_decoder": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -5258,33 +5419,71 @@
             "peer": true
         },
         "@rdfjs/data-model": {
-            "version": "1.3.4",
-            "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-1.3.4.tgz",
-            "integrity": "sha512-iKzNcKvJotgbFDdti7GTQDCYmL7GsGldkYStiP0K8EYtN7deJu5t7U11rKTz+nR7RtesUggT+lriZ7BakFv8QQ==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-2.0.1.tgz",
+            "integrity": "sha512-oRDYpy7/fJ9NNjS+M7m+dbnhi4lOWYGbBiM/A+u9bBExnN6ifXUF5mUsFxwZaQulmwTDaMhKERdV6iKTBUMgtw=="
+        },
+        "@rdfjs/dataset": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-2.0.1.tgz",
+            "integrity": "sha512-hDIaXpUmU/ZdofX/BMFDAchkhN/AjmP5dMCOuVL2VCqWuFjeQxd2KV84E4+7S2Biw8tjEFhPBeQZP7KW+ARV7Q=="
+        },
+        "@rdfjs/environment": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/@rdfjs/environment/-/environment-0.1.2.tgz",
+            "integrity": "sha512-R4N73kaoaOt3XvgLy2Cb98bJUgMJv/wRsUPGDxeogbtalkENPmo3X5to/rKQEwOjnj+jw+ILzN2webUHb8pvEw==",
             "requires": {
-                "@rdfjs/types": ">=1.0.1"
+                "@rdfjs/data-model": "^2.0.1",
+                "@rdfjs/dataset": "^2.0.1",
+                "@rdfjs/fetch-lite": "^3.2.1",
+                "@rdfjs/namespace": "^2.0.0",
+                "@rdfjs/sink-map": "^2.0.0",
+                "@rdfjs/term-map": "^2.0.0",
+                "@rdfjs/term-set": "^2.0.1"
             }
         },
-        "@rdfjs/dataset": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-1.1.1.tgz",
-            "integrity": "sha512-BNwCSvG0cz0srsG5esq6CQKJc1m8g/M0DZpLuiEp0MMpfwguXX7VeS8TCg4UUG3DV/DqEvhy83ZKSEjdsYseeA==",
+        "@rdfjs/fetch-lite": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/@rdfjs/fetch-lite/-/fetch-lite-3.2.1.tgz",
+            "integrity": "sha512-cnCuSkEpMGsSbkd3+bIKheCKTDE4iBSGG6l/Inp0qg4y5WMLtcffKtSUzWhq09cAajm0dWs+5W3EGPNBqF5A4w==",
             "requires": {
-                "@rdfjs/data-model": "^1.2.0"
+                "is-stream": "^3.0.0",
+                "nodeify-fetch": "^3.1.0",
+                "readable-stream": "^4.2.0"
+            },
+            "dependencies": {
+                "is-stream": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+                    "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA=="
+                }
             }
         },
         "@rdfjs/namespace": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@rdfjs/namespace/-/namespace-1.1.0.tgz",
-            "integrity": "sha512-utO5rtaOKxk8B90qzaQ0N+J5WrCI28DtfAY/zExCmXE7cOfC5uRI/oMKbLaVEPj2P7uArekt/T4IPATtj7Tjug==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@rdfjs/namespace/-/namespace-2.0.0.tgz",
+            "integrity": "sha512-cBBvNrlSOah4z7u2vS74Lxng/ivELy6tNPjx+G/Ag14up8z5xmX8njn+U/mJ+nlcXO7nDGK4rgaAq7jtl9S3CQ==",
             "requires": {
-                "@rdfjs/data-model": "^1.1.0"
+                "@rdfjs/data-model": "^2.0.0"
+            }
+        },
+        "@rdfjs/sink-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@rdfjs/sink-map/-/sink-map-2.0.0.tgz",
+            "integrity": "sha512-5Ahs1Ky6fglsqewpo89K7CFxD4EvFvAHdI/E5HJTu0L4tCUlvnZsmyKem4iYPDWdwsKplmUdORonUz75qPgd1g=="
+        },
+        "@rdfjs/term-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@rdfjs/term-map/-/term-map-2.0.0.tgz",
+            "integrity": "sha512-z0K8AgLsJGTrh+dGkXNl/oT9vBdMei4xq1MIeGN360oimA81Q+ruQUKFCbYNRRZS03tVHPBzqXUal/DezFGPEA==",
+            "requires": {
+                "@rdfjs/to-ntriples": "^2.0.0"
             }
         },
         "@rdfjs/term-set": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@rdfjs/term-set/-/term-set-1.1.0.tgz",
-            "integrity": "sha512-QQ4yzVe1Rvae/GN9SnOhweHNpaxQtnAjeOVciP/yJ0Gfxtbphy2tM56ZsRLV04Qq5qMcSclZIe6irYyEzx/UwQ==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@rdfjs/term-set/-/term-set-2.0.1.tgz",
+            "integrity": "sha512-ZD8IwSY7tPpevs2iaQEsesAu8c7TO4GKHQHObbehUE4odKa9BuhuimdNuYwBoyVprTtHARaW6VW+0Jsu7ehD+Q==",
             "requires": {
                 "@rdfjs/to-ntriples": "^2.0.0"
             }
@@ -5302,6 +5501,18 @@
                 "@types/node": "*"
             }
         },
+        "@tpluscode/rdf-ns-builders": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@tpluscode/rdf-ns-builders/-/rdf-ns-builders-4.2.0.tgz",
+            "integrity": "sha512-vSl+/38M3GKUV2mJ5HXfCxLUkoI3baRrBgLZnCKQPQUsptxzQGRxxIKFVHIIC3Dv+VA6V21/XLPl5Hik+nyRQQ==",
+            "requires": {
+                "@rdfjs/data-model": "^2",
+                "@rdfjs/namespace": "^2",
+                "@rdfjs/types": "*",
+                "@types/rdfjs__namespace": "^2.0.2",
+                "@zazuko/prefixes": "^2.0.1"
+            }
+        },
         "@types/body-parser": {
             "version": "1.19.4",
             "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
@@ -5321,6 +5532,15 @@
                 "@types/node": "*"
             }
         },
+        "@types/clownface": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@types/clownface/-/clownface-2.0.3.tgz",
+            "integrity": "sha512-QTgH8F01lV29LSNvM6KVVdZVWaDcQ47JEZeeKp3ksRpoE5fOayXnt+3Yp+kdU4H/cpSM1KmKY6UiXVjUqYXwRg==",
+            "dev": true,
+            "requires": {
+                "rdf-js": "^4.0.2"
+            }
+        },
         "@types/connect": {
             "version": "3.4.37",
             "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz",
@@ -5390,6 +5610,12 @@
                 "@types/send": "*"
             }
         },
+        "@types/geojson": {
+            "version": "7946.0.12",
+            "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.12.tgz",
+            "integrity": "sha512-uK2z1ZHJyC0nQRbuovXFt4mzXDwf27vQeUWNhfKGwRcWW429GOhP8HxUHlM6TLH4bzmlv/HlEjpvJh3JfmGsAA==",
+            "dev": true
+        },
         "@types/http-errors": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz",
@@ -5411,6 +5637,31 @@
             "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==",
             "dev": true
         },
+        "@types/jsonld": {
+            "version": "1.5.11",
+            "resolved": "https://registry.npmjs.org/@types/jsonld/-/jsonld-1.5.11.tgz",
+            "integrity": "sha512-/B5yjthc6MEJMR4+TUtaj5LgE3bByVSNIXvPcUxiecj5F7GZKQJS5oery5rbOni7T9QBpjDF0RufCcVVlCe4hw==",
+            "dev": true
+        },
+        "@types/mapbox__mapbox-gl-draw": {
+            "version": "1.4.5",
+            "resolved": "https://registry.npmjs.org/@types/mapbox__mapbox-gl-draw/-/mapbox__mapbox-gl-draw-1.4.5.tgz",
+            "integrity": "sha512-TnJMtupXFJQMdVasqJyJYuNuFthyW0TurJ1hyT1ccNxkTH1osQYH2VM2PlJcB8B0rFPv6pl3YjW/PJv+6EKIOg==",
+            "dev": true,
+            "requires": {
+                "@types/geojson": "*",
+                "@types/mapbox-gl": "*"
+            }
+        },
+        "@types/mapbox-gl": {
+            "version": "2.7.17",
+            "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.17.tgz",
+            "integrity": "sha512-5lDO2W6glPCqiRuqKh0a7MPOwnVt1/KWcYnxsL3z5rmjuOcFdHEa+KzUwCzqsAlbAegIIhgQiREZzJ9o1ze1gQ==",
+            "dev": true,
+            "requires": {
+                "@types/geojson": "*"
+            }
+        },
         "@types/mime": {
             "version": "1.3.4",
             "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz",
@@ -5447,6 +5698,25 @@
             "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==",
             "dev": true
         },
+        "@types/rdf-validate-shacl": {
+            "version": "0.4.5",
+            "resolved": "https://registry.npmjs.org/@types/rdf-validate-shacl/-/rdf-validate-shacl-0.4.5.tgz",
+            "integrity": "sha512-FZJofxrEP4Ak4nR16RzfcLpmmVMFoc4rXAsapm1s9Rn45bxPikcm+UGjGyoGRSGheSb0HoZAWDSF+00tZwXhEg==",
+            "dev": true,
+            "requires": {
+                "@rdfjs/types": "*",
+                "@types/clownface": "*",
+                "@types/node": "*"
+            }
+        },
+        "@types/rdfjs__namespace": {
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/@types/rdfjs__namespace/-/rdfjs__namespace-2.0.8.tgz",
+            "integrity": "sha512-py5L7+crlnuhd86DSxkw8jDAIHLf5YNfSXiLM5fe0aleleoP9X/L15Zrbz9k2Yr3ODY+lhboOLVGyyhfH43/Sw==",
+            "requires": {
+                "@rdfjs/types": "*"
+            }
+        },
         "@types/retry": {
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
@@ -5497,6 +5767,12 @@
             "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.5.tgz",
             "integrity": "sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA=="
         },
+        "@types/uuid": {
+            "version": "9.0.6",
+            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.6.tgz",
+            "integrity": "sha512-BT2Krtx4xaO6iwzwMFUYvWBWkV2pr37zD68Vmp1CDV196MzczBRxuEpD6Pr395HAgebC/co7hOphs53r8V7jew==",
+            "dev": true
+        },
         "@types/ws": {
             "version": "8.5.8",
             "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
@@ -5506,6 +5782,11 @@
                 "@types/node": "*"
             }
         },
+        "@vocabulary/sh": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@vocabulary/sh/-/sh-1.1.3.tgz",
+            "integrity": "sha512-ofUNi/TS8ppI4Z/PPPSpmkJ65jXLIdTv+T8pLrz8wYeTV8JHA4eQLErwLuawktKDKXVWdMR4L9boHa3Xi5IKGw=="
+        },
         "@webassemblyjs/ast": {
             "version": "1.11.6",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
@@ -5685,6 +5966,11 @@
             "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
             "dev": true
         },
+        "@zazuko/prefixes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/@zazuko/prefixes/-/prefixes-2.1.0.tgz",
+            "integrity": "sha512-dm0/YBNzuwJUm8cXoF3Dn9DfQetnRDaOJ8NdlgLY645OaUddCzUAAYcanm+xZmEo1SWX+/Tp3jbScwCaN2b/aQ=="
+        },
         "abort-controller": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
@@ -6008,12 +6294,11 @@
             }
         },
         "clownface": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/clownface/-/clownface-1.5.1.tgz",
-            "integrity": "sha512-Ko8N/UFsnhEGmPlyE1bUFhbRhVgDbxqlIjcqxtLysc4dWaY0A7iCdg3savhAxs7Lheb7FCygIyRh7ADYZWVIng==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/clownface/-/clownface-2.0.1.tgz",
+            "integrity": "sha512-8RVfn/LZEl7BTDhIEIamz13Bhm5YahA1qiJigMb0HYGaiKnsVV0PpLBz0kzqyAI0+IzOlYbCLMFOAc1dkQfwgQ==",
             "requires": {
-                "@rdfjs/data-model": "^1.1.0",
-                "@rdfjs/namespace": "^1.0.0"
+                "@rdfjs/environment": "^0.1.2"
             }
         },
         "color-convert": {
@@ -7127,6 +7412,11 @@
                 "p-locate": "^4.1.0"
             }
         },
+        "lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+        },
         "lodash.isequal": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
@@ -7293,9 +7583,9 @@
             "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw=="
         },
         "n3": {
-            "version": "1.17.1",
-            "resolved": "https://registry.npmjs.org/n3/-/n3-1.17.1.tgz",
-            "integrity": "sha512-HlanMWpvN2kcTrFuU3GPObyY7qrVQWy2Hp7l4GSXJlcQapjQMR7OM4kCr788pTQzNIpiHS3JRvyZ2YUcYJ82rA==",
+            "version": "1.17.2",
+            "resolved": "https://registry.npmjs.org/n3/-/n3-1.17.2.tgz",
+            "integrity": "sha512-BxSM52wYFqXrbQQT5WUEzKUn6qpYV+2L4XZLfn3Gblz2kwZ09S+QxC33WNdVEQy2djenFL8SNkrjejEKlvI6+Q==",
             "requires": {
                 "queue-microtask": "^1.1.2",
                 "readable-stream": "^4.0.0"
@@ -7340,6 +7630,17 @@
             "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
             "dev": true
         },
+        "nodeify-fetch": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/nodeify-fetch/-/nodeify-fetch-3.1.0.tgz",
+            "integrity": "sha512-ZV81vM//sEgTgXwVZlOONzcOCdTGQ53mV65FVSNXgPQHa8oCwRLtLbnGxL/1S/Yw90bcXUDKMz00jEnaeazo+A==",
+            "requires": {
+                "lodash": "^4.17.21",
+                "node-fetch": "^3.2.10",
+                "readable-stream": "^4.2.0",
+                "stream-chunks": "^1.0.0"
+            }
+        },
         "normalize-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -7654,6 +7955,15 @@
                 "@rdfjs/types": "*"
             }
         },
+        "rdf-js": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/rdf-js/-/rdf-js-4.0.2.tgz",
+            "integrity": "sha512-ApvlFa/WsQh8LpPK/6hctQwG06Z9ztQQGWVtrcrf9L6+sejHNXLPOqL+w7q3hF+iL0C4sv3AX1PUtGkLNzyZ0Q==",
+            "dev": true,
+            "requires": {
+                "@rdfjs/types": "*"
+            }
+        },
         "rdf-literal": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/rdf-literal/-/rdf-literal-1.3.1.tgz",
@@ -7664,26 +7974,27 @@
             }
         },
         "rdf-validate-datatype": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/rdf-validate-datatype/-/rdf-validate-datatype-0.1.5.tgz",
-            "integrity": "sha512-gU+cD+AT1LpFwbemuEmTDjwLyFwJDiw21XHyIofKhFnEpXODjShBuxhgDGnZqW3qIEwu/vECjOecuD60e5ngiQ==",
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/rdf-validate-datatype/-/rdf-validate-datatype-0.2.0.tgz",
+            "integrity": "sha512-Ru7OcqxkPHgMwBrqw/RXCOqJ+hPaL1foelcgdDy5eFdNonP2D6YDLkYlODaeiSo2dgCnUvrD1k/QGi3Spa82fg==",
             "requires": {
-                "@rdfjs/namespace": "^1.1.0",
-                "@rdfjs/to-ntriples": "^2.0.0"
+                "@rdfjs/term-map": "^2.0.0",
+                "@tpluscode/rdf-ns-builders": "3 - 4"
             }
         },
         "rdf-validate-shacl": {
-            "version": "0.4.5",
-            "resolved": "https://registry.npmjs.org/rdf-validate-shacl/-/rdf-validate-shacl-0.4.5.tgz",
-            "integrity": "sha512-tGYnssuPzmsPua1dju4hEtGkT1zouvwzVTNrFhNiqj2aZFO5pQ7lvLd9Cv9H9vKAlpIdC/x0zL6btxG3PCss0w==",
-            "requires": {
-                "@rdfjs/dataset": "^1.1.1",
-                "@rdfjs/namespace": "^1.0.0",
-                "@rdfjs/term-set": "^1.1.0",
-                "clownface": "^1.4.0",
+            "version": "0.5.1",
+            "resolved": "https://registry.npmjs.org/rdf-validate-shacl/-/rdf-validate-shacl-0.5.1.tgz",
+            "integrity": "sha512-KpXLqfkf8BkNy4H7Yxhy+fd3BpedQpRIrPH0SoYhGBUhMR5JNNt8Va+eda1CsiA9DnnfDadXBxQVyKkuSFwhTA==",
+            "requires": {
+                "@rdfjs/environment": "^0.1.2",
+                "@rdfjs/namespace": "^2.0.0",
+                "@rdfjs/term-set": "^2.0.1",
+                "@vocabulary/sh": "^1.0.1",
+                "clownface": "^2.0.0",
                 "debug": "^4.3.2",
                 "rdf-literal": "^1.3.0",
-                "rdf-validate-datatype": "^0.1.5"
+                "rdf-validate-datatype": "^0.2.0"
             }
         },
         "readable-stream": {
@@ -8122,6 +8433,15 @@
             "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
             "dev": true
         },
+        "stream-chunks": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/stream-chunks/-/stream-chunks-1.0.0.tgz",
+            "integrity": "sha512-/G+kinLx3pKXChtuko82taA4gZo56zFG2b2BbhmugmS0TUPBL40c5b2vjonS+gAHYK/cSKM9m0WTvAJYgDUeNw==",
+            "requires": {
+                "buffer": "^6.0.3",
+                "string_decoder": "^1.3.0"
+            }
+        },
         "string_decoder": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
diff --git a/package.json b/package.json
index 7592a24..b778096 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
     "name": "@ulb-darmstadt/shacl-form",
-    "version": "1.2.2",
+    "version": "1.3.0",
     "description": "SHACL form generator",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
-    "types": "dist/index.d.ts",
+    "main": "dist/form-default.js",
+    "module": "dist/form-default.js",
+    "types": "dist/form-default.d.ts",
     "files": [
         "dist"
     ],
@@ -30,7 +30,11 @@
         "serve": "webpack serve --mode development"
     },
     "devDependencies": {
+        "@types/jsonld": "^1.5.11",
+        "@types/mapbox__mapbox-gl-draw": "^1.4.5",
         "@types/n3": "^1.16.0",
+        "@types/rdf-validate-shacl": "^0.4.5",
+        "@types/uuid": "^9.0.6",
         "raw-loader": "^4.0.2",
         "rimraf": "^5.0.1",
         "ts-loader": "^9.4.4",
@@ -40,13 +44,13 @@
         "webpack-dev-server": "^4.15.1"
     },
     "dependencies": {
-        "@mapbox/mapbox-gl-draw": "^1.4.2",
+        "@mapbox/mapbox-gl-draw": "^1.4.3",
         "@material/web": "^1.0.1",
         "bootstrap": "^5.3.2",
         "jsonld": "^8.3.1",
         "mapbox-gl": "^2.15.0",
-        "n3": "^1.17.0",
-        "rdf-validate-shacl": "^0.4.5",
-        "uuid": "^9.0.0"
+        "n3": "^1.17.2",
+        "rdf-validate-shacl": "^0.5.1",
+        "uuid": "^9.0.1"
     }
 }
diff --git a/src/config.ts b/src/config.ts
index 7fcfda1..59cebda 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -41,12 +41,13 @@ export class Config {
     }
  
     updateAttributes(elem: HTMLElement) {
-        const atts = new ElementAttributes()
-        for (const key of Object.keys(atts)) {
-            if (elem.dataset[key] !== undefined) {
-                atts[key] = elem.dataset[key]
+        const atts = new ElementAttributes();
+        (Object.keys(atts) as Array<keyof ElementAttributes>).forEach(key => {
+            const value = elem.dataset[key]
+            if (value !== undefined) {
+                atts[key] = value
             }
-        }
+        })
         this.editMode = atts.mode !== 'view'
         this.attributes = atts
     }
diff --git a/src/exports.ts b/src/exports.ts
new file mode 100644
index 0000000..f2f5267
--- /dev/null
+++ b/src/exports.ts
@@ -0,0 +1,3 @@
+export { Theme, InputListEntry, Editor } from "./theme"
+export { Plugin } from './plugin'
+
diff --git a/src/form-bootstrap.ts b/src/form-bootstrap.ts
index 9467602..9600a75 100644
--- a/src/form-bootstrap.ts
+++ b/src/form-bootstrap.ts
@@ -1,10 +1,12 @@
-import { ShaclForm } from "./form"
+import { ShaclForm as FormBase } from "./form"
 import { BootstrapTheme } from "./themes/bootstrap"
 
-export class ShaclFormElement extends ShaclForm {
+export * from './exports'
+
+export class ShaclForm extends FormBase {
     constructor() {
         super(new BootstrapTheme())
     }
 }
 
-window.customElements.define('shacl-form', ShaclFormElement)
+window.customElements.define('shacl-form', ShaclForm)
diff --git a/src/form-default.ts b/src/form-default.ts
new file mode 100644
index 0000000..b1bfa77
--- /dev/null
+++ b/src/form-default.ts
@@ -0,0 +1,12 @@
+import { ShaclForm as FormBase } from "./form"
+import { DefaultTheme } from "./themes/default"
+
+export * from './exports'
+
+export class ShaclForm extends FormBase {
+    constructor() {
+        super(new DefaultTheme())
+    }
+}
+
+window.customElements.define('shacl-form', ShaclForm)
diff --git a/src/form-material.ts b/src/form-material.ts
index c5282f3..f5ace92 100644
--- a/src/form-material.ts
+++ b/src/form-material.ts
@@ -1,10 +1,12 @@
-import { ShaclForm } from "./form"
+import { ShaclForm as FormBase } from "./form"
 import { MaterialTheme } from "./themes/material"
 
-export class ShaclFormElement extends ShaclForm {
+export * from './exports'
+
+export class ShaclForm extends FormBase {
     constructor() {
         super(new MaterialTheme())
     }
 }
 
-window.customElements.define('shacl-form', ShaclFormElement)
+window.customElements.define('shacl-form', ShaclForm)
diff --git a/src/form-native.ts b/src/form-native.ts
deleted file mode 100644
index 201992b..0000000
--- a/src/form-native.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ShaclForm } from "./form"
-import { NativeTheme } from "./themes/native"
-
-export class ShaclFormElement extends ShaclForm {
-    constructor() {
-        super(new NativeTheme())
-    }
-}
-
-window.customElements.define('shacl-form', ShaclFormElement)
diff --git a/src/form.ts b/src/form.ts
index 02c0225..3a3934b 100644
--- a/src/form.ts
+++ b/src/form.ts
@@ -157,18 +157,20 @@ export class ShaclForm extends HTMLElement {
 
         for (const result of report.results) {
             // result.path can be null, e.g. if a focus node does not contain a required property node
+            const focusNode = result.focusNode as NamedNode
             if (result.path) {
+                const path = result.path as NamedNode
                 // try to find most specific editor elements first
-                let invalidElements = this.form.querySelectorAll(`:scope [data-node-id='${result.focusNode.id}'] [data-path='${result.path.id}'] > .editor`)
+                let invalidElements = this.form.querySelectorAll(`:scope [data-node-id='${focusNode.id}'] [data-path='${path.id}'] > .editor`)
                 if (invalidElements.length === 0) {
                     // if no editors found, select respective node. this will be the case for node shape violations.
-                    invalidElements = this.form.querySelectorAll(`:scope [data-node-id='${result.focusNode.id}'] [data-path='${result.path.id}']`)
+                    invalidElements = this.form.querySelectorAll(`:scope [data-node-id='${focusNode.id}'] [data-path='${path.id}']`)
                 }
 
                 for (const invalidElement of invalidElements) {
                     if (invalidElement.classList.contains('editor')) {
                         // this is a property shape violation
-                        if (!ignoreEmptyValues || invalidElement['value']) {
+                        if (!ignoreEmptyValues || (invalidElement as Editor).value) {
                             let parent: HTMLElement | null = invalidElement.parentElement!
                             parent.classList.add('invalid')
                             parent.classList.remove('valid')
@@ -188,7 +190,7 @@ export class ShaclForm extends HTMLElement {
                     }
                 }
             } else if (!ignoreEmptyValues) {
-                this.form.querySelector(`:scope [data-node-id='${result.focusNode.id}']`)?.prepend(this.createValidationErrorDisplay(result, 'node'))
+                this.form.querySelector(`:scope [data-node-id='${focusNode.id}']`)?.prepend(this.createValidationErrorDisplay(result, 'node'))
             }
         }
         return report.conforms
diff --git a/src/loader.ts b/src/loader.ts
index 3e19e26..1079092 100644
--- a/src/loader.ts
+++ b/src/loader.ts
@@ -1,5 +1,5 @@
 import { Store, Parser, Quad, Prefixes, NamedNode } from 'n3'
-import * as jsonld from 'jsonld'
+import { toRDF } from 'jsonld'
 import { OWL_IMPORTS, SHACL_PREDICATE_CLASS, SHAPES_GRAPH } from './constants'
 import { Config } from './config'
 import { isURL } from './util'
@@ -84,7 +84,8 @@ export class Loader {
         if (input) {
             try {
                 // check if input is JSON
-                input = jsonld.toRDF(JSON.parse(input), {format: 'application/n-quads'}) as string
+                // @ts-ignore, because result of toRDF is a string and not an object
+                input = await toRDF(JSON.parse(input), {format: 'application/n-quads'}) as string
             } catch(_) {
                 // NOP, it wasn't JSON
             }
diff --git a/src/plugins/mapbox.ts b/src/plugins/mapbox.ts
index e47811a..cc68bfe 100644
--- a/src/plugins/mapbox.ts
+++ b/src/plugins/mapbox.ts
@@ -2,10 +2,11 @@ import { Term } from '@rdfjs/types'
 import { Plugin, PluginOptions } from '../plugin'
 import { ShaclPropertyTemplate } from '../property-template'
 import { Editor, fieldFactory } from '../theme'
-import mapboxgl from 'mapbox-gl'
+import { Map, NavigationControl, FullscreenControl, LngLatBounds, LngLatLike } from 'mapbox-gl'
 import MapboxDraw from '@mapbox/mapbox-gl-draw'
 import mapboxGlCss from 'mapbox-gl/dist/mapbox-gl.css'
 import mapboxGlDrawCss from '@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css'
+import { Point, Polygon } from 'geojson'
 
 const css = `
 #shaclMapDialog .closeButton { position: absolute; right: 0; top: 0; z-index: 1; padding: 6px 8px; cursor: pointer; border: 0; background-color: #FFFA; font-size: 24px; }
@@ -23,56 +24,61 @@ const dialogTemplate = `
 <button class="closeButton" type="button" onclick="this.parentElement.close()">&#x2715;</button>
 </dialog>`
 
+type Geometry = Point | Polygon
+
 export class MapboxPlugin extends Plugin {
-    map: mapboxgl.Map
-    draw: MapboxDraw
+    map: Map | undefined
+    draw: MapboxDraw | undefined
     currentEditor: Editor | undefined
+    apiKey: string
 
     constructor(options: PluginOptions, apiKey: string) {
         super(options, mapboxGlCss + '\n' + mapboxGlDrawCss + '\n' + css)
-        mapboxgl.accessToken = apiKey
+        this.apiKey = apiKey
     }
 
     initEditMode(form: HTMLElement): HTMLDialogElement {
         form.insertAdjacentHTML('beforeend', dialogTemplate)
-        const dialog = form.querySelector('#shaclMapDialog') as HTMLDialogElement
-        const container = form.querySelector('#shaclMapDialogContainer')
-        dialog.addEventListener('close', () => {
-            const scrollY = document.body.style.top
-            document.body.style.position = ''
-            document.body.style.top = ''
-            window.scrollTo(0, parseInt(scrollY || '0') * -1)
-            // set wkt in editor
-            const data = this.draw.getAll()
-            if (data.features.length && this.currentEditor) {
-                const geometry = data.features[0].geometry
-                if (geometry.coordinates?.length) {
-                    const wkt = this.geometryToWkt(geometry)
-                    this.currentEditor.value = wkt
-                    this.currentEditor.dispatchEvent(new Event('change', { bubbles: true }))
-                }
-            }
-        })
-        this.map = new mapboxgl.Map({
+        const container = form.querySelector('#shaclMapDialogContainer') as HTMLElement
+        this.map = new Map({
             container: container,
             style: 'mapbox://styles/mapbox/satellite-streets-v11',
             zoom: 5,
             center: { lng: 8.657238961696038, lat: 49.87627570549512 },
-            attributionControl: false
+            attributionControl: false,
+            accessToken: this.apiKey
         })
 
         this.draw = new MapboxDraw({
             displayControlsDefault: false,
             controls: { point: true, polygon: true }
         })
-        this.map.addControl(new mapboxgl.NavigationControl(), 'top-left')
+        this.map.addControl(new NavigationControl(), 'top-left')
         this.map.addControl(this.draw, 'top-left')
 
         this.map.on('idle', () => {
             // this fixes wrong size of canvas
-            this.map.resize()
+            this.map!.resize()
         })
         this.map.on('draw.create', () => this.deleteAllButLastDrawing())
+
+        const dialog = form.querySelector('#shaclMapDialog') as HTMLDialogElement
+        dialog.addEventListener('close', () => {
+            const scrollY = document.body.style.top
+            document.body.style.position = ''
+            document.body.style.top = ''
+            window.scrollTo(0, parseInt(scrollY || '0') * -1)
+            // set wkt in editor
+            const data = this.draw!.getAll()
+            if (data && data.features.length && this.currentEditor) {
+                const geometry = data.features[0].geometry as Geometry
+                if (geometry.coordinates?.length) {
+                    const wkt = this.geometryToWkt(geometry)
+                    this.currentEditor.value = wkt
+                    this.currentEditor.dispatchEvent(new Event('change', { bubbles: true }))
+                }
+            }
+        })
         return dialog
     }
 
@@ -86,15 +92,15 @@ export class MapboxPlugin extends Plugin {
         button.classList.add('open-map-button')
         button.onclick = () => {
             this.currentEditor = instance.querySelector('.editor') as Editor
-            this.draw.deleteAll()
+            this.draw?.deleteAll()
 
             const wkt = this.currentEditor.value || ''
             const geometry = this.wktToGeometry(wkt)
             if (geometry && geometry.coordinates?.length) {
-                this.draw.add(geometry)
-                this.fitToGeometry(this.map, geometry)
+                this.draw?.add(geometry)
+                this.fitToGeometry(this.map!, geometry)
             } else {
-                this.map.setZoom(5)
+                this.map?.setZoom(5)
             }
             document.body.style.top = `-${window.scrollY}px`
             document.body.style.position = 'fixed'
@@ -112,14 +118,15 @@ export class MapboxPlugin extends Plugin {
             // wait for container to be available in DOM
             setTimeout(() => {
                 const draw = new MapboxDraw({ displayControlsDefault: false })
-                const map = new mapboxgl.Map({
+                const map = new Map({
                     container: container,
                     style: 'mapbox://styles/mapbox/satellite-streets-v11',
                     zoom: 5,
-                    attributionControl: false
+                    attributionControl: false,
+                    accessToken: this.apiKey
                 })
                 map.addControl(draw)
-                map.addControl(new mapboxgl.FullscreenControl())
+                map.addControl(new FullscreenControl())
                 draw.add(geometry)
                 this.fitToGeometry(map, geometry)
             })
@@ -127,28 +134,28 @@ export class MapboxPlugin extends Plugin {
         return container
     }
 
-    fitToGeometry(map, geometry) {
+    fitToGeometry(map: Map, geometry: Geometry) {
         if (typeof geometry.coordinates[0] === 'number') {
             // e.g. Point
-            map.setCenter(geometry.coordinates as mapboxgl.LngLatLike)
+            map.setCenter(geometry.coordinates as LngLatLike)
             map.setZoom(15)
         } else {
             // e.g. Polygon
             const bounds = geometry.coordinates[0].reduce((bounds, coord) => {
                 return bounds.extend(coord as mapboxgl.LngLatLike)
-            }, new mapboxgl.LngLatBounds(geometry.coordinates[0][0] as mapboxgl.LngLatLike, geometry.coordinates[0][0] as mapboxgl.LngLatLike))
+            }, new LngLatBounds(geometry.coordinates[0][0] as mapboxgl.LngLatLike, geometry.coordinates[0][0] as mapboxgl.LngLatLike))
             map.fitBounds(bounds, { padding: 20, animate: false })
         }
     }
 
     deleteAllButLastDrawing() {
-        const data = this.draw.getAll()
+        const data = this.draw!.getAll()
         for (let i = 0; i < data.features.length - 1; i++) {
-            this.draw.delete(data.features[i].id as string)
+            this.draw!.delete(data.features[i].id as string)
         }
     }
 
-    wktToGeometry(wkt: string): any {
+    wktToGeometry(wkt: string): Geometry | undefined {
         const pointCoords = wkt.match(/^POINT\((.*)\)$/)
         if (pointCoords?.length == 2) {
             const xy = pointCoords[1].split(' ')
@@ -172,10 +179,9 @@ export class MapboxPlugin extends Plugin {
                 return { type: 'Polygon', coordinates: coords }
             }
         }
-        return undefined
     }
 
-    geometryToWkt(geometry: any): string {
+    geometryToWkt(geometry: Geometry): string {
         if (geometry.type === 'Point') {
             return `POINT(${geometry.coordinates.join(' ')})`
         } else if (geometry.type === 'Polygon') {
diff --git a/src/serialize.ts b/src/serialize.ts
index 24903c4..7f9c25c 100644
--- a/src/serialize.ts
+++ b/src/serialize.ts
@@ -1,5 +1,6 @@
 import { Writer, Quad, Literal, Prefixes } from 'n3'
 import { PREFIX_XSD, RDF_PREDICATE_TYPE } from './constants'
+import { NodeObject } from 'jsonld'
 
 export function serialize(quads: Quad[], format: string, prefixes?: Prefixes): string {
     if (format === 'application/ld+json') {
@@ -19,9 +20,9 @@ export function serialize(quads: Quad[], format: string, prefixes?: Prefixes): s
 }
 
 function serializeJsonld(quads: Quad[]): string {
-    const triples: {}[] = []
+    const triples: NodeObject[] = []
     for (const quad of quads) {
-        const triple = { '@id': quad.subject.id }
+        const triple: NodeObject = { '@id': quad.subject.id }
   
         if (quad.predicate === RDF_PREDICATE_TYPE) {
           triple['@type'] = quad.object.id
diff --git a/src/theme.ts b/src/theme.ts
index 6e4d7dc..aa3033a 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -5,7 +5,7 @@ import { createInputListEntries, findInstancesOf, findLabel, isURL } from './uti
 import { ShaclPropertyTemplate } from './property-template'
 import css from './styles.css'
 
-export type Editor = HTMLElement & { value: string }
+export type Editor = HTMLElement & { value: string, type?: string, shaclDatatype?: NamedNode<string>, checked?: boolean }
 export type InputListEntry = { value: Term | string, label?: string }
 
 export abstract class Theme {
@@ -73,24 +73,24 @@ export abstract class Theme {
 }
 
 export function toRDF(editor: Editor): Literal | NamedNode | undefined {
-    let datatype = editor['shacl-datatype']
+    let languageOrDatatype: NamedNode<string> | string | undefined = editor['shaclDatatype']
     let value: number | string = editor.value
     if (value) {
         if (editor.dataset.class || editor.dataset.nodeKind === PREFIX_SHACL + 'IRI') {
             return DataFactory.namedNode(value)
         } else {
             if (editor.dataset.lang) {
-                datatype = editor.dataset.lang
+                languageOrDatatype = editor.dataset.lang
             }
             else if (editor['type'] === 'number') {
                 value = parseFloat(value)
             }
-            return DataFactory.literal(value, datatype)
+            return DataFactory.literal(value, languageOrDatatype)
         }
-    } else if (editor['type'] === 'checkbox' || editor.getAttribute('type')) {
+    } else if (editor['type'] === 'checkbox' || editor.getAttribute('type') === 'checkbox') {
         // emit boolean 'false' only when required
         if (editor['checked'] || parseInt(editor.dataset.minCount || '0') > 0) {
-            return DataFactory.literal(editor['checked'] ? 'true' : 'false', datatype)
+            return DataFactory.literal(editor['checked'] ? 'true' : 'false', languageOrDatatype)
         }
     }
 }
diff --git a/src/themes/bootstrap.ts b/src/themes/bootstrap.ts
index ee91a7c..07abe0e 100644
--- a/src/themes/bootstrap.ts
+++ b/src/themes/bootstrap.ts
@@ -1,11 +1,11 @@
-import { NativeTheme } from './native'
+import { DefaultTheme } from './default'
 import { Term } from '@rdfjs/types'
 import { ShaclPropertyTemplate } from '../property-template'
 import { Editor } from '../theme'
 import bootstrap from 'bootstrap/dist/css/bootstrap.min.css'
 import css from './bootstrap.css'
 
-export class BootstrapTheme extends NativeTheme {
+export class BootstrapTheme extends DefaultTheme {
     constructor() {
         super(bootstrap + '\n' + css)
     }
diff --git a/src/themes/native.css b/src/themes/default.css
similarity index 100%
rename from src/themes/native.css
rename to src/themes/default.css
diff --git a/src/themes/native.ts b/src/themes/default.ts
similarity index 88%
rename from src/themes/native.ts
rename to src/themes/default.ts
index 163ffaf..460d05a 100644
--- a/src/themes/native.ts
+++ b/src/themes/default.ts
@@ -1,12 +1,11 @@
 import { Term } from '@rdfjs/types'
 import { ShaclPropertyTemplate } from "../property-template"
 import { Editor, InputListEntry, Theme } from "../theme"
-import { PREFIX_XSD, SHAPES_GRAPH } from '../constants'
-import { Literal, NamedNode } from 'n3'
-import css from './native.css'
-import { findLabel, isURL } from '../util'
+import { PREFIX_XSD } from '../constants'
+import { Literal } from 'n3'
+import css from './default.css'
 
-export class NativeTheme extends Theme {
+export class DefaultTheme extends Theme {
     idCtr = 0
 
     constructor(overiddenCss?: string) {
@@ -18,7 +17,7 @@ export class NativeTheme extends Theme {
         editor.classList.add('editor')
         if (template?.datatype) {
             // store datatype on editor, this is used for RDF serialization
-            editor['shacl-datatype'] = template.datatype
+            editor['shaclDatatype'] = template.datatype
         }
         if (template?.minCount !== undefined) {
             editor.dataset.minCount = String(template.minCount)
@@ -54,7 +53,7 @@ export class NativeTheme extends Theme {
     }
 
     createDateEditor(label: string, value: Term | null, required: boolean, template: ShaclPropertyTemplate): HTMLElement {
-        const editor = document.createElement('input')
+        const editor: Editor = document.createElement('input')
         if (template.datatype?.value  === PREFIX_XSD + 'dateTime') {
             editor.type = 'datetime-local'
         }
@@ -64,13 +63,17 @@ export class NativeTheme extends Theme {
         editor.classList.add('pr-0')
         const result = this.createDefaultTemplate(label, null, required, editor, template)
         if (value) {
-            let isoDate = new Date(value.value).toISOString()
-            if (template.datatype?.value  === PREFIX_XSD + 'dateTime') {
-                isoDate = isoDate.slice(0, 19)
-            } else {
-                isoDate = isoDate.slice(0, 10)
+            try {
+                let isoDate = new Date(value.value).toISOString()
+                if (template.datatype?.value  === PREFIX_XSD + 'dateTime') {
+                    isoDate = isoDate.slice(0, 19)
+                } else {
+                    isoDate = isoDate.slice(0, 10)
+                }
+                editor.value = isoDate
+            } catch(ex) {
+                console.error(ex, value)
             }
-            editor.value = isoDate
         }
         return result
     }
@@ -84,24 +87,24 @@ export class NativeTheme extends Theme {
         else {
             editor = document.createElement('input')
             editor.type = 'text'
+            if (template.pattern) {
+                editor.pattern = template.pattern
+            }
         }
     
         if (template.minLength) {
-                editor.minLength = template.minLength
-            }
+            editor.minLength = template.minLength
+        }
         if (template.maxLength) {
             editor.maxLength = template.maxLength
         }
-        if (template.pattern) {
-            editor.pattern = template.pattern
-        }
         return this.createDefaultTemplate(label, value, required, editor, template)
     }
 
     createLangStringEditor(label: string, value: Term | null, required: boolean, template: ShaclPropertyTemplate): HTMLElement {
         const result = this.createTextEditor(label, value, required, template)
         const editor = result.querySelector(':scope .editor') as Editor
-        let langChooser
+        let langChooser: HTMLSelectElement | HTMLInputElement
         if (template.languageIn?.length) {
             langChooser = document.createElement('select')
             for (const lang of template.languageIn) {
@@ -112,9 +115,9 @@ export class NativeTheme extends Theme {
         } else {
             langChooser = document.createElement('input')
             langChooser.maxLength = 5 // e.g. en-US
+            langChooser.placeholder = 'lang?'
         }
         langChooser.title = 'Language of the text'
-        langChooser.placeholder = 'lang?'
         langChooser.classList.add('lang-chooser')
         // if lang chooser changes, fire a change event on the text input instead. this is for shacl validation handling.
         langChooser.addEventListener('change', (ev) => {
diff --git a/src/themes/material.ts b/src/themes/material.ts
index aaa7974..ae80f29 100644
--- a/src/themes/material.ts
+++ b/src/themes/material.ts
@@ -20,7 +20,7 @@ export class MaterialTheme extends Theme {
         editor.classList.add('editor')
         if (template?.datatype) {
             // store datatype on editor, this is used for RDF serialization
-            editor['shacl-datatype'] = template.datatype
+            editor['shaclDatatype'] = template.datatype
         }
         if (template?.minCount !== undefined) {
             editor.dataset.minCount = String(template.minCount)
@@ -123,7 +123,7 @@ export class MaterialTheme extends Theme {
     createLangStringEditor(label: string, value: Term | null, required: boolean, template: ShaclPropertyTemplate): HTMLElement {
         const result = this.createTextEditor(label, value, required, template)
         const editor = result.querySelector(':scope .editor') as Editor
-        let langChooser
+        let langChooser: HTMLSelectElement | HTMLInputElement
         if (template.languageIn?.length) {
             langChooser = document.createElement('select')
             for (const lang of template.languageIn) {
@@ -134,9 +134,9 @@ export class MaterialTheme extends Theme {
         } else {
             langChooser = document.createElement('input')
             langChooser.maxLength = 5 // e.g. en-US
+            langChooser.placeholder = 'lang?'
         }
         langChooser.title = 'Language of the text'
-        langChooser.placeholder = 'lang?'
         langChooser.classList.add('lang-chooser')
         // if lang chooser changes, fire a change event on the text input instead. this is for shacl validation handling.
         langChooser.addEventListener('change', (ev) => {
diff --git a/tsconfig.json b/tsconfig.json
index 00ea55a..0047eec 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "outDir": "./dist/",
-    "noImplicitAny": false,
+    "noImplicitAny": true,
     "module": "esnext",
     "target": "es6",
     "moduleResolution": "node",
diff --git a/webpack.config.js b/webpack.config.js
index 016af20..873bd9e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,7 +2,13 @@ const path = require('path');
 
 module.exports = [
     {
-        entry: { 'index': './src/form-native.ts' },
+        entry: {
+            'form-default': './src/form-default.ts',
+            'form-material': './src/form-material.ts',
+            'form-bootstrap': './src/form-bootstrap.ts',
+            'plugins/mapbox': './src/plugins/mapbox.ts',
+            'plugins/fixed-list': './src/plugins/fixed-list.ts',
+        },
         experiments: { outputModule: true },
         output: {
             filename: '[name].js',
@@ -10,124 +16,17 @@ module.exports = [
         },
         module: {
             rules: [
-                { test: /\.tsx?$/, use: 'ts-loader', exclude: /src\/plugins/ },
+                { test: /\.tsx?$/, use: 'ts-loader' },
                 { test: /\.css$/i, use: ['raw-loader'] },
             ],
         },
         resolve: { extensions: ['.tsx', '.ts', '.js'] },
         devServer: {
-            static: [
-                { directory: path.join(__dirname, 'demo'), serveIndex: true },
-            ],
+            static: [ { directory: path.join(__dirname, 'demo'), serveIndex: true } ],
             compress: true,
             hot: true,
             port: 8080,
         },
         // devtool: "source-map",
     },
-    {
-        entry: { 'material': './src/form-material.ts' },
-        experiments: { outputModule: true },
-        output: {
-            filename: '[name].js',
-            library: { type: 'module' },
-        },
-        module: {
-            rules: [
-                { test: /\.tsx?$/, use: 'ts-loader', exclude: /src\/plugins/ },
-                { test: /\.css$/i, use: ['raw-loader'] },
-            ],
-        },
-        resolve: { extensions: ['.tsx', '.ts', '.js'] },
-    },
-    {
-        entry: { 'bootstrap': './src/form-bootstrap.ts' },
-        experiments: { outputModule: true },
-        output: {
-            filename: '[name].js',
-            library: { type: 'module' },
-        },
-        module: {
-            rules: [
-                { test: /\.tsx?$/, use: 'ts-loader', exclude: /src\/plugins/ },
-                { test: /\.css$/i, use: ['raw-loader'] },
-            ],
-        },
-        resolve: { extensions: ['.tsx', '.ts', '.js'] },
-    },
-    {
-        entry: {
-            'plugins/mapbox': './src/plugins/mapbox.ts',
-        },
-        experiments: {
-            outputModule: true,
-        },
-        // externals: ['@rdfjs/types', '../plugin', '../property-template', '../theme' ],
-        output: {
-            filename: '[name].js',
-            library: {
-                type: 'module',
-            },
-        },
-        module: {
-            rules: [
-                {
-                    test: /\.tsx?$/,
-                    use: 'ts-loader',
-                },
-                {
-                    test: /\.css$/i,
-                    use: ['raw-loader'],
-                },
-            ],
-        },
-        resolve: {
-            extensions: ['.tsx', '.ts', '.js'],
-        },
-    },
-    {
-        entry: {
-            'plugins/fixed-list': './src/plugins/fixed-list.ts',
-        },
-        experiments: {
-            outputModule: true,
-        },
-        output: {
-            filename: '[name].js',
-            library: {
-                type: 'module',
-            },
-        },
-        module: {
-            rules: [
-                {
-                    test: /\.tsx?$/,
-                    use: 'ts-loader',
-                },
-                {
-                    test: /\.css$/i,
-                    use: ['raw-loader'],
-                },
-            ],
-        },
-        resolve: {
-            extensions: ['.tsx', '.ts', '.js'],
-        },
-    },
-    {
-        entry: { 'themes/material': './src/themes/material.ts' },
-        experiments: { outputModule: true },
-        output: {
-            filename: '[name].js',
-            library: { type: 'module' },
-        },
-        module: {
-            rules: [
-                { test: /\.tsx?$/, use: 'ts-loader', exclude: /src\/plugins/ },
-                { test: /\.css$/i, use: ['raw-loader'] },
-            ],
-        },
-        resolve: { extensions: ['.tsx', '.ts', '.js'] },
-    },
-
 ];
\ No newline at end of file
