diff --git a/package-lock.json b/package-lock.json
index e981a73..ae51e01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,16 +8,16 @@
       "name": "gbfs-validator-reports",
       "version": "0.1.0",
       "dependencies": {
-        "@entur/button": "2.10.15",
-        "@entur/form": "4.4.7",
+        "@entur/button": "3.2.28",
+        "@entur/form": "8.0.0",
         "@entur/gbfs-validator": "0.3.0",
-        "@entur/icons": "1.20.0",
-        "@entur/layout": "1.10.4",
-        "@entur/menu": "3.6.6",
+        "@entur/icons": "7.0.0",
+        "@entur/layout": "2.3.12",
+        "@entur/menu": "4.2.36",
         "@entur/modal": "1.7.49",
         "@entur/table": "4.8.14",
         "@entur/tokens": "3.15.2",
-        "@entur/tooltip": "2.7.11",
+        "@entur/tooltip": "3.0.0",
         "@entur/typography": "1.8.41",
         "husky": "6.0.0",
         "lint-staged": "10.5.4",
@@ -1930,26 +1930,15 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/a11y/node_modules/@entur/utils": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
-      "integrity": "sha512-yT/LH8EK3/TCYDVRolaY/XNdt7zL50HqscXqTkdQxCVZCi0eN3Dv0n7PF1nDbJwBWQELu4Jbb4ykCO3RzQ3Iqw==",
-      "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "node_modules/@entur/button": {
-      "version": "2.10.15",
-      "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.10.15.tgz",
-      "integrity": "sha512-8FYfFz4P3ZTQZew5ndhNkSS8qBd/lIeM52bzoJarPLGA0FDIrehXcTZG842jWkouA+OTaPVp1x0+VcS4mKUftw==",
+      "version": "3.2.28",
+      "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.2.28.tgz",
+      "integrity": "sha512-iwZP8z/GJP+qaae1oINhnEpSjjOyQUaHhQeAVxQsHgr3DTrx1nFYZBjIr9A0Iwxz09wR2fCXW3+6DMKufuiVgA==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/loader": "^0.4.23",
-        "@entur/tokens": "^3.8.0",
-        "@entur/utils": "^0.5.5",
+        "@entur/loader": "^0.5.6",
+        "@entur/tokens": "^3.15.2",
+        "@entur/utils": "^0.11.1",
         "classnames": "^2.3.1"
       },
       "peerDependencies": {
@@ -1957,18 +1946,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/button/node_modules/@entur/utils": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.5.5.tgz",
-      "integrity": "sha512-Xj8O9mlSE1w6R+utl/fzm+E7kDXbsA+kg3Ci8xbUn+2tq/+OyKzTFzp4ACCpWQ6BIJHsaE4FGVoVrG0Pu5Nulg==",
-      "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "node_modules/@entur/expand": {
       "version": "3.5.17",
       "resolved": "https://registry.npmjs.org/@entur/expand/-/expand-3.5.17.tgz",
@@ -1987,40 +1964,17 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/expand/node_modules/@entur/icons": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-7.0.0.tgz",
-      "integrity": "sha512-AZhm6S8qUuDX8KzAaLveBqW/XxQXexIUZDI/8LBdV/eaOXIdX+FlTYoOXH+Cz4ND7Qt3bhfi7e2XrrRMHMun8Q==",
+    "node_modules/@entur/form": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@entur/form/-/form-8.0.0.tgz",
+      "integrity": "sha512-B9UPdfam5tgxwTiPEkJVUj+FGJFgShMu2lDoypzMjqy5HXSGb3GgCGa8InMxwG+Mh8iDGmPc/LwP8eCwSF60ew==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/tokens": "^3.15.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/expand/node_modules/@entur/utils": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
-      "integrity": "sha512-yT/LH8EK3/TCYDVRolaY/XNdt7zL50HqscXqTkdQxCVZCi0eN3Dv0n7PF1nDbJwBWQELu4Jbb4ykCO3RzQ3Iqw==",
-      "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/form": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/@entur/form/-/form-4.4.7.tgz",
-      "integrity": "sha512-+307RxSX5SlFqMbrfU+AYJNMb7udWTVXyPrTRSIsJIIYPxuSAoOMW1OvB+uLKcqQ4oLcZpRwONlnAnoNUn3ZhA==",
-      "dependencies": {
-        "@entur/icons": "^3.0.0",
-        "@entur/tokens": "^3.1.0",
-        "@entur/tooltip": "^2.4.23",
-        "@entur/typography": "^1.6.7",
-        "@entur/utils": "^0.4.2",
+        "@entur/icons": "^7.0.0",
+        "@entur/tokens": "^3.15.2",
+        "@entur/tooltip": "^3.0.0",
+        "@entur/typography": "^1.8.41",
+        "@entur/utils": "^0.11.1",
         "classnames": "^2.3.1"
       },
       "peerDependencies": {
@@ -2028,32 +1982,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/form/node_modules/@entur/icons": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-3.5.0.tgz",
-      "integrity": "sha512-TsZ6XOt0P1pfqaovusx2Fbrv4HkVw2yLzmP/MJsFAmVVzpynpoT21/4zGWydr2vZREtjPM21p+zwPhN1ENnQKQ==",
-      "dependencies": {
-        "@entur/tokens": "^3.3.1",
-        "@entur/utils": "^0.4.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/form/node_modules/@entur/utils": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.3.tgz",
-      "integrity": "sha512-56/7MF+U2LQBNMPNe9o5ll3aFlR2CLPCXUsv3Zt8QLG+SxFoisB7KpwOl0tTiO8hcj8PE96D+g83fMZ6PcYvWg==",
-      "dependencies": {
-        "react-polymorphic-types": "^1.1.0",
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "node_modules/@entur/gbfs-validator": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@entur/gbfs-validator/-/gbfs-validator-0.3.0.tgz",
@@ -2258,158 +2186,6 @@
       }
     },
     "node_modules/@entur/icons": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-1.20.0.tgz",
-      "integrity": "sha512-Zs/e21lEQWxXRQ2M2UtNENlR7hQAMfg+5LNfBgq4YMEwUtTvODHzfCilHsXhDJnpiX3KoSTk5es0GWGL8t5tnQ==",
-      "dependencies": {
-        "@entur/tokens": "^3.0.1",
-        "@entur/utils": "^0.4.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/layout": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-1.10.4.tgz",
-      "integrity": "sha512-pDsPRN2JVuL2hdexku39XQWnBWMubm1rCQxTuruEoJ0FQ1KMQyigaA0l4iddt4VOZBMu1pG/SbdM+U0ZtUD4JQ==",
-      "dependencies": {
-        "@entur/typography": "^1.6.6",
-        "@entur/utils": "^0.4.1",
-        "classnames": "^2.2.6"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/loader": {
-      "version": "0.4.65",
-      "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.4.65.tgz",
-      "integrity": "sha512-pQBqwmPZ5VL80awid1knz8Tic6cxtDcrrl1rYsKcOr4QJiMUQuV48fGeBOvTmX42ciGZh+z7VqtxxtMtCFrhhw==",
-      "dependencies": {
-        "@entur/tokens": "^3.14.0",
-        "@entur/typography": "^1.8.34",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/loader/node_modules/@entur/utils": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
-      "integrity": "sha512-yT/LH8EK3/TCYDVRolaY/XNdt7zL50HqscXqTkdQxCVZCi0eN3Dv0n7PF1nDbJwBWQELu4Jbb4ykCO3RzQ3Iqw==",
-      "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/menu": {
-      "version": "3.6.6",
-      "resolved": "https://registry.npmjs.org/@entur/menu/-/menu-3.6.6.tgz",
-      "integrity": "sha512-/sahdfNYZ6jVBmf1tU9LaOeqJAZuFpqpoSRVrOuRClNn2r8EYBXwlGsZLukO1mWp2Pny+OuPsSXokb4wq5/qCg==",
-      "dependencies": {
-        "@entur/button": "^2.6.1",
-        "@entur/expand": "^3.3.2",
-        "@entur/icons": "^3.0.0",
-        "@entur/layout": "^2.1.0",
-        "@entur/tokens": "^3.1.0",
-        "@entur/typography": "^1.6.7",
-        "@entur/utils": "^0.4.2",
-        "@reach/menu-button": "^0.15.1",
-        "classnames": "^2.3.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/menu/node_modules/@entur/icons": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-3.5.0.tgz",
-      "integrity": "sha512-TsZ6XOt0P1pfqaovusx2Fbrv4HkVw2yLzmP/MJsFAmVVzpynpoT21/4zGWydr2vZREtjPM21p+zwPhN1ENnQKQ==",
-      "dependencies": {
-        "@entur/tokens": "^3.3.1",
-        "@entur/utils": "^0.4.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/menu/node_modules/@entur/layout": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.1.5.tgz",
-      "integrity": "sha512-9B4aCOB8rgAJX/9q33uKNLMoyEuRG9gp2b5vBeriTDL8Reju6DiyCWhVRh7nltcs3GtV188C7d5RYlyb3jZKUQ==",
-      "dependencies": {
-        "@entur/typography": "^1.6.12",
-        "@entur/utils": "^0.4.3",
-        "classnames": "^2.3.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/menu/node_modules/@entur/utils": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.3.tgz",
-      "integrity": "sha512-56/7MF+U2LQBNMPNe9o5ll3aFlR2CLPCXUsv3Zt8QLG+SxFoisB7KpwOl0tTiO8hcj8PE96D+g83fMZ6PcYvWg==",
-      "dependencies": {
-        "react-polymorphic-types": "^1.1.0",
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/modal": {
-      "version": "1.7.49",
-      "resolved": "https://registry.npmjs.org/@entur/modal/-/modal-1.7.49.tgz",
-      "integrity": "sha512-Q7Qij4XyscB48cxDB5a1asD4111BDqQnWm+nX4oIcPNdZkPOAPW+xSHDXeZNxcxCjqVfIjjTFUyxnezGgbAIGg==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/a11y": "^0.2.87",
-        "@entur/button": "^3.2.28",
-        "@entur/icons": "^7.0.0",
-        "@entur/layout": "^2.3.12",
-        "@entur/tokens": "^3.15.2",
-        "@entur/typography": "^1.8.41",
-        "@entur/utils": "^0.11.1",
-        "@reach/dialog": "^0.16.0",
-        "classnames": "^2.3.1",
-        "react-focus-lock": "^2.9.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/modal/node_modules/@entur/button": {
-      "version": "3.2.28",
-      "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.2.28.tgz",
-      "integrity": "sha512-iwZP8z/GJP+qaae1oINhnEpSjjOyQUaHhQeAVxQsHgr3DTrx1nFYZBjIr9A0Iwxz09wR2fCXW3+6DMKufuiVgA==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/loader": "^0.5.6",
-        "@entur/tokens": "^3.15.2",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/modal/node_modules/@entur/icons": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-7.0.0.tgz",
       "integrity": "sha512-AZhm6S8qUuDX8KzAaLveBqW/XxQXexIUZDI/8LBdV/eaOXIdX+FlTYoOXH+Cz4ND7Qt3bhfi7e2XrrRMHMun8Q==",
@@ -2421,7 +2197,7 @@
         "react": ">=16.8.0"
       }
     },
-    "node_modules/@entur/modal/node_modules/@entur/layout": {
+    "node_modules/@entur/layout": {
       "version": "2.3.12",
       "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.3.12.tgz",
       "integrity": "sha512-JEj0lzvV+SOD9Pd/TJ3w6AwZWaHhRRTy4/SZt4QlVaePKOtkQI71g7c5C+Ek/rQbyXCfOYcvNBH2VGtDvo/KQA==",
@@ -2438,7 +2214,7 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/modal/node_modules/@entur/loader": {
+    "node_modules/@entur/loader": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.6.tgz",
       "integrity": "sha512-soyQVHOHm/t+M3XlqTRrtEVmfhYSq+28opYLnwCHZdO2zWe8bAEj2F/AzCFFjvduer3aPMGeL/OXKarArRX6Qg==",
@@ -2454,149 +2230,205 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/modal/node_modules/@entur/utils": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
-      "integrity": "sha512-yT/LH8EK3/TCYDVRolaY/XNdt7zL50HqscXqTkdQxCVZCi0eN3Dv0n7PF1nDbJwBWQELu4Jbb4ykCO3RzQ3Iqw==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/table": {
-      "version": "4.8.14",
-      "resolved": "https://registry.npmjs.org/@entur/table/-/table-4.8.14.tgz",
-      "integrity": "sha512-HK5EM37GrTSSe9FjXHEl9MUraWF5O536eiA1BF+UNiN48Id1J0e70jghkDmejmrorK2OEzW/oiMCana9AMizNA==",
+    "node_modules/@entur/menu": {
+      "version": "4.2.36",
+      "resolved": "https://registry.npmjs.org/@entur/menu/-/menu-4.2.36.tgz",
+      "integrity": "sha512-Qx4VKc/uuhRAjCuZkAtmdfvlr9Hoaw+5JrcVNCgSGh6QmUZ2T37B5DNHGrqT/4M65vrqyny0KPqOXqGnpFRQ8Q==",
       "license": "EUPL-1.2",
       "dependencies": {
         "@entur/a11y": "^0.2.87",
         "@entur/button": "^3.2.28",
         "@entur/expand": "^3.5.17",
-        "@entur/form": "^8.0.0",
         "@entur/icons": "^7.0.0",
         "@entur/layout": "^2.3.12",
         "@entur/tokens": "^3.15.2",
-        "@entur/tooltip": "^3.0.0",
+        "@entur/typography": "^1.8.41",
         "@entur/utils": "^0.11.1",
-        "@types/lodash.get": "^4.4.6",
-        "classnames": "^2.3.1",
-        "lodash.get": "^4.4.2"
+        "@reach/menu-button": "^0.16.1",
+        "@reach/polymorphic": "0.18.0",
+        "classnames": "^2.3.1"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/table/node_modules/@entur/button": {
-      "version": "3.2.28",
-      "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.2.28.tgz",
-      "integrity": "sha512-iwZP8z/GJP+qaae1oINhnEpSjjOyQUaHhQeAVxQsHgr3DTrx1nFYZBjIr9A0Iwxz09wR2fCXW3+6DMKufuiVgA==",
-      "license": "EUPL-1.2",
+    "node_modules/@entur/menu/node_modules/@reach/menu-button": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/menu-button/-/menu-button-0.16.2.tgz",
+      "integrity": "sha512-p4n6tFVaJZHJZEznHWy0YH2Xr3I+W7tsQWAT72PqKGT+uryGRdtgEQqi76f/8cRaw/00ueazBk5lwLG7UKGFaA==",
+      "license": "MIT",
       "dependencies": {
-        "@entur/loader": "^0.5.6",
-        "@entur/tokens": "^3.15.2",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
+        "@reach/dropdown": "0.16.2",
+        "@reach/popover": "0.16.2",
+        "@reach/utils": "0.16.0",
+        "prop-types": "^15.7.2",
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x",
+        "react-is": "^16.8.0 || 17.x"
       }
     },
-    "node_modules/@entur/table/node_modules/@entur/form": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@entur/form/-/form-8.0.0.tgz",
-      "integrity": "sha512-B9UPdfam5tgxwTiPEkJVUj+FGJFgShMu2lDoypzMjqy5HXSGb3GgCGa8InMxwG+Mh8iDGmPc/LwP8eCwSF60ew==",
-      "license": "EUPL-1.2",
+    "node_modules/@entur/menu/node_modules/@reach/menu-button/node_modules/@reach/dropdown": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/dropdown/-/dropdown-0.16.2.tgz",
+      "integrity": "sha512-l4nNiX6iUpMdHQNbZMhgW5APtw0AUwJuRnkqE93vkjvdtrYl/sNJy1Jr6cGG7TrZIABLSOsfwbXU3C+qwJ3ftQ==",
+      "license": "MIT",
       "dependencies": {
-        "@entur/icons": "^7.0.0",
-        "@entur/tokens": "^3.15.2",
-        "@entur/tooltip": "^3.0.0",
-        "@entur/typography": "^1.8.41",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
+        "@reach/auto-id": "0.16.0",
+        "@reach/descendants": "0.16.1",
+        "@reach/popover": "0.16.2",
+        "@reach/utils": "0.16.0",
+        "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
       }
     },
-    "node_modules/@entur/table/node_modules/@entur/icons": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-7.0.0.tgz",
-      "integrity": "sha512-AZhm6S8qUuDX8KzAaLveBqW/XxQXexIUZDI/8LBdV/eaOXIdX+FlTYoOXH+Cz4ND7Qt3bhfi7e2XrrRMHMun8Q==",
-      "license": "EUPL-1.2",
+    "node_modules/@entur/menu/node_modules/@reach/menu-button/node_modules/@reach/dropdown/node_modules/@reach/auto-id": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.16.0.tgz",
+      "integrity": "sha512-5ssbeP5bCkM39uVsfQCwBBL+KT8YColdnMN5/Eto6Rj7929ql95R3HZUOkKIvj7mgPtEb60BLQxd1P3o6cjbmg==",
+      "license": "MIT",
       "dependencies": {
-        "@entur/tokens": "^3.15.2"
+        "@reach/utils": "0.16.0",
+        "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "react": ">=16.8.0"
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
       }
     },
-    "node_modules/@entur/table/node_modules/@entur/layout": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.3.12.tgz",
-      "integrity": "sha512-JEj0lzvV+SOD9Pd/TJ3w6AwZWaHhRRTy4/SZt4QlVaePKOtkQI71g7c5C+Ek/rQbyXCfOYcvNBH2VGtDvo/KQA==",
-      "license": "EUPL-1.2",
+    "node_modules/@entur/menu/node_modules/@reach/menu-button/node_modules/@reach/dropdown/node_modules/@reach/descendants": {
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@reach/descendants/-/descendants-0.16.1.tgz",
+      "integrity": "sha512-3WZgRnD9O4EORKE31rrduJDiPFNMOjUkATx0zl192ZxMq3qITe4tUj70pS5IbJl/+v9zk78JwyQLvA1pL7XAPA==",
+      "license": "MIT",
       "dependencies": {
-        "@entur/icons": "^7.0.0",
-        "@entur/tokens": "^3.15.2",
-        "@entur/typography": "^1.8.41",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
+        "@reach/utils": "0.16.0",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
+      }
+    },
+    "node_modules/@entur/menu/node_modules/@reach/menu-button/node_modules/@reach/popover": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/popover/-/popover-0.16.2.tgz",
+      "integrity": "sha512-IwkRrHM7Vt33BEkSXneovymJv7oIToOfTDwRKpuYEB/BWYMAuNfbsRL7KVe6MjkgchDeQzAk24cYY1ztQj5HQQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@reach/portal": "0.16.2",
+        "@reach/rect": "0.16.0",
+        "@reach/utils": "0.16.0",
+        "tabbable": "^4.0.0",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
+      }
+    },
+    "node_modules/@entur/menu/node_modules/@reach/menu-button/node_modules/@reach/popover/node_modules/@reach/portal": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/portal/-/portal-0.16.2.tgz",
+      "integrity": "sha512-9ur/yxNkuVYTIjAcfi46LdKUvH0uYZPfEp4usWcpt6PIp+WDF57F/5deMe/uGi/B/nfDweQu8VVwuMVrCb97JQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@reach/utils": "0.16.0",
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
+      }
+    },
+    "node_modules/@entur/menu/node_modules/@reach/menu-button/node_modules/@reach/popover/node_modules/@reach/rect": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/rect/-/rect-0.16.0.tgz",
+      "integrity": "sha512-/qO9jQDzpOCdrSxVPR6l674mRHNTqfEjkaxZHluwJ/2qGUtYsA0GSZiF/+wX/yOWeBif1ycxJDa6HusAMJZC5Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@reach/observe-rect": "1.2.0",
+        "@reach/utils": "0.16.0",
+        "prop-types": "^15.7.2",
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
       }
     },
-    "node_modules/@entur/table/node_modules/@entur/loader": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.6.tgz",
-      "integrity": "sha512-soyQVHOHm/t+M3XlqTRrtEVmfhYSq+28opYLnwCHZdO2zWe8bAEj2F/AzCFFjvduer3aPMGeL/OXKarArRX6Qg==",
-      "license": "EUPL-1.2",
+    "node_modules/@entur/menu/node_modules/@reach/menu-button/node_modules/@reach/utils": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.16.0.tgz",
+      "integrity": "sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==",
+      "license": "MIT",
       "dependencies": {
-        "@entur/tokens": "^3.15.2",
-        "@entur/typography": "^1.8.41",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "react": "^16.8.0 || 17.x",
+        "react-dom": "^16.8.0 || 17.x"
       }
     },
-    "node_modules/@entur/table/node_modules/@entur/tooltip": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-3.0.0.tgz",
-      "integrity": "sha512-LgHZaocaSDqOFCZnWRdJDypWWhL9VEI3McAc8pXd+fJrSMbLik3kUKwv7nN1SofBOLpnwzQcJaub/jHm3FWTmw==",
+    "node_modules/@entur/menu/node_modules/@reach/polymorphic": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/@reach/polymorphic/-/polymorphic-0.18.0.tgz",
+      "integrity": "sha512-N9iAjdMbE//6rryZZxAPLRorzDcGBnluf7YQij6XDLiMtfCj1noa7KyLpEc/5XCIB/EwhX3zCluFAwloBKdblA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || 17.x"
+      }
+    },
+    "node_modules/@entur/modal": {
+      "version": "1.7.49",
+      "resolved": "https://registry.npmjs.org/@entur/modal/-/modal-1.7.49.tgz",
+      "integrity": "sha512-Q7Qij4XyscB48cxDB5a1asD4111BDqQnWm+nX4oIcPNdZkPOAPW+xSHDXeZNxcxCjqVfIjjTFUyxnezGgbAIGg==",
       "license": "EUPL-1.2",
       "dependencies": {
+        "@entur/a11y": "^0.2.87",
         "@entur/button": "^3.2.28",
         "@entur/icons": "^7.0.0",
         "@entur/layout": "^2.3.12",
         "@entur/tokens": "^3.15.2",
+        "@entur/typography": "^1.8.41",
         "@entur/utils": "^0.11.1",
-        "@popperjs/core": "^2.10.1",
+        "@reach/dialog": "^0.16.0",
         "classnames": "^2.3.1",
-        "react-popper": "~2.2.5"
+        "react-focus-lock": "^2.9.1"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/table/node_modules/@entur/utils": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
-      "integrity": "sha512-yT/LH8EK3/TCYDVRolaY/XNdt7zL50HqscXqTkdQxCVZCi0eN3Dv0n7PF1nDbJwBWQELu4Jbb4ykCO3RzQ3Iqw==",
+    "node_modules/@entur/table": {
+      "version": "4.8.14",
+      "resolved": "https://registry.npmjs.org/@entur/table/-/table-4.8.14.tgz",
+      "integrity": "sha512-HK5EM37GrTSSe9FjXHEl9MUraWF5O536eiA1BF+UNiN48Id1J0e70jghkDmejmrorK2OEzW/oiMCana9AMizNA==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "tiny-warning": "^1.0.3"
+        "@entur/a11y": "^0.2.87",
+        "@entur/button": "^3.2.28",
+        "@entur/expand": "^3.5.17",
+        "@entur/form": "^8.0.0",
+        "@entur/icons": "^7.0.0",
+        "@entur/layout": "^2.3.12",
+        "@entur/tokens": "^3.15.2",
+        "@entur/tooltip": "^3.0.0",
+        "@entur/utils": "^0.11.1",
+        "@types/lodash.get": "^4.4.6",
+        "classnames": "^2.3.1",
+        "lodash.get": "^4.4.2"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -2614,14 +2446,14 @@
       }
     },
     "node_modules/@entur/tooltip": {
-      "version": "2.7.11",
-      "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-2.7.11.tgz",
-      "integrity": "sha512-ldhHXH6fhenoff8DYVEB09b8IKb5buC+RNxc90dqygphG0UdPoc7jKcYcWvA+6BPECLUBhc23qXxvVDlSmrw5Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-3.0.0.tgz",
+      "integrity": "sha512-LgHZaocaSDqOFCZnWRdJDypWWhL9VEI3McAc8pXd+fJrSMbLik3kUKwv7nN1SofBOLpnwzQcJaub/jHm3FWTmw==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/button": "^3.2.27",
-        "@entur/icons": "^6.18.1",
-        "@entur/layout": "^2.3.11",
+        "@entur/button": "^3.2.28",
+        "@entur/icons": "^7.0.0",
+        "@entur/layout": "^2.3.12",
         "@entur/tokens": "^3.15.2",
         "@entur/utils": "^0.11.1",
         "@popperjs/core": "^2.10.1",
@@ -2633,92 +2465,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/tooltip/node_modules/@entur/button": {
-      "version": "3.2.28",
-      "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.2.28.tgz",
-      "integrity": "sha512-iwZP8z/GJP+qaae1oINhnEpSjjOyQUaHhQeAVxQsHgr3DTrx1nFYZBjIr9A0Iwxz09wR2fCXW3+6DMKufuiVgA==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/loader": "^0.5.6",
-        "@entur/tokens": "^3.15.2",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/tooltip/node_modules/@entur/icons": {
-      "version": "6.18.1",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-6.18.1.tgz",
-      "integrity": "sha512-71PWJde25zWJAWqYKjJnJIr9W+xsmBWZIPt7znMF4OEox/VomN4+H6clAJU6NrvPtXbs6u8EOqBtSOkOlVgE9w==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/tokens": "^3.15.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/tooltip/node_modules/@entur/layout": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.3.12.tgz",
-      "integrity": "sha512-JEj0lzvV+SOD9Pd/TJ3w6AwZWaHhRRTy4/SZt4QlVaePKOtkQI71g7c5C+Ek/rQbyXCfOYcvNBH2VGtDvo/KQA==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/icons": "^7.0.0",
-        "@entur/tokens": "^3.15.2",
-        "@entur/typography": "^1.8.41",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/tooltip/node_modules/@entur/layout/node_modules/@entur/icons": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-7.0.0.tgz",
-      "integrity": "sha512-AZhm6S8qUuDX8KzAaLveBqW/XxQXexIUZDI/8LBdV/eaOXIdX+FlTYoOXH+Cz4ND7Qt3bhfi7e2XrrRMHMun8Q==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/tokens": "^3.15.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/tooltip/node_modules/@entur/loader": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.6.tgz",
-      "integrity": "sha512-soyQVHOHm/t+M3XlqTRrtEVmfhYSq+28opYLnwCHZdO2zWe8bAEj2F/AzCFFjvduer3aPMGeL/OXKarArRX6Qg==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/tokens": "^3.15.2",
-        "@entur/typography": "^1.8.41",
-        "@entur/utils": "^0.11.1",
-        "classnames": "^2.3.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/tooltip/node_modules/@entur/utils": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
-      "integrity": "sha512-yT/LH8EK3/TCYDVRolaY/XNdt7zL50HqscXqTkdQxCVZCi0eN3Dv0n7PF1nDbJwBWQELu4Jbb4ykCO3RzQ3Iqw==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "node_modules/@entur/typography": {
       "version": "1.8.41",
       "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.41.tgz",
@@ -2736,19 +2482,7 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/typography/node_modules/@entur/icons": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-7.0.0.tgz",
-      "integrity": "sha512-AZhm6S8qUuDX8KzAaLveBqW/XxQXexIUZDI/8LBdV/eaOXIdX+FlTYoOXH+Cz4ND7Qt3bhfi7e2XrrRMHMun8Q==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/tokens": "^3.15.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@entur/typography/node_modules/@entur/utils": {
+    "node_modules/@entur/utils": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
       "integrity": "sha512-yT/LH8EK3/TCYDVRolaY/XNdt7zL50HqscXqTkdQxCVZCi0eN3Dv0n7PF1nDbJwBWQELu4Jbb4ykCO3RzQ3Iqw==",
@@ -2761,19 +2495,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/utils": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.1.tgz",
-      "integrity": "sha512-g5H29RH8gFbN4DPjfNBqSyiTIvIze374AsIMURgTCvo7asljizS9XhLacAORmeHwInCw9ErBN2pua1BG1aVpYA==",
-      "dependencies": {
-        "react-polymorphic-types": "^1.0.3",
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -4032,42 +3753,6 @@
       "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
       "dev": true
     },
-    "node_modules/@reach/auto-id": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.15.3.tgz",
-      "integrity": "sha512-lbLUI9mrn74qVis141ib0Rsyhgk+gzUMtpplRmjy06cUWDFZyiBATNWMUxN5T+0fU4tpfgcjkAuPeTCCGThKtQ==",
-      "dependencies": {
-        "@reach/utils": "0.15.3",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || 17.x",
-        "react-dom": "^16.8.0 || 17.x"
-      }
-    },
-    "node_modules/@reach/auto-id/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "node_modules/@reach/descendants": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/descendants/-/descendants-0.15.3.tgz",
-      "integrity": "sha512-vuCBG7Uru6IEJ2wvTd7L2xumbYzv2UYBduZ0E1FEABqyUo78eTIZbRcwIN73IxMcivjWipBPlcLLkpFtJKMPew==",
-      "dependencies": {
-        "@reach/utils": "0.15.3",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || 17.x",
-        "react-dom": "^16.8.0 || 17.x"
-      }
-    },
-    "node_modules/@reach/descendants/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
     "node_modules/@reach/dialog": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/@reach/dialog/-/dialog-0.16.2.tgz",
@@ -4112,137 +3797,11 @@
         "react-dom": "^16.8.0 || 17.x"
       }
     },
-    "node_modules/@reach/dialog/node_modules/tslib": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
-      "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="
-    },
-    "node_modules/@reach/dropdown": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/dropdown/-/dropdown-0.15.3.tgz",
-      "integrity": "sha512-nNBJnozc0M+x89dIjqaoQAoymrfYZmaIEJ1Ti3VIcodFh1JWrXsq1qAY10stlK4YRTX8UdXevzSt29bAHZ+pwg==",
-      "dependencies": {
-        "@reach/auto-id": "0.15.3",
-        "@reach/descendants": "0.15.3",
-        "@reach/popover": "0.15.3",
-        "@reach/utils": "0.15.3",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || 17.x",
-        "react-dom": "^16.8.0 || 17.x"
-      }
-    },
-    "node_modules/@reach/dropdown/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "node_modules/@reach/menu-button": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/menu-button/-/menu-button-0.15.3.tgz",
-      "integrity": "sha512-cg9ta5z6JoYv7p+UDMrEhBAgj2O59L9bs8cPjpef1P8DtzXxTJLx9X7jOPTQr8ooUt5jYM+Mw9J6K5vKe7rEYw==",
-      "dependencies": {
-        "@reach/dropdown": "0.15.3",
-        "@reach/popover": "0.15.3",
-        "@reach/utils": "0.15.3",
-        "prop-types": "^15.7.2",
-        "tiny-warning": "^1.0.3",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || 17.x",
-        "react-dom": "^16.8.0 || 17.x"
-      }
-    },
-    "node_modules/@reach/menu-button/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
     "node_modules/@reach/observe-rect": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@reach/observe-rect/-/observe-rect-1.2.0.tgz",
       "integrity": "sha512-Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ=="
     },
-    "node_modules/@reach/popover": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/popover/-/popover-0.15.3.tgz",
-      "integrity": "sha512-T5A1gZGXfl4vDqK6kb7tyxgKWur4QsoKwHJ0LcJZ9JDYtiUDbdBDw+yRHwvuExx48Glc8BYcdy6X6BF2n21FuA==",
-      "dependencies": {
-        "@reach/portal": "0.15.3",
-        "@reach/rect": "0.15.3",
-        "@reach/utils": "0.15.3",
-        "tabbable": "^4.0.0",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || 17.x",
-        "react-dom": "^16.8.0 || 17.x"
-      }
-    },
-    "node_modules/@reach/popover/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "node_modules/@reach/portal": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/portal/-/portal-0.15.3.tgz",
-      "integrity": "sha512-9VkVEQIF9gK73uK1f9MYhrJivd0dpxhkBEb2zwVCIEGvKVxadmRNmCjgcWexGjA0UeCjIhEjQQehs/IZHNLPdw==",
-      "dependencies": {
-        "@reach/utils": "0.15.3",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || 17.x",
-        "react-dom": "^16.8.0 || 17.x"
-      }
-    },
-    "node_modules/@reach/portal/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "node_modules/@reach/rect": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/rect/-/rect-0.15.3.tgz",
-      "integrity": "sha512-ZKakUC14DoCbccc7ymARXCzfpaRMTvbaAibBw64/sg/Vm7W+bi+P3mu5QMQkGNxFKXaKu/szx+r9RzM4ld/IfQ==",
-      "dependencies": {
-        "@reach/observe-rect": "1.2.0",
-        "@reach/utils": "0.15.3",
-        "prop-types": "^15.7.2",
-        "tiny-warning": "^1.0.3",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || 17.x",
-        "react-dom": "^16.8.0 || 17.x"
-      }
-    },
-    "node_modules/@reach/rect/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "node_modules/@reach/utils": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.15.3.tgz",
-      "integrity": "sha512-HFyjw8LZ4/RRk5bcMpDAeEc3aOeLR/vWRDsljlE3cHI5GfFlZcG3DDLSW8C2ba74RCFp/4X3Nz0nOrd4JdkZ1w==",
-      "dependencies": {
-        "tiny-warning": "^1.0.3",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || 17.x",
-        "react-dom": "^16.8.0 || 17.x"
-      }
-    },
-    "node_modules/@reach/utils/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz",
@@ -4881,7 +4440,8 @@
     "node_modules/@types/prop-types": {
       "version": "15.7.5",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==",
+      "devOptional": true
     },
     "node_modules/@types/q": {
       "version": "1.5.5",
@@ -4892,6 +4452,7 @@
       "version": "18.2.7",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.7.tgz",
       "integrity": "sha512-ojrXpSH2XFCmHm7Jy3q44nXDyN54+EYKP2lBhJ2bqfyPj6cIUW/FZW/Csdia34NQgq7KYcAlHi5184m4X88+yw==",
+      "devOptional": true,
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -4947,7 +4508,8 @@
     "node_modules/@types/scheduler": {
       "version": "0.16.3",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
-      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==",
+      "devOptional": true
     },
     "node_modules/@types/source-list-map": {
       "version": "0.1.2",
@@ -8840,7 +8402,8 @@
     "node_modules/csstype": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
+      "devOptional": true
     },
     "node_modules/csv-streamify": {
       "version": "3.0.4",
@@ -22276,14 +21839,6 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "node_modules/react-polymorphic-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/react-polymorphic-types/-/react-polymorphic-types-1.1.0.tgz",
-      "integrity": "sha512-RMHYMdiukpyNFeiWEay10e4kiwIlk1VSiIfvVzrimSJ9KVg9B2iNsd6lw2QPG31S2335YuAPnWPalE2w2eh64w==",
-      "peerDependencies": {
-        "@types/react": ">=16.8.6"
-      }
-    },
     "node_modules/react-popper": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
@@ -25929,9 +25484,10 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/tslib": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
-      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "license": "0BSD"
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
diff --git a/package.json b/package.json
index 4cd1cf0..90c3875 100644
--- a/package.json
+++ b/package.json
@@ -3,16 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@entur/button": "2.10.15",
-    "@entur/form": "4.4.7",
+    "@entur/button": "3.2.28",
+    "@entur/form": "8.0.0",
     "@entur/gbfs-validator": "0.3.0",
-    "@entur/icons": "1.20.0",
-    "@entur/layout": "1.10.4",
-    "@entur/menu": "3.6.6",
+    "@entur/icons": "7.0.0",
+    "@entur/layout": "2.3.12",
+    "@entur/menu": "4.2.36",
     "@entur/modal": "1.7.49",
     "@entur/table": "4.8.14",
     "@entur/tokens": "3.15.2",
-    "@entur/tooltip": "2.7.11",
+    "@entur/tooltip": "3.0.0",
     "@entur/typography": "1.8.41",
     "husky": "6.0.0",
     "lint-staged": "10.5.4",