diff --git a/package-lock.json b/package-lock.json
index ca11a37..5f4ebbd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1502,22 +1502,89 @@
       }
     },
     "@entur/a11y": {
-      "version": "0.2.31",
-      "resolved": "https://registry.npmjs.org/@entur/a11y/-/a11y-0.2.31.tgz",
-      "integrity": "sha512-GXrE+GgfiPcbMajl9rwtJp0VJAHQE/OhgQ/RbhILdyn79Loqh8ygu9CvjAMZdNBrzlbxzeR/M78ZvIcjReWKOA==",
+      "version": "0.2.90",
+      "resolved": "https://registry.npmjs.org/@entur/a11y/-/a11y-0.2.90.tgz",
+      "integrity": "sha512-tXR4mjvFykls7ERItWOWcXJfA0gxbxDSfbSyoI+HFa9iDJkZnJAnqyLQdxhtPEN3DjiHKKItLGzAVQhtDe6Mkw==",
       "requires": {
-        "@entur/tokens": "^2.0.1",
-        "@entur/typography": "^1.6.0",
-        "@entur/utils": "^0.4.0"
+        "@entur/tokens": "^3.17.0",
+        "@entur/utils": "^0.11.2"
+      },
+      "dependencies": {
+        "@entur/tokens": {
+          "version": "3.17.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.0.tgz",
+          "integrity": "sha512-xtuJ+EbVxljK8rksaZHXf0yoY6eiGk0tEJJ+D2Pm/pwyJvC87VMotcH3w/lqiNEb2anpyqnhhpSAFQ41v3bV5A==",
+          "requires": {
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
+          }
+        },
+        "@entur/utils": {
+          "version": "0.11.2",
+          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.2.tgz",
+          "integrity": "sha512-2opQcrO0J5mzyaLlDEehytrD6Sf4TSGKEnbUnzYAMI2QBrXAW3Jlp6/+m7sRzOOI+6IRsB6jVSjrofgFWaU0Iw==",
+          "requires": {
+            "tiny-warning": "^1.0.3"
+          }
+        },
+        "hex-rgb": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+          "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+        }
       }
     },
     "@entur/button": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.4.0.tgz",
-      "integrity": "sha512-9YHJMOj49rN0jVWbk36W9kO3UN/6mGOLBgg7oeHzbVf8aFd5CCZa54wL7wdkTnwSujIylw4vcJKjvHMw+mi05w==",
+      "version": "2.10.15",
+      "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.10.15.tgz",
+      "integrity": "sha512-8FYfFz4P3ZTQZew5ndhNkSS8qBd/lIeM52bzoJarPLGA0FDIrehXcTZG842jWkouA+OTaPVp1x0+VcS4mKUftw==",
       "requires": {
-        "@entur/utils": "^0.4.0",
-        "classnames": "^2.2.6"
+        "@entur/loader": "^0.4.23",
+        "@entur/tokens": "^3.8.0",
+        "@entur/utils": "^0.5.5",
+        "classnames": "^2.3.1"
+      },
+      "dependencies": {
+        "@entur/loader": {
+          "version": "0.4.65",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.4.65.tgz",
+          "integrity": "sha512-pQBqwmPZ5VL80awid1knz8Tic6cxtDcrrl1rYsKcOr4QJiMUQuV48fGeBOvTmX42ciGZh+z7VqtxxtMtCFrhhw==",
+          "requires": {
+            "@entur/tokens": "^3.14.0",
+            "@entur/typography": "^1.8.34",
+            "@entur/utils": "^0.11.1",
+            "classnames": "^2.3.1"
+          },
+          "dependencies": {
+            "@entur/utils": {
+              "version": "0.11.2",
+              "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.2.tgz",
+              "integrity": "sha512-2opQcrO0J5mzyaLlDEehytrD6Sf4TSGKEnbUnzYAMI2QBrXAW3Jlp6/+m7sRzOOI+6IRsB6jVSjrofgFWaU0Iw==",
+              "requires": {
+                "tiny-warning": "^1.0.3"
+              }
+            }
+          }
+        },
+        "@entur/tokens": {
+          "version": "3.17.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.0.tgz",
+          "integrity": "sha512-xtuJ+EbVxljK8rksaZHXf0yoY6eiGk0tEJJ+D2Pm/pwyJvC87VMotcH3w/lqiNEb2anpyqnhhpSAFQ41v3bV5A==",
+          "requires": {
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
+          }
+        },
+        "classnames": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+          "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
+        },
+        "hex-rgb": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+          "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+        }
       }
     },
     "@entur/chip": {
@@ -1781,35 +1848,98 @@
       }
     },
     "@entur/form": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@entur/form/-/form-4.0.8.tgz",
-      "integrity": "sha512-vA+NwxfzH4T+++i9lURVULKZTvxmF+q6xcfTV/hi1e8jl8HbRX/aJvsSGUy2FaP8TOJGSK3T7i6e15MtaRgvCQ==",
-      "requires": {
-        "@entur/icons": "^1.15.2",
-        "@entur/tokens": "^2.0.1",
-        "@entur/tooltip": "^2.4.9",
-        "@entur/typography": "^1.6.0",
-        "@entur/utils": "^0.4.0",
-        "classnames": "^2.2.6"
+      "version": "4.4.7",
+      "resolved": "https://registry.npmjs.org/@entur/form/-/form-4.4.7.tgz",
+      "integrity": "sha512-+307RxSX5SlFqMbrfU+AYJNMb7udWTVXyPrTRSIsJIIYPxuSAoOMW1OvB+uLKcqQ4oLcZpRwONlnAnoNUn3ZhA==",
+      "requires": {
+        "@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",
+        "classnames": "^2.3.1"
+      },
+      "dependencies": {
+        "@entur/icons": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-3.5.0.tgz",
+          "integrity": "sha512-TsZ6XOt0P1pfqaovusx2Fbrv4HkVw2yLzmP/MJsFAmVVzpynpoT21/4zGWydr2vZREtjPM21p+zwPhN1ENnQKQ==",
+          "requires": {
+            "@entur/tokens": "^3.3.1",
+            "@entur/utils": "^0.4.3"
+          }
+        },
+        "@entur/tokens": {
+          "version": "3.17.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.0.tgz",
+          "integrity": "sha512-xtuJ+EbVxljK8rksaZHXf0yoY6eiGk0tEJJ+D2Pm/pwyJvC87VMotcH3w/lqiNEb2anpyqnhhpSAFQ41v3bV5A==",
+          "requires": {
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
+          }
+        },
+        "@entur/utils": {
+          "version": "0.4.9",
+          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.9.tgz",
+          "integrity": "sha512-dyXs26JzboR9TlV3gVRFi8HzAXEvvCMnTnGbRrK7RzujXcUqLO1QzzL7dh7iLtFGcvkSGNU36tmVsPXPqhkNIw==",
+          "requires": {
+            "tiny-warning": "^1.0.3"
+          }
+        },
+        "classnames": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+          "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
+        },
+        "hex-rgb": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+          "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+        }
       }
     },
     "@entur/icons": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-1.15.2.tgz",
-      "integrity": "sha512-6WI87E20zwAREW/MG0wJVp7+4WUMW981wJhpc72BTboHXuMgWWw5pPY9t5wJguwZqwVAO6ZasMFDPXATP9foQg==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-7.3.0.tgz",
+      "integrity": "sha512-4s+f0CBJRk4F6lR/0cLBo4q+d3e8YZhUoqls4QzQsZ7PCqG+2pc4pK+0fot84BpxXGPnSUUjs4M713BmK7bePA==",
       "requires": {
-        "@entur/tokens": "^2.0.1",
-        "@entur/utils": "^0.4.0"
+        "@entur/tokens": "^3.17.0"
+      },
+      "dependencies": {
+        "@entur/tokens": {
+          "version": "3.17.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.0.tgz",
+          "integrity": "sha512-xtuJ+EbVxljK8rksaZHXf0yoY6eiGk0tEJJ+D2Pm/pwyJvC87VMotcH3w/lqiNEb2anpyqnhhpSAFQ41v3bV5A==",
+          "requires": {
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
+          }
+        },
+        "hex-rgb": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+          "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+        }
       }
     },
     "@entur/layout": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-1.9.0.tgz",
-      "integrity": "sha512-KUy4mtMgX61FV4X8tbbhx1DujRkWBw2FImLrs2J7032DDeUaBGoRlRkk3LF5652yEItFCjpd70ATO2OOz7rlvw==",
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-1.10.4.tgz",
+      "integrity": "sha512-pDsPRN2JVuL2hdexku39XQWnBWMubm1rCQxTuruEoJ0FQ1KMQyigaA0l4iddt4VOZBMu1pG/SbdM+U0ZtUD4JQ==",
       "requires": {
-        "@entur/typography": "^1.6.0",
-        "@entur/utils": "^0.4.0",
+        "@entur/typography": "^1.6.6",
+        "@entur/utils": "^0.4.1",
         "classnames": "^2.2.6"
+      },
+      "dependencies": {
+        "@entur/utils": {
+          "version": "0.4.9",
+          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.9.tgz",
+          "integrity": "sha512-dyXs26JzboR9TlV3gVRFi8HzAXEvvCMnTnGbRrK7RzujXcUqLO1QzzL7dh7iLtFGcvkSGNU36tmVsPXPqhkNIw==",
+          "requires": {
+            "tiny-warning": "^1.0.3"
+          }
+        }
       }
     },
     "@entur/loader": {
@@ -1848,21 +1978,83 @@
       }
     },
     "@entur/modal": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/@entur/modal/-/modal-1.3.8.tgz",
-      "integrity": "sha512-9dyxTN+fUoA3cRYtQRKLvVY/uYrphR0Zz9vEaWqZDllLBSnCaNlVyX/jpP8pGVOzIUtIVjjVxFNHXivAIc1QdA==",
-      "requires": {
-        "@entur/a11y": "^0.2.31",
-        "@entur/button": "^2.4.0",
-        "@entur/icons": "^1.15.2",
-        "@entur/layout": "^1.9.0",
-        "@entur/tokens": "^2.0.1",
-        "@entur/typography": "^1.6.0",
-        "@entur/utils": "^0.4.0",
-        "@reach/dialog": "0.10.5",
-        "@types/reach__dialog": "^0.1.0",
-        "classnames": "^2.2.6",
-        "react-focus-lock": "^2.2.1"
+      "version": "1.7.52",
+      "resolved": "https://registry.npmjs.org/@entur/modal/-/modal-1.7.52.tgz",
+      "integrity": "sha512-1SSA4RKuSMYWOUxPBtF9gsY8ULWbPlIbFA2KA7ckPDwPWplEpZhbZtJ9uF6si9n2Vwb5Ehh+f/YLTVVXO6zx6g==",
+      "requires": {
+        "@entur/a11y": "^0.2.90",
+        "@entur/button": "^3.2.31",
+        "@entur/icons": "^7.3.0",
+        "@entur/layout": "^2.3.15",
+        "@entur/tokens": "^3.17.0",
+        "@entur/typography": "^1.8.44",
+        "@entur/utils": "^0.11.2",
+        "@reach/dialog": "^0.16.0",
+        "classnames": "^2.3.1",
+        "react-focus-lock": "^2.9.1"
+      },
+      "dependencies": {
+        "@entur/button": {
+          "version": "3.2.31",
+          "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.2.31.tgz",
+          "integrity": "sha512-BlYxCvG8Hi4lwzWq2v3uR8j55HtCSmK5CjuSfzNsiixhDSK0u4Wso3FmyTdESFRh8Srsn19/9XheExclpRY1jw==",
+          "requires": {
+            "@entur/loader": "^0.5.9",
+            "@entur/tokens": "^3.17.0",
+            "@entur/utils": "^0.11.2",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/layout": {
+          "version": "2.3.15",
+          "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.3.15.tgz",
+          "integrity": "sha512-vKYL9f3VHqzUDzJKY8b9Yw0lfi9o/i/m/lbOgZFMz/uYpmsxlzA5tSR4iLguYQCfTPQ0BY53cae8RvBHXnsV1Q==",
+          "requires": {
+            "@entur/icons": "^7.3.0",
+            "@entur/tokens": "^3.17.0",
+            "@entur/typography": "^1.8.44",
+            "@entur/utils": "^0.11.2",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/loader": {
+          "version": "0.5.9",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.9.tgz",
+          "integrity": "sha512-Kbo6p/mhsWs9sZPzcF6C+FXUTH1tE7HKUj2dQ8gvkYOWkWhC8JZ3zELepif7EuSJ6n9k3hQSo7IXwjN6gwL4Og==",
+          "requires": {
+            "@entur/tokens": "^3.17.0",
+            "@entur/typography": "^1.8.44",
+            "@entur/utils": "^0.11.2",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/tokens": {
+          "version": "3.17.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.0.tgz",
+          "integrity": "sha512-xtuJ+EbVxljK8rksaZHXf0yoY6eiGk0tEJJ+D2Pm/pwyJvC87VMotcH3w/lqiNEb2anpyqnhhpSAFQ41v3bV5A==",
+          "requires": {
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
+          }
+        },
+        "@entur/utils": {
+          "version": "0.11.2",
+          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.2.tgz",
+          "integrity": "sha512-2opQcrO0J5mzyaLlDEehytrD6Sf4TSGKEnbUnzYAMI2QBrXAW3Jlp6/+m7sRzOOI+6IRsB6jVSjrofgFWaU0Iw==",
+          "requires": {
+            "tiny-warning": "^1.0.3"
+          }
+        },
+        "classnames": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+          "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
+        },
+        "hex-rgb": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+          "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+        }
       }
     },
     "@entur/tokens": {
@@ -1874,59 +2066,147 @@
       }
     },
     "@entur/tooltip": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-2.4.9.tgz",
-      "integrity": "sha512-TokZN98IUPSgur5LW6oSLadInBGRk8A2YcVhTzHQIvEL286fF5HWHciszRRcUEeU/TKti6dm1Belo7cY2IX3IQ==",
-      "requires": {
-        "@entur/button": "^2.4.0",
-        "@entur/icons": "^1.15.2",
-        "@entur/layout": "^1.9.0",
-        "@entur/utils": "^0.4.0",
-        "@popperjs/core": "2.4.4",
-        "react-popper": "^2.2.3"
+      "version": "2.7.11",
+      "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-2.7.11.tgz",
+      "integrity": "sha512-ldhHXH6fhenoff8DYVEB09b8IKb5buC+RNxc90dqygphG0UdPoc7jKcYcWvA+6BPECLUBhc23qXxvVDlSmrw5Q==",
+      "requires": {
+        "@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"
+      },
+      "dependencies": {
+        "@entur/button": {
+          "version": "3.2.31",
+          "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.2.31.tgz",
+          "integrity": "sha512-BlYxCvG8Hi4lwzWq2v3uR8j55HtCSmK5CjuSfzNsiixhDSK0u4Wso3FmyTdESFRh8Srsn19/9XheExclpRY1jw==",
+          "requires": {
+            "@entur/loader": "^0.5.9",
+            "@entur/tokens": "^3.17.0",
+            "@entur/utils": "^0.11.2",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/icons": {
+          "version": "6.18.1",
+          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-6.18.1.tgz",
+          "integrity": "sha512-71PWJde25zWJAWqYKjJnJIr9W+xsmBWZIPt7znMF4OEox/VomN4+H6clAJU6NrvPtXbs6u8EOqBtSOkOlVgE9w==",
+          "requires": {
+            "@entur/tokens": "^3.15.2"
+          }
+        },
+        "@entur/layout": {
+          "version": "2.3.15",
+          "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.3.15.tgz",
+          "integrity": "sha512-vKYL9f3VHqzUDzJKY8b9Yw0lfi9o/i/m/lbOgZFMz/uYpmsxlzA5tSR4iLguYQCfTPQ0BY53cae8RvBHXnsV1Q==",
+          "requires": {
+            "@entur/icons": "^7.3.0",
+            "@entur/tokens": "^3.17.0",
+            "@entur/typography": "^1.8.44",
+            "@entur/utils": "^0.11.2",
+            "classnames": "^2.3.1"
+          },
+          "dependencies": {
+            "@entur/icons": {
+              "version": "7.3.0",
+              "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-7.3.0.tgz",
+              "integrity": "sha512-4s+f0CBJRk4F6lR/0cLBo4q+d3e8YZhUoqls4QzQsZ7PCqG+2pc4pK+0fot84BpxXGPnSUUjs4M713BmK7bePA==",
+              "requires": {
+                "@entur/tokens": "^3.17.0"
+              }
+            }
+          }
+        },
+        "@entur/loader": {
+          "version": "0.5.9",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.9.tgz",
+          "integrity": "sha512-Kbo6p/mhsWs9sZPzcF6C+FXUTH1tE7HKUj2dQ8gvkYOWkWhC8JZ3zELepif7EuSJ6n9k3hQSo7IXwjN6gwL4Og==",
+          "requires": {
+            "@entur/tokens": "^3.17.0",
+            "@entur/typography": "^1.8.44",
+            "@entur/utils": "^0.11.2",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/tokens": {
+          "version": "3.17.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.0.tgz",
+          "integrity": "sha512-xtuJ+EbVxljK8rksaZHXf0yoY6eiGk0tEJJ+D2Pm/pwyJvC87VMotcH3w/lqiNEb2anpyqnhhpSAFQ41v3bV5A==",
+          "requires": {
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
+          }
+        },
+        "@entur/utils": {
+          "version": "0.11.2",
+          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.2.tgz",
+          "integrity": "sha512-2opQcrO0J5mzyaLlDEehytrD6Sf4TSGKEnbUnzYAMI2QBrXAW3Jlp6/+m7sRzOOI+6IRsB6jVSjrofgFWaU0Iw==",
+          "requires": {
+            "tiny-warning": "^1.0.3"
+          }
+        },
+        "classnames": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+          "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
+        },
+        "hex-rgb": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+          "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+        }
       }
     },
     "@entur/typography": {
-      "version": "1.6.11",
-      "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.6.11.tgz",
-      "integrity": "sha512-Uf7dAYRY3usLOHRSdBhofa7iwqoFc1sS2cPb59wo/sb95cR5VgVLQL7p4rAicpOxqOW73UXDSno2+1kO5ag4zg==",
+      "version": "1.8.44",
+      "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.44.tgz",
+      "integrity": "sha512-FadVOseM/+IHnc2ZkPr7g2H0EpbnFZM3sKDsNp/3b3lxUxvZZsPXW97zaNeVmMxBxc4OGSTj8Tr+iMkMQerTaw==",
       "requires": {
-        "@entur/utils": "^0.4.3",
-        "@types/classnames": "^2.3.1",
+        "@entur/icons": "^7.3.0",
+        "@entur/tokens": "^3.17.0",
+        "@entur/utils": "^0.11.2",
         "classnames": "^2.3.1",
         "normalize-scss": "^7.0.1"
       },
       "dependencies": {
-        "@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==",
+        "@entur/tokens": {
+          "version": "3.17.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.17.0.tgz",
+          "integrity": "sha512-xtuJ+EbVxljK8rksaZHXf0yoY6eiGk0tEJJ+D2Pm/pwyJvC87VMotcH3w/lqiNEb2anpyqnhhpSAFQ41v3bV5A==",
           "requires": {
-            "react-polymorphic-types": "^1.1.0",
-            "tiny-warning": "^1.0.3"
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
           }
         },
-        "@types/classnames": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz",
-          "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==",
+        "@entur/utils": {
+          "version": "0.11.2",
+          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.2.tgz",
+          "integrity": "sha512-2opQcrO0J5mzyaLlDEehytrD6Sf4TSGKEnbUnzYAMI2QBrXAW3Jlp6/+m7sRzOOI+6IRsB6jVSjrofgFWaU0Iw==",
           "requires": {
-            "classnames": "*"
+            "tiny-warning": "^1.0.3"
           }
         },
         "classnames": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-          "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+          "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
+        },
+        "hex-rgb": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+          "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
         }
       }
     },
     "@entur/utils": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.0.tgz",
-      "integrity": "sha512-iBkIjEqT0f0SsB0K7PYZOtSxOBxlXU0DTwyauX2sIuy2WXY2LB8jbWMVUvSzBDLr1poEedW74GAzFa6IvajW0A==",
+      "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==",
       "requires": {
-        "react-polymorphic-box": "^3.0.2",
         "tiny-warning": "^1.0.3"
       }
     },
@@ -2373,33 +2653,12 @@
           "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
           "optional": true
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "optional": true
-        },
         "emoji-regex": {
           "version": "9.2.2",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
           "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
           "optional": true
         },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "optional": true
-        },
         "string-width": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
@@ -2411,40 +2670,6 @@
             "strip-ansi": "^7.0.1"
           }
         },
-        "string-width-cjs": {
-          "version": "npm:string-width@4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "optional": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "5.0.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-              "optional": true
-            },
-            "emoji-regex": {
-              "version": "8.0.0",
-              "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-              "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-              "optional": true
-            },
-            "strip-ansi": {
-              "version": "6.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-              "optional": true,
-              "requires": {
-                "ansi-regex": "^5.0.1"
-              }
-            }
-          }
-        },
         "strip-ansi": {
           "version": "7.1.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
@@ -2454,23 +2679,6 @@
             "ansi-regex": "^6.0.1"
           }
         },
-        "strip-ansi-cjs": {
-          "version": "npm:strip-ansi@6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "5.0.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-              "optional": true
-            }
-          }
-        },
         "wrap-ansi": {
           "version": "8.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
@@ -2481,60 +2689,6 @@
             "string-width": "^5.0.1",
             "strip-ansi": "^7.0.1"
           }
-        },
-        "wrap-ansi-cjs": {
-          "version": "npm:wrap-ansi@7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "5.0.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-              "optional": true
-            },
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "optional": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "emoji-regex": {
-              "version": "8.0.0",
-              "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-              "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-              "optional": true
-            },
-            "string-width": {
-              "version": "4.2.3",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-              "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-              "optional": true,
-              "requires": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-              }
-            },
-            "strip-ansi": {
-              "version": "6.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-              "optional": true,
-              "requires": {
-                "ansi-regex": "^5.0.1"
-              }
-            }
-          }
         }
       }
     },
@@ -3450,9 +3604,9 @@
       }
     },
     "@popperjs/core": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.4.4.tgz",
-      "integrity": "sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg=="
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="
     },
     "@probe.gl/stats": {
       "version": "3.3.0",
@@ -3517,55 +3671,55 @@
       "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
     },
     "@reach/dialog": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/@reach/dialog/-/dialog-0.10.5.tgz",
-      "integrity": "sha512-j2+VaHCen/M5zh+q6L/xMXETMeD5yVywdhjjs0kn2uQ3AolYSj32P8Go1xSpxQNAjS1/zChd02Y/4g02eL3afg==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/dialog/-/dialog-0.16.2.tgz",
+      "integrity": "sha512-qq8oX0cROgTb8LjOKWzzNm4SqaN9b89lJHr7UyVo2aQ6WbeNzZBxqXhGywFP7dkR+hNqOJnrA59PXFWhfttA9A==",
       "requires": {
-        "@reach/portal": "0.10.5",
-        "@reach/utils": "0.10.5",
+        "@reach/portal": "0.16.2",
+        "@reach/utils": "0.16.0",
         "prop-types": "^15.7.2",
-        "react-focus-lock": "^2.3.1",
-        "react-remove-scroll": "^2.3.0",
-        "tslib": "^2.0.0"
+        "react-focus-lock": "^2.5.2",
+        "react-remove-scroll": "^2.4.3",
+        "tslib": "^2.3.0"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
         }
       }
     },
     "@reach/portal": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/@reach/portal/-/portal-0.10.5.tgz",
-      "integrity": "sha512-K5K8gW99yqDPDCWQjEfSNZAbGOQWSx5AN2lpuR1gDVoz4xyWpTJ0k0LbetYJTDVvLP/InEcR7AU42JaDYDCXQw==",
+      "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==",
       "requires": {
-        "@reach/utils": "0.10.5",
-        "tslib": "^2.0.0"
+        "@reach/utils": "0.16.0",
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
         }
       }
     },
     "@reach/utils": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.10.5.tgz",
-      "integrity": "sha512-5E/xxQnUbmpI/LrufBAOXjunl96DnqX6B4zC2MO2KH/dRzLug5gM5VuOwV26egsp0jvsSPxojwciOhS43px3qw==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.16.0.tgz",
+      "integrity": "sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==",
       "requires": {
-        "@types/warning": "^3.0.0",
-        "tslib": "^2.0.0",
-        "warning": "^4.0.3"
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
         }
       }
     },
@@ -4097,14 +4251,6 @@
       "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
       "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
     },
-    "@types/reach__dialog": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@types/reach__dialog/-/reach__dialog-0.1.1.tgz",
-      "integrity": "sha512-hTHF+EvkpV1cyycWzhYMJ/FUnaK7Vroa+BrNLJrrOGHnmzh6EKTYyVDsjOPWZIv3FN9tO9v8u9I6AvjY0XoXGw==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
     "@types/react": {
       "version": "16.14.60",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.60.tgz",
@@ -4206,11 +4352,6 @@
         "gl-matrix": "^3.2.0"
       }
     },
-    "@types/warning": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz",
-      "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI="
-    },
     "@types/webpack": {
       "version": "4.41.33",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz",
@@ -7961,9 +8102,9 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
     },
     "detect-node-es": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.0.0.tgz",
-      "integrity": "sha512-S4AHriUkTX9FoFvL4G8hXDcx6t3gp2HpfCza3Q0v6S78gul2hKWifLQbeW+ZF89+hSm2ZIc/uF3J97ZgytgTRg=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
     },
     "detect-port-alt": {
       "version": "1.1.6",
@@ -10220,6 +10361,11 @@
         }
       }
     },
+    "flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="
+    },
     "flat-arguments": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
@@ -10336,11 +10482,18 @@
       "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
     },
     "focus-lock": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.8.1.tgz",
-      "integrity": "sha512-/LFZOIo82WDsyyv7h7oc0MJF9ACOvDRdx9rWPZ2pgMfNWu/z8hQDBtOchuB/0BVLmuFOZjV02YwUVzNsWx/EzA==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-1.3.5.tgz",
+      "integrity": "sha512-QFaHbhv9WPUeLYBDe/PAuLKJ4Dd9OPvKs9xZBr3yLXnUrDNaVXKu2baDBXe3naPY30hgHYSsf2JW4jzas2mDEQ==",
       "requires": {
-        "tslib": "^1.9.3"
+        "tslib": "^2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+        }
       }
     },
     "follow-redirects": {
@@ -19000,11 +19153,26 @@
       }
     },
     "react-clientside-effect": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz",
-      "integrity": "sha512-nRmoyxeok5PBO6ytPvSjKp9xwXg9xagoTK1mMjwnQxqM9Hd7MNPl+LS1bOSOe+CV2+4fnEquc7H/S8QD3q697A==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.6.tgz",
+      "integrity": "sha512-XGGGRQAKY+q25Lz9a/4EPqom7WRjz3z9R2k4jhVKA/puQFH/5Nt27vFZYql4m4NVNdUvX8PS3O7r/Zzm7cjUlg==",
       "requires": {
-        "@babel/runtime": "^7.0.0"
+        "@babel/runtime": "^7.12.13"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.25.6",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
+          "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
+          "requires": {
+            "regenerator-runtime": "^0.14.0"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+          "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+        }
       }
     },
     "react-dev-utils": {
@@ -19141,16 +19309,16 @@
       "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
     },
     "react-focus-lock": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.5.0.tgz",
-      "integrity": "sha512-XLxj6uTXgz0US8TmqNU2jMfnXwZG0mH2r/afQqvPEaX6nyEll5LHVcEXk2XDUQ34RVeLPkO/xK5x6c/qiuSq/A==",
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.13.2.tgz",
+      "integrity": "sha512-T/7bsofxYqnod2xadvuwjGKHOoL5GH7/EIPI5UyEvaU/c2CcphvGI371opFtuY/SYdbMsNiuF4HsHQ50nA/TKQ==",
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "focus-lock": "^0.8.1",
+        "focus-lock": "^1.3.5",
         "prop-types": "^15.6.2",
-        "react-clientside-effect": "^1.2.2",
-        "use-callback-ref": "^1.2.1",
-        "use-sidecar": "^1.0.1"
+        "react-clientside-effect": "^1.2.6",
+        "use-callback-ref": "^1.3.2",
+        "use-sidecar": "^1.1.2"
       }
     },
     "react-is": {
@@ -19184,20 +19352,15 @@
         }
       }
     },
-    "react-polymorphic-box": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/react-polymorphic-box/-/react-polymorphic-box-3.0.2.tgz",
-      "integrity": "sha512-6nTfLUgYPuniGaosD2uDMmS/ZHh4xu2BtscNYZK6HMaVyDgdk4qo2grsEBreOR5CS9Lz4wS835DBKPZ53dFPXg=="
-    },
     "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=="
     },
     "react-popper": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.4.tgz",
-      "integrity": "sha512-NacOu4zWupdQjVXq02XpTD3yFPSfg5a7fex0wa3uGKVkFK7UN6LvVxgcb+xYr56UCuWiNPMH20tntdVdJRwYew==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
+      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
       "requires": {
         "react-fast-compare": "^3.0.1",
         "warning": "^4.0.2"
@@ -19209,24 +19372,38 @@
       "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="
     },
     "react-remove-scroll": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.4.1.tgz",
-      "integrity": "sha512-K7XZySEzOHMTq7dDwcHsZA6Y7/1uX5RsWhRXVYv8rdh+y9Qz2nMwl9RX/Mwnj/j7JstCGmxyfyC0zbVGXYh3mA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.0.tgz",
+      "integrity": "sha512-I2U4JVEsQenxDAKaVa3VZ/JeJZe0/2DxPWL8Tj8yLKctQJQiZM52pn/GWFpSp8dftjM3pSAHVJZscAnC/y+ySQ==",
       "requires": {
-        "react-remove-scroll-bar": "^2.1.0",
-        "react-style-singleton": "^2.1.0",
-        "tslib": "^1.0.0",
-        "use-callback-ref": "^1.2.3",
-        "use-sidecar": "^1.0.1"
+        "react-remove-scroll-bar": "^2.3.6",
+        "react-style-singleton": "^2.2.1",
+        "tslib": "^2.1.0",
+        "use-callback-ref": "^1.3.0",
+        "use-sidecar": "^1.1.2"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+        }
       }
     },
     "react-remove-scroll-bar": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.1.1.tgz",
-      "integrity": "sha512-IZbfQPSozIr8ylHE9MFcQeb2TTzj4abfE7OBXjmtUeXQ5h6ColGKDNo5h7OmzrJRilAx3YIKBf3jb0yrb31BJQ==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz",
+      "integrity": "sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==",
       "requires": {
-        "react-style-singleton": "^2.1.0",
-        "tslib": "^1.0.0"
+        "react-style-singleton": "^2.2.1",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+        }
       }
     },
     "react-scripts": {
@@ -19305,13 +19482,20 @@
       }
     },
     "react-style-singleton": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.1.1.tgz",
-      "integrity": "sha512-jNRp07Jza6CBqdRKNgGhT3u9umWvils1xsuMOjZlghBDH2MU0PL2WZor4PGYjXpnRCa9DQSlHMs/xnABWOwYbA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
+      "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==",
       "requires": {
         "get-nonce": "^1.0.0",
         "invariant": "^2.2.4",
-        "tslib": "^1.0.0"
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+        }
       }
     },
     "react-test-renderer": {
@@ -21289,6 +21473,40 @@
         }
       }
     },
+    "string-width-cjs": {
+      "version": "npm:string-width@4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "optional": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
+      }
+    },
     "string.prototype.matchall": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
@@ -21374,6 +21592,15 @@
         "ansi-regex": "^5.0.0"
       }
     },
+    "strip-ansi-cjs": {
+      "version": "npm:strip-ansi@6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "optional": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -22845,17 +23072,34 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
     "use-callback-ref": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.2.4.tgz",
-      "integrity": "sha512-rXpsyvOnqdScyied4Uglsp14qzag1JIemLeTWGKbwpotWht57hbP78aNT+Q4wdFKQfQibbUX4fb6Qb4y11aVOQ=="
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz",
+      "integrity": "sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==",
+      "requires": {
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+        }
+      }
     },
     "use-sidecar": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.3.tgz",
-      "integrity": "sha512-ygJwGUBeQfWgDls7uTrlEDzJUUR67L8Rm14v/KfFtYCdHhtjHZx1Krb3DIQl3/Q5dJGfXLEQ02RY8BdNBv87SQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
+      "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==",
       "requires": {
-        "detect-node-es": "^1.0.0",
-        "tslib": "^1.9.3"
+        "detect-node-es": "^1.1.0",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+          "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+        }
       }
     },
     "util": {
@@ -24577,6 +24821,77 @@
         }
       }
     },
+    "wrap-ansi-cjs": {
+      "version": "npm:wrap-ansi@7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "optional": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "optional": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "optional": true
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "optional": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "6.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^5.0.1"
+              }
+            }
+          }
+        }
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index 9206e26..4dbe463 100644
--- a/package.json
+++ b/package.json
@@ -11,13 +11,13 @@
     "@deck.gl/core": "8.3.10",
     "@deck.gl/layers": "8.3.10",
     "@deck.gl/react": "8.9.35",
-    "@entur/button": "2.4.0",
+    "@entur/button": "2.10.15",
     "@entur/dropdown": "1.4.7",
-    "@entur/form": "4.0.8",
-    "@entur/layout": "1.9.0",
-    "@entur/modal": "1.3.8",
+    "@entur/form": "4.4.7",
+    "@entur/layout": "1.10.4",
+    "@entur/modal": "1.7.52",
     "@entur/tokens": "2.0.1",
-    "@entur/typography": "1.6.11",
+    "@entur/typography": "1.8.44",
     "@luma.gl/test-utils": "8.3.2",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "11.2.7",