diff --git a/package-lock.json b/package-lock.json
index e981a73..6b36828 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.33",
+        "@entur/form": "8.1.4",
         "@entur/gbfs-validator": "0.3.0",
-        "@entur/icons": "1.20.0",
-        "@entur/layout": "1.10.4",
-        "@entur/menu": "3.6.6",
+        "@entur/icons": "7.4.1",
+        "@entur/layout": "2.3.17",
+        "@entur/menu": "5.0.2",
         "@entur/modal": "1.7.49",
         "@entur/table": "4.8.14",
         "@entur/tokens": "3.15.2",
-        "@entur/tooltip": "2.7.11",
+        "@entur/tooltip": "5.1.0",
         "@entur/typography": "1.8.41",
         "husky": "6.0.0",
         "lint-staged": "10.5.4",
@@ -1917,39 +1917,38 @@
       }
     },
     "node_modules/@entur/a11y": {
-      "version": "0.2.87",
-      "resolved": "https://registry.npmjs.org/@entur/a11y/-/a11y-0.2.87.tgz",
-      "integrity": "sha512-EhK/I60JVqT/VPc6MG90Ynk38alM7Lk9QNfBl4CJFmfYUM0678Dtzu62KzzEvKXX5YFm2pALyJL14Az9qFB6zw==",
+      "version": "0.2.91",
+      "resolved": "https://registry.npmjs.org/@entur/a11y/-/a11y-0.2.91.tgz",
+      "integrity": "sha512-8ALIhdYz37DR+y75Ia3X0GhgLrcmlB9DywIJ50y+TxKFl740B9U22sA92X1+37ETiN4sJd/xI3g2eUiiDb4vnQ==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/tokens": "^3.15.2",
-        "@entur/utils": "^0.11.1"
+        "@entur/tokens": "^3.17.1",
+        "@entur/utils": "^0.12.0"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
         "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==",
+    "node_modules/@entur/a11y/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.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.33",
+      "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.2.33.tgz",
+      "integrity": "sha512-vfeBFxX4zQ/QCyGVQaDXghON/lyzf+jYizAieCcA9EMtDngCnOwylqK21kBXd/EMsHFcVa+8wwnBL7P0/w47Kw==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/loader": "^0.4.23",
-        "@entur/tokens": "^3.8.0",
-        "@entur/utils": "^0.5.5",
+        "@entur/loader": "^0.5.11",
+        "@entur/tokens": "^3.17.1",
+        "@entur/utils": "^0.12.0",
         "classnames": "^2.3.1"
       },
       "peerDependencies": {
@@ -1957,28 +1956,26 @@
         "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==",
+    "node_modules/@entur/button/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.0"
       }
     },
     "node_modules/@entur/expand": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@entur/expand/-/expand-3.5.17.tgz",
-      "integrity": "sha512-R0IPArxjc8N4CNkGmBkyUNGKBYJ47uUdLZwwG5G3fbhWgz1Bs5gQsetQ1Kpn5fCiA0qO7fjtWPQGUNV1049ERw==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmjs.org/@entur/expand/-/expand-3.5.22.tgz",
+      "integrity": "sha512-V/GdIu0XrvmjeWTO8zfWAABxMkmZNxb8An4TROSMEEAaq5u5O2VraS6OM059dfnWYLvAnkrxnumHHlsgN+MQew==",
       "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",
+        "@entur/icons": "^7.4.1",
+        "@entur/tokens": "^3.17.1",
+        "@entur/typography": "^1.8.46",
+        "@entur/utils": "^0.12.0",
         "classnames": "^2.3.1",
         "react-collapse": "^5.1.0"
       },
@@ -1987,24 +1984,27 @@
         "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/expand/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/tokens": "^3.15.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.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==",
+    "node_modules/@entur/expand/node_modules/@entur/typography": {
+      "version": "1.8.46",
+      "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.46.tgz",
+      "integrity": "sha512-XWq+nvwDafjNoq2Hw5bdvlEq/ioA33jHA5KJEmg/CSGruDcwv/Ws/VktsGrTSuJgCu0GlxMS1LFMlWSdhW8HLA==",
+      "license": "SEE LICENSE IN README.md",
       "dependencies": {
-        "tiny-warning": "^1.0.3"
+        "@entur/icons": "^7.4.1",
+        "@entur/tokens": "^3.17.1",
+        "@entur/utils": "^0.12.0",
+        "classnames": "^2.3.1",
+        "normalize-scss": "^7.0.1"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -2012,15 +2012,16 @@
       }
     },
     "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",
+      "version": "8.1.4",
+      "resolved": "https://registry.npmjs.org/@entur/form/-/form-8.1.4.tgz",
+      "integrity": "sha512-OpLV6aXbyjxNkXDmL6D3poH0iqjlN17xeHdnQqZq1vQzsuD0osTRpLZNioT2x/VnIshG4ophTeehAgmnAtxOFw==",
+      "license": "EUPL-1.2",
+      "dependencies": {
+        "@entur/icons": "^7.4.1",
+        "@entur/tokens": "^3.17.1",
+        "@entur/tooltip": "^5.1.0",
+        "@entur/typography": "^1.8.46",
+        "@entur/utils": "^0.12.0",
         "classnames": "^2.3.1"
       },
       "peerDependencies": {
@@ -2028,26 +2029,27 @@
         "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==",
+    "node_modules/@entur/form/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/tokens": "^3.3.1",
-        "@entur/utils": "^0.4.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.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==",
+    "node_modules/@entur/form/node_modules/@entur/typography": {
+      "version": "1.8.46",
+      "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.46.tgz",
+      "integrity": "sha512-XWq+nvwDafjNoq2Hw5bdvlEq/ioA33jHA5KJEmg/CSGruDcwv/Ws/VktsGrTSuJgCu0GlxMS1LFMlWSdhW8HLA==",
+      "license": "SEE LICENSE IN README.md",
       "dependencies": {
-        "react-polymorphic-types": "^1.1.0",
-        "tiny-warning": "^1.0.3"
+        "@entur/icons": "^7.4.1",
+        "@entur/tokens": "^3.17.1",
+        "@entur/utils": "^0.12.0",
+        "classnames": "^2.3.1",
+        "normalize-scss": "^7.0.1"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -2258,40 +2260,37 @@
       }
     },
     "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==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-7.4.1.tgz",
+      "integrity": "sha512-0IFZ56ApSAQW3dNbH2pwdcUQsInZTfUAJcxPfRBv9WwNrbTWuADCZJOkMxyAoddMdA8ExifpuL9PLqT834P+Ew==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/tokens": "^3.0.1",
-        "@entur/utils": "^0.4.1"
+        "@entur/tokens": "^3.17.1"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "react": ">=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==",
+    "node_modules/@entur/icons/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
+      "license": "EUPL-1.2",
       "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"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.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==",
+    "node_modules/@entur/layout": {
+      "version": "2.3.17",
+      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.3.17.tgz",
+      "integrity": "sha512-DsXdkQa/9LLNP2oTfcowEKcIifQFgi75wPg4LYtY9HGJTDEvbj2j0Kjsz6GJ+DNUvtY4v+JDWrBHWZdu5JwPhw==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/tokens": "^3.14.0",
-        "@entur/typography": "^1.8.34",
-        "@entur/utils": "^0.11.1",
+        "@entur/icons": "^7.4.1",
+        "@entur/tokens": "^3.17.1",
+        "@entur/typography": "^1.8.46",
+        "@entur/utils": "^0.12.0",
         "classnames": "^2.3.1"
       },
       "peerDependencies": {
@@ -2299,58 +2298,42 @@
         "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==",
+    "node_modules/@entur/layout/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
+      "license": "EUPL-1.2",
       "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"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.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==",
+    "node_modules/@entur/layout/node_modules/@entur/typography": {
+      "version": "1.8.46",
+      "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.46.tgz",
+      "integrity": "sha512-XWq+nvwDafjNoq2Hw5bdvlEq/ioA33jHA5KJEmg/CSGruDcwv/Ws/VktsGrTSuJgCu0GlxMS1LFMlWSdhW8HLA==",
+      "license": "SEE LICENSE IN README.md",
       "dependencies": {
-        "@entur/tokens": "^3.3.1",
-        "@entur/utils": "^0.4.3"
+        "@entur/icons": "^7.4.1",
+        "@entur/tokens": "^3.17.1",
+        "@entur/utils": "^0.12.0",
+        "classnames": "^2.3.1",
+        "normalize-scss": "^7.0.1"
       },
       "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==",
+    "node_modules/@entur/loader": {
+      "version": "0.5.11",
+      "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.11.tgz",
+      "integrity": "sha512-Pd7arKrYnEtt5+rYLsIZO27zTZK49AzQzByhU252DyUoQHAWDUk23E/lX5gJFGZv60VQP23TNqWw8phN00Yq+A==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/typography": "^1.6.12",
-        "@entur/utils": "^0.4.3",
+        "@entur/tokens": "^3.17.1",
+        "@entur/typography": "^1.8.46",
+        "@entur/utils": "^0.12.0",
         "classnames": "^2.3.1"
       },
       "peerDependencies": {
@@ -2358,50 +2341,49 @@
         "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==",
+    "node_modules/@entur/loader/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "react-polymorphic-types": "^1.1.0",
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.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",
+    "node_modules/@entur/loader/node_modules/@entur/typography": {
+      "version": "1.8.46",
+      "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.46.tgz",
+      "integrity": "sha512-XWq+nvwDafjNoq2Hw5bdvlEq/ioA33jHA5KJEmg/CSGruDcwv/Ws/VktsGrTSuJgCu0GlxMS1LFMlWSdhW8HLA==",
+      "license": "SEE LICENSE IN README.md",
       "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",
+        "@entur/icons": "^7.4.1",
+        "@entur/tokens": "^3.17.1",
+        "@entur/utils": "^0.12.0",
         "classnames": "^2.3.1",
-        "react-focus-lock": "^2.9.1"
+        "normalize-scss": "^7.0.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==",
+    "node_modules/@entur/menu": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@entur/menu/-/menu-5.0.2.tgz",
+      "integrity": "sha512-58gV1ZIkn2PQsdmYkgGNewWxT/sHdJL0d0DvK49dWHm0noDd53BPtCD1fJCNiDcl0x2Vr5QYmeIGusX2byWfvA==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/loader": "^0.5.6",
-        "@entur/tokens": "^3.15.2",
-        "@entur/utils": "^0.11.1",
+        "@entur/a11y": "^0.2.91",
+        "@entur/button": "^3.2.33",
+        "@entur/expand": "^3.5.22",
+        "@entur/icons": "^7.4.1",
+        "@entur/layout": "^2.3.17",
+        "@entur/tokens": "^3.17.1",
+        "@entur/tooltip": "^5.1.0",
+        "@entur/typography": "^1.8.46",
+        "@entur/utils": "^0.12.0",
+        "@floating-ui/react": "^0.26.23",
         "classnames": "^2.3.1"
       },
       "peerDependencies": {
@@ -2409,45 +2391,49 @@
         "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==",
+    "node_modules/@entur/menu/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/tokens": "^3.15.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.0"
       }
     },
-    "node_modules/@entur/modal/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/@entur/typography": {
+      "version": "1.8.46",
+      "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.46.tgz",
+      "integrity": "sha512-XWq+nvwDafjNoq2Hw5bdvlEq/ioA33jHA5KJEmg/CSGruDcwv/Ws/VktsGrTSuJgCu0GlxMS1LFMlWSdhW8HLA==",
+      "license": "SEE LICENSE IN README.md",
       "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"
+        "@entur/icons": "^7.4.1",
+        "@entur/tokens": "^3.17.1",
+        "@entur/utils": "^0.12.0",
+        "classnames": "^2.3.1",
+        "normalize-scss": "^7.0.1"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/@entur/modal/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==",
+    "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",
-        "classnames": "^2.3.1"
+        "@reach/dialog": "^0.16.0",
+        "classnames": "^2.3.1",
+        "react-focus-lock": "^2.9.1"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -2491,85 +2477,6 @@
         "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",
-      "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/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",
-      "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"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "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",
-      "dependencies": {
-        "@entur/tokens": "^3.15.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "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",
-      "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/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",
-      "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/table/node_modules/@entur/tooltip": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-3.0.0.tgz",
@@ -2614,91 +2521,18 @@
       }
     },
     "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==",
-      "license": "EUPL-1.2",
-      "dependencies": {
-        "@entur/button": "^3.2.27",
-        "@entur/icons": "^6.18.1",
-        "@entur/layout": "^2.3.11",
-        "@entur/tokens": "^3.15.2",
-        "@entur/utils": "^0.11.1",
-        "@popperjs/core": "^2.10.1",
-        "classnames": "^2.3.1",
-        "react-popper": "~2.2.5"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "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==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-5.1.0.tgz",
+      "integrity": "sha512-dYK3ZI6Hn1wYdJTjrwNRENlbZK9pxzbV2iJFUPYbjfVSIue2P95Yg8J+bvKFn++PmN6EnoI9NlNCetS23mLc/g==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "@entur/tokens": "^3.15.2",
-        "@entur/typography": "^1.8.41",
-        "@entur/utils": "^0.11.1",
+        "@entur/button": "^3.2.33",
+        "@entur/icons": "^7.4.1",
+        "@entur/layout": "^2.3.17",
+        "@entur/tokens": "^3.17.1",
+        "@entur/utils": "^0.12.0",
+        "@floating-ui/react": "^0.26.24",
+        "@floating-ui/react-dom": "^2.1.0",
         "classnames": "^2.3.1"
       },
       "peerDependencies": {
@@ -2706,17 +2540,14 @@
         "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==",
+    "node_modules/@entur/tooltip/node_modules/@entur/tokens": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.1.tgz",
+      "integrity": "sha512-yciNomhYTeMdn/AiqFXMSRLIDChMcSMgeglHYZSMQfhpF9w8GhEEDQCCPWSC1BfADAr+QLlcCnuHV2exYlRqXA==",
       "license": "EUPL-1.2",
       "dependencies": {
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "flat": "^5.0.1",
+        "hex-rgb": "^4.3.0"
       }
     },
     "node_modules/@entur/typography": {
@@ -2736,18 +2567,6 @@
         "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": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
@@ -2762,11 +2581,11 @@
       }
     },
     "node_modules/@entur/utils": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.1.tgz",
-      "integrity": "sha512-g5H29RH8gFbN4DPjfNBqSyiTIvIze374AsIMURgTCvo7asljizS9XhLacAORmeHwInCw9ErBN2pua1BG1aVpYA==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.12.0.tgz",
+      "integrity": "sha512-1KoT6CZ2eLHOh15Ko9Vv5FmXPdqyyrfeA5xV/ZGaK7r9JSkno70DJES0bSMku8+nzty55Z2ZHJnZcnah+xWHhA==",
+      "license": "EUPL-1.2",
       "dependencies": {
-        "react-polymorphic-types": "^1.0.3",
         "tiny-warning": "^1.0.3"
       },
       "peerDependencies": {
@@ -2826,6 +2645,65 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@floating-ui/core": {
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",
+      "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.8"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz",
+      "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/core": "^1.6.0",
+        "@floating-ui/utils": "^0.2.8"
+      }
+    },
+    "node_modules/@floating-ui/react": {
+      "version": "0.26.25",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.25.tgz",
+      "integrity": "sha512-hZOmgN0NTOzOuZxI1oIrDu3Gcl8WViIkvPMpB4xdd4QD6xAMtwgwr3VPoiyH/bLtRcS1cDnhxLSD1NsMJmwh/A==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/react-dom": "^2.1.2",
+        "@floating-ui/utils": "^0.2.8",
+        "tabbable": "^6.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@floating-ui/react-dom": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
+      "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@floating-ui/react/node_modules/tabbable": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
+      "license": "MIT"
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
+      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
+      "license": "MIT"
+    },
     "node_modules/@gar/promisify": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
@@ -4032,42 +3910,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",
@@ -4117,132 +3959,6 @@
       "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 +4597,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 +4609,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 +4665,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 +8559,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 +21996,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",
@@ -25223,11 +24935,6 @@
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
-    "node_modules/tabbable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
-      "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
-    },
     "node_modules/table": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
diff --git a/package.json b/package.json
index 4cd1cf0..0c01deb 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.33",
+    "@entur/form": "8.1.4",
     "@entur/gbfs-validator": "0.3.0",
-    "@entur/icons": "1.20.0",
-    "@entur/layout": "1.10.4",
-    "@entur/menu": "3.6.6",
+    "@entur/icons": "7.4.1",
+    "@entur/layout": "2.3.17",
+    "@entur/menu": "5.0.2",
     "@entur/modal": "1.7.49",
     "@entur/table": "4.8.14",
     "@entur/tokens": "3.15.2",
-    "@entur/tooltip": "2.7.11",
+    "@entur/tooltip": "5.1.0",
     "@entur/typography": "1.8.41",
     "husky": "6.0.0",
     "lint-staged": "10.5.4",