diff --git a/package-lock.json b/package-lock.json
index 1af97ed6..f0af3c7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1342,20 +1342,21 @@
       }
     },
     "@entur/a11y": {
-      "version": "0.2.61",
-      "resolved": "https://registry.npmjs.org/@entur/a11y/-/a11y-0.2.61.tgz",
-      "integrity": "sha512-6YCsnvaakI8gxpm+mgnIOFfj133ap1qAg2i5E/ekNjQelbf17wIEI4E9IlNyj/IBHVbXtOHUSxIz76iIBq0qiQ==",
+      "version": "0.2.85",
+      "resolved": "https://registry.npmjs.org/@entur/a11y/-/a11y-0.2.85.tgz",
+      "integrity": "sha512-4G4rA0dYbLPz+eQiE3UHtHeyvHJEbstNV1O9BsjnvY9DEE40hty6BcidrkbGV6W4NhCAHwv8uhI7ZErHaq7B0w==",
       "requires": {
-        "@entur/tokens": "^3.8.1",
-        "@entur/utils": "^0.6.0"
+        "@entur/tokens": "^3.15.0",
+        "@entur/utils": "^0.11.1"
       },
       "dependencies": {
-        "@entur/utils": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.6.0.tgz",
-          "integrity": "sha512-xfDJr0P8VDkYr4aMFwKMRX7Pe4XUCs4jNI4jJ9HbXssPPf63gELZgeU5JLO+GADR+3kshih4VMfmP4QOtvWLoA==",
+        "@entur/tokens": {
+          "version": "3.15.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.15.0.tgz",
+          "integrity": "sha512-0ohCXTITrcMpG3SNDlOTNBnzgfoR/GJAwvlhfby7Xcmo3sQvRN3ZcLVUhK9XfEggSsXDtzJ5Clufkij4Ax00kQ==",
           "requires": {
-            "tiny-warning": "^1.0.3"
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
           }
         }
       }
@@ -1421,167 +1422,145 @@
       }
     },
     "@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.22",
+      "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.2.22.tgz",
+      "integrity": "sha512-gvL2vB8NcgU44Y3NVkCPtLKUtP9ytqM0rYNQ3Q5oOu3JzYg4IGw+FL3bW88a+xuM2Gkea+5xWClBZ19q91pwAg==",
       "requires": {
-        "@entur/loader": "^0.4.23",
-        "@entur/tokens": "^3.8.0",
-        "@entur/utils": "^0.5.5",
+        "@entur/loader": "^0.5.0",
+        "@entur/tokens": "^3.15.0",
+        "@entur/utils": "^0.11.1",
         "classnames": "^2.3.1"
       },
       "dependencies": {
-        "@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==",
+        "@entur/loader": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.0.tgz",
+          "integrity": "sha512-Hd8+q5e9haiN8cv/TEMWkihB8wPQjb9/Wk8JzgmbxuMSIeh4vRvfXRHWwVp1ORmxm4naiENiMXfp3PBsXZOC5g==",
           "requires": {
-            "tiny-warning": "^1.0.3"
+            "@entur/tokens": "^3.15.0",
+            "@entur/typography": "^1.8.35",
+            "@entur/utils": "^0.11.1",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/tokens": {
+          "version": "3.15.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.15.0.tgz",
+          "integrity": "sha512-0ohCXTITrcMpG3SNDlOTNBnzgfoR/GJAwvlhfby7Xcmo3sQvRN3ZcLVUhK9XfEggSsXDtzJ5Clufkij4Ax00kQ==",
+          "requires": {
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
+          }
+        },
+        "@entur/typography": {
+          "version": "1.8.35",
+          "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.35.tgz",
+          "integrity": "sha512-PtcbKQsaTEbGoCCZ6pSFd7c5qz2d2QBCbeNxz0fFh+ZWu7XrRBKLLfY6THy6olNfa4tcx0bkCBysIpSywaVlQA==",
+          "requires": {
+            "@entur/icons": "^6.16.1",
+            "@entur/tokens": "^3.15.0",
+            "@entur/utils": "^0.11.1",
+            "classnames": "^2.3.1",
+            "normalize-scss": "^7.0.1"
           }
         }
       }
     },
     "@entur/chip": {
-      "version": "0.6.27",
-      "resolved": "https://registry.npmjs.org/@entur/chip/-/chip-0.6.27.tgz",
-      "integrity": "sha512-VVQrqWy/FKozaaD0QcvrS4Eg4dvsw3BO4vFTH454wC8YERvat6BaeqAySZLVmiXu9QEZhHZj3RyYQZZI7cNtSw==",
-      "requires": {
-        "@entur/form": "^7.0.0",
-        "@entur/icons": "^6.0.1",
-        "@entur/loader": "^0.4.25",
-        "@entur/tokens": "^3.8.1",
-        "@entur/utils": "^0.6.0",
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/@entur/chip/-/chip-0.7.8.tgz",
+      "integrity": "sha512-gXpmxmsM4/r7iSzERa/x193BR9H3y+GsUE0dwx60R0a8BF06sjoqs4NO9LdcBEC9cDCo+W7EgsK2s1JTtyD5yg==",
+      "requires": {
+        "@entur/form": "^7.1.7",
+        "@entur/icons": "^6.16.1",
+        "@entur/loader": "^0.5.0",
+        "@entur/tokens": "^3.15.0",
+        "@entur/utils": "^0.11.1",
         "classnames": "^2.3.1"
       },
       "dependencies": {
-        "@entur/button": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.0.2.tgz",
-          "integrity": "sha512-tJxtckp3iR9XhpiSlOtp70rfolNsyeveMDEcXdQPQQZU8VbvjXyU58UlEyS+Li1hqmWROTyQQ2OkasQ/pzo5lw==",
+        "@entur/loader": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.0.tgz",
+          "integrity": "sha512-Hd8+q5e9haiN8cv/TEMWkihB8wPQjb9/Wk8JzgmbxuMSIeh4vRvfXRHWwVp1ORmxm4naiENiMXfp3PBsXZOC5g==",
           "requires": {
-            "@entur/loader": "^0.4.25",
-            "@entur/tokens": "^3.8.1",
-            "@entur/utils": "^0.6.0",
-            "classnames": "^2.3.1"
-          }
-        },
-        "@entur/form": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/@entur/form/-/form-7.0.0.tgz",
-          "integrity": "sha512-cBi2JBbU43uq6C5m/FvENTtv7bOZoTg8wecn9v1ZfBfEFxypYRu1+mrEObPkjMpCmkdNqgya/iq93cwEnhsBHg==",
-          "requires": {
-            "@entur/icons": "^6.0.1",
-            "@entur/tokens": "^3.8.1",
-            "@entur/tooltip": "^2.6.10",
-            "@entur/typography": "^1.7.13",
-            "@entur/utils": "^0.6.0",
+            "@entur/tokens": "^3.15.0",
+            "@entur/typography": "^1.8.35",
+            "@entur/utils": "^0.11.1",
             "classnames": "^2.3.1"
           }
         },
-        "@entur/icons": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-6.0.1.tgz",
-          "integrity": "sha512-XjnM//7S39uhY8BMwmaQf2f5/en1O0lQaWPgftQVdAfWEeKI6A0h1bCLeZUKLSsF3JHIAuHBsZf3JpKyhmzA+A==",
+        "@entur/tokens": {
+          "version": "3.15.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.15.0.tgz",
+          "integrity": "sha512-0ohCXTITrcMpG3SNDlOTNBnzgfoR/GJAwvlhfby7Xcmo3sQvRN3ZcLVUhK9XfEggSsXDtzJ5Clufkij4Ax00kQ==",
           "requires": {
-            "@entur/tokens": "^3.8.1"
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
           }
         },
-        "@entur/tooltip": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-2.6.10.tgz",
-          "integrity": "sha512-IW9cuMLLUr7NuF7BXAU5TnoMUJ5sIh8XWcGmnsBQ+9/yEgwOT8swnig/X6/4K+XGdg+JHVDINk1nuCuqQ2m86w==",
-          "requires": {
-            "@entur/button": "^3.0.2",
-            "@entur/icons": "^6.0.1",
-            "@entur/layout": "^2.1.25",
-            "@entur/tokens": "^3.8.1",
-            "@entur/utils": "^0.6.0",
-            "@popperjs/core": "^2.10.1",
-            "classnames": "^2.3.1",
-            "react-popper": "~2.2.5"
-          }
-        },
-        "@entur/utils": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.6.0.tgz",
-          "integrity": "sha512-xfDJr0P8VDkYr4aMFwKMRX7Pe4XUCs4jNI4jJ9HbXssPPf63gELZgeU5JLO+GADR+3kshih4VMfmP4QOtvWLoA==",
+        "@entur/typography": {
+          "version": "1.8.35",
+          "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.35.tgz",
+          "integrity": "sha512-PtcbKQsaTEbGoCCZ6pSFd7c5qz2d2QBCbeNxz0fFh+ZWu7XrRBKLLfY6THy6olNfa4tcx0bkCBysIpSywaVlQA==",
           "requires": {
-            "tiny-warning": "^1.0.3"
+            "@entur/icons": "^6.16.1",
+            "@entur/tokens": "^3.15.0",
+            "@entur/utils": "^0.11.1",
+            "classnames": "^2.3.1",
+            "normalize-scss": "^7.0.1"
           }
         }
       }
     },
     "@entur/dropdown": {
-      "version": "3.0.37",
-      "resolved": "https://registry.npmjs.org/@entur/dropdown/-/dropdown-3.0.37.tgz",
-      "integrity": "sha512-uEHTsj9BPuzRU/TC09HSTLR1EcziDnaczCMDM9I3POTrsH7uChvj+kZU612AwD/CezoEgAbTAL+7vspwz3WiHQ==",
-      "requires": {
-        "@entur/a11y": "^0.2.61",
-        "@entur/button": "^3.0.2",
-        "@entur/chip": "^0.6.27",
-        "@entur/form": "^7.0.0",
-        "@entur/icons": "^6.0.1",
-        "@entur/loader": "^0.4.25",
-        "@entur/tokens": "^3.8.1",
-        "@entur/tooltip": "^2.6.10",
-        "@entur/utils": "^0.6.0",
+      "version": "5.4.7",
+      "resolved": "https://registry.npmjs.org/@entur/dropdown/-/dropdown-5.4.7.tgz",
+      "integrity": "sha512-fBbMJMRPvq2S1wP9T5nTPRwagcFIn++zRlbZF54loY4VDer2PW1b1C6ZTvtbCdnIsQi4jESxPFz3N8o7cBn05Q==",
+      "requires": {
+        "@entur/a11y": "^0.2.85",
+        "@entur/button": "^3.2.22",
+        "@entur/chip": "^0.7.8",
+        "@entur/form": "^7.1.7",
+        "@entur/icons": "^6.16.1",
+        "@entur/loader": "^0.5.0",
+        "@entur/tokens": "^3.15.0",
+        "@entur/tooltip": "^2.7.6",
+        "@entur/utils": "^0.11.1",
         "classnames": "^2.3.1",
-        "downshift": "^6.1.7"
+        "downshift": "^8.3.3"
       },
       "dependencies": {
-        "@entur/button": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.0.2.tgz",
-          "integrity": "sha512-tJxtckp3iR9XhpiSlOtp70rfolNsyeveMDEcXdQPQQZU8VbvjXyU58UlEyS+Li1hqmWROTyQQ2OkasQ/pzo5lw==",
+        "@entur/loader": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.5.0.tgz",
+          "integrity": "sha512-Hd8+q5e9haiN8cv/TEMWkihB8wPQjb9/Wk8JzgmbxuMSIeh4vRvfXRHWwVp1ORmxm4naiENiMXfp3PBsXZOC5g==",
           "requires": {
-            "@entur/loader": "^0.4.25",
-            "@entur/tokens": "^3.8.1",
-            "@entur/utils": "^0.6.0",
-            "classnames": "^2.3.1"
-          }
-        },
-        "@entur/form": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/@entur/form/-/form-7.0.0.tgz",
-          "integrity": "sha512-cBi2JBbU43uq6C5m/FvENTtv7bOZoTg8wecn9v1ZfBfEFxypYRu1+mrEObPkjMpCmkdNqgya/iq93cwEnhsBHg==",
-          "requires": {
-            "@entur/icons": "^6.0.1",
-            "@entur/tokens": "^3.8.1",
-            "@entur/tooltip": "^2.6.10",
-            "@entur/typography": "^1.7.13",
-            "@entur/utils": "^0.6.0",
+            "@entur/tokens": "^3.15.0",
+            "@entur/typography": "^1.8.35",
+            "@entur/utils": "^0.11.1",
             "classnames": "^2.3.1"
           }
         },
-        "@entur/icons": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-6.0.1.tgz",
-          "integrity": "sha512-XjnM//7S39uhY8BMwmaQf2f5/en1O0lQaWPgftQVdAfWEeKI6A0h1bCLeZUKLSsF3JHIAuHBsZf3JpKyhmzA+A==",
+        "@entur/tokens": {
+          "version": "3.15.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.15.0.tgz",
+          "integrity": "sha512-0ohCXTITrcMpG3SNDlOTNBnzgfoR/GJAwvlhfby7Xcmo3sQvRN3ZcLVUhK9XfEggSsXDtzJ5Clufkij4Ax00kQ==",
           "requires": {
-            "@entur/tokens": "^3.8.1"
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
           }
         },
-        "@entur/tooltip": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-2.6.10.tgz",
-          "integrity": "sha512-IW9cuMLLUr7NuF7BXAU5TnoMUJ5sIh8XWcGmnsBQ+9/yEgwOT8swnig/X6/4K+XGdg+JHVDINk1nuCuqQ2m86w==",
-          "requires": {
-            "@entur/button": "^3.0.2",
-            "@entur/icons": "^6.0.1",
-            "@entur/layout": "^2.1.25",
-            "@entur/tokens": "^3.8.1",
-            "@entur/utils": "^0.6.0",
-            "@popperjs/core": "^2.10.1",
-            "classnames": "^2.3.1",
-            "react-popper": "~2.2.5"
-          }
-        },
-        "@entur/utils": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.6.0.tgz",
-          "integrity": "sha512-xfDJr0P8VDkYr4aMFwKMRX7Pe4XUCs4jNI4jJ9HbXssPPf63gELZgeU5JLO+GADR+3kshih4VMfmP4QOtvWLoA==",
+        "@entur/typography": {
+          "version": "1.8.35",
+          "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.35.tgz",
+          "integrity": "sha512-PtcbKQsaTEbGoCCZ6pSFd7c5qz2d2QBCbeNxz0fFh+ZWu7XrRBKLLfY6THy6olNfa4tcx0bkCBysIpSywaVlQA==",
           "requires": {
-            "tiny-warning": "^1.0.3"
+            "@entur/icons": "^6.16.1",
+            "@entur/tokens": "^3.15.0",
+            "@entur/utils": "^0.11.1",
+            "classnames": "^2.3.1",
+            "normalize-scss": "^7.0.1"
           }
         }
       }
@@ -1618,43 +1597,58 @@
       }
     },
     "@entur/form": {
-      "version": "5.4.20",
-      "resolved": "https://registry.npmjs.org/@entur/form/-/form-5.4.20.tgz",
-      "integrity": "sha512-GBlNgtGWCAWDugvOFowxSCwR/TelVIZoPaJgV91rOAdGV6G+nMsd6G30Km7w4PjhzbJ8HLHVHz0rrP3suPzyLA==",
-      "requires": {
-        "@entur/icons": "^5.8.1",
-        "@entur/tokens": "^3.8.0",
-        "@entur/tooltip": "^2.6.7",
-        "@entur/typography": "^1.7.11",
-        "@entur/utils": "^0.5.5",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/@entur/form/-/form-7.1.7.tgz",
+      "integrity": "sha512-tqnQDBhhzZNRG3EpwlgbpU4x494274pYVqcPiDlnEYvxlYTh9rp5HWWewK58gSfpEOaMbzHlK9NVCKZ64oo1wQ==",
+      "requires": {
+        "@entur/icons": "^6.16.1",
+        "@entur/tokens": "^3.15.0",
+        "@entur/tooltip": "^2.7.6",
+        "@entur/typography": "^1.8.35",
+        "@entur/utils": "^0.11.1",
         "classnames": "^2.3.1"
       },
       "dependencies": {
-        "@entur/icons": {
-          "version": "5.8.1",
-          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-5.8.1.tgz",
-          "integrity": "sha512-6S49jeO5YTbRiw5tosn0zSBtt5y6M4FbaoTnK2RbeoeOTcqd3Xr7m8TpY18S/ekwzyjPiTm+28URpwjRVjjslg==",
+        "@entur/tokens": {
+          "version": "3.15.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.15.0.tgz",
+          "integrity": "sha512-0ohCXTITrcMpG3SNDlOTNBnzgfoR/GJAwvlhfby7Xcmo3sQvRN3ZcLVUhK9XfEggSsXDtzJ5Clufkij4Ax00kQ==",
           "requires": {
-            "@entur/tokens": "^3.8.0"
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
           }
         },
-        "@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==",
+        "@entur/typography": {
+          "version": "1.8.35",
+          "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.35.tgz",
+          "integrity": "sha512-PtcbKQsaTEbGoCCZ6pSFd7c5qz2d2QBCbeNxz0fFh+ZWu7XrRBKLLfY6THy6olNfa4tcx0bkCBysIpSywaVlQA==",
           "requires": {
-            "tiny-warning": "^1.0.3"
+            "@entur/icons": "^6.16.1",
+            "@entur/tokens": "^3.15.0",
+            "@entur/utils": "^0.11.1",
+            "classnames": "^2.3.1",
+            "normalize-scss": "^7.0.1"
           }
         }
       }
     },
     "@entur/icons": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-4.3.3.tgz",
-      "integrity": "sha512-yqUxZpNlhJYRlJ/U6Dib4je+xQjhlv3leP4ruypYrZVuLdd8ieaZL427Zh3fvpwDpmJUlZCsu9vAPUXt9YUQPw==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-6.16.1.tgz",
+      "integrity": "sha512-V6LIAYSPMxRWdAAPf5p4LGeFVhN0sp+0HnqCUt8zX1j/44Zj8Oe311fOkp697umltuFudZAUOyCMFBHCFJjdqQ==",
       "requires": {
-        "@entur/tokens": "^3.4.1",
-        "@entur/utils": "^0.4.5"
+        "@entur/tokens": "^3.15.0"
+      },
+      "dependencies": {
+        "@entur/tokens": {
+          "version": "3.15.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.15.0.tgz",
+          "integrity": "sha512-0ohCXTITrcMpG3SNDlOTNBnzgfoR/GJAwvlhfby7Xcmo3sQvRN3ZcLVUhK9XfEggSsXDtzJ5Clufkij4Ax00kQ==",
+          "requires": {
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
+          }
+        }
       }
     },
     "@entur/layout": {
@@ -1922,45 +1916,51 @@
       }
     },
     "@entur/tooltip": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-2.6.9.tgz",
-      "integrity": "sha512-t3kKVo7vjKNRqRR0Om1Cer4yQdv/H6+pAnQl5lACdaKt/2P6EaVel7UFtlgGDFOKK/9C9iR3EBpcszgok3GaIQ==",
-      "requires": {
-        "@entur/button": "^3.0.1",
-        "@entur/icons": "^6.0.1",
-        "@entur/layout": "^2.1.24",
-        "@entur/tokens": "^3.8.1",
-        "@entur/utils": "^0.5.5",
+      "version": "2.7.6",
+      "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-2.7.6.tgz",
+      "integrity": "sha512-hYVA1kt8gxB+jiQRMI2R8GJFHkZAmJFZM4Zu7tjNHyrEuBqZfXx0Bn8T5rIYl+vsQTBl3kuxWVzGs3zXls36VQ==",
+      "requires": {
+        "@entur/button": "^3.2.22",
+        "@entur/icons": "^6.16.1",
+        "@entur/layout": "^2.3.6",
+        "@entur/tokens": "^3.15.0",
+        "@entur/utils": "^0.11.1",
         "@popperjs/core": "^2.10.1",
         "classnames": "^2.3.1",
         "react-popper": "~2.2.5"
       },
       "dependencies": {
-        "@entur/button": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/@entur/button/-/button-3.0.1.tgz",
-          "integrity": "sha512-o4qeUp/flt1Yfz+XbdyZLuWeDaiXkMsYIHeQQ+hs5qzLbJbF5eNiUdSZrov0+b14g/T/6UufgPvmA1QtYYbiwQ==",
+        "@entur/layout": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.3.6.tgz",
+          "integrity": "sha512-oHxEnl9T1t6VRHd0ocDy8DbW4k4UQvcuh7sAJg3r1Fxlj1clH3NfhALFVaJaPDBFu5l3rC199RMWs+loe663Ag==",
           "requires": {
-            "@entur/loader": "^0.4.24",
-            "@entur/tokens": "^3.8.1",
-            "@entur/utils": "^0.5.5",
+            "@entur/icons": "^6.16.1",
+            "@entur/tokens": "^3.15.0",
+            "@entur/typography": "^1.8.35",
+            "@entur/utils": "^0.11.1",
             "classnames": "^2.3.1"
           }
         },
-        "@entur/icons": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-6.0.1.tgz",
-          "integrity": "sha512-XjnM//7S39uhY8BMwmaQf2f5/en1O0lQaWPgftQVdAfWEeKI6A0h1bCLeZUKLSsF3JHIAuHBsZf3JpKyhmzA+A==",
+        "@entur/tokens": {
+          "version": "3.15.0",
+          "resolved": "https://registry.npmjs.org/@entur/tokens/-/tokens-3.15.0.tgz",
+          "integrity": "sha512-0ohCXTITrcMpG3SNDlOTNBnzgfoR/GJAwvlhfby7Xcmo3sQvRN3ZcLVUhK9XfEggSsXDtzJ5Clufkij4Ax00kQ==",
           "requires": {
-            "@entur/tokens": "^3.8.1"
+            "flat": "^5.0.1",
+            "hex-rgb": "^4.3.0"
           }
         },
-        "@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==",
+        "@entur/typography": {
+          "version": "1.8.35",
+          "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.35.tgz",
+          "integrity": "sha512-PtcbKQsaTEbGoCCZ6pSFd7c5qz2d2QBCbeNxz0fFh+ZWu7XrRBKLLfY6THy6olNfa4tcx0bkCBysIpSywaVlQA==",
           "requires": {
-            "tiny-warning": "^1.0.3"
+            "@entur/icons": "^6.16.1",
+            "@entur/tokens": "^3.15.0",
+            "@entur/utils": "^0.11.1",
+            "classnames": "^2.3.1",
+            "normalize-scss": "^7.0.1"
           }
         }
       }
@@ -1996,11 +1996,10 @@
       }
     },
     "@entur/utils": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.5.tgz",
-      "integrity": "sha512-pgKnKvcHSd1aqSUUxBvlhwk/qwTC4hqrTyVQvfrYm+yV06sIcU1kInQEyc+TzU70gzelbsduiSmEpGMIV+jvcQ==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.11.1.tgz",
+      "integrity": "sha512-yT/LH8EK3/TCYDVRolaY/XNdt7zL50HqscXqTkdQxCVZCi0eN3Dv0n7PF1nDbJwBWQELu4Jbb4ykCO3RzQ3Iqw==",
       "requires": {
-        "react-polymorphic-types": "^1.1.0",
         "tiny-warning": "^1.0.3"
       }
     },
@@ -4993,9 +4992,9 @@
       }
     },
     "compute-scroll-into-view": {
-      "version": "1.0.20",
-      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
-      "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz",
+      "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -5626,21 +5625,39 @@
       "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
     },
     "downshift": {
-      "version": "6.1.12",
-      "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.12.tgz",
-      "integrity": "sha512-7XB/iaSJVS4T8wGFT3WRXmSF1UlBHAA40DshZtkrIscIN+VC+Lh363skLxFTvJwtNgHxAMDGEHT4xsyQFWL+UA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/downshift/-/downshift-8.5.0.tgz",
+      "integrity": "sha512-BAr/KAZX8GGARwWl4aER6ABv8aAaRXZcVKP0m1oFPKpSIXCGuoqnhi6nRf87glHhYDd/CCPp9RVUK27JKJD/Fw==",
       "requires": {
-        "@babel/runtime": "^7.14.8",
-        "compute-scroll-into-view": "^1.0.17",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2",
-        "tslib": "^2.3.0"
+        "@babel/runtime": "^7.22.15",
+        "compute-scroll-into-view": "^3.0.3",
+        "prop-types": "^15.8.1",
+        "react-is": "^18.2.0",
+        "tslib": "^2.6.2"
       },
       "dependencies": {
+        "@babel/runtime": {
+          "version": "7.24.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz",
+          "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
+          "requires": {
+            "regenerator-runtime": "^0.14.0"
+          }
+        },
         "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+          "version": "18.3.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+          "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+        },
+        "regenerator-runtime": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+          "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+        },
+        "tslib": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
@@ -10744,11 +10761,6 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "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.5",
       "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
diff --git a/package.json b/package.json
index 3156f3cb..cce84710 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "dependencies": {
     "@auth0/auth0-react": "1.12.1",
     "@entur/alert": "0.16.5",
-    "@entur/button": "2.10.15",
-    "@entur/dropdown": "3.0.37",
-    "@entur/form": "5.4.20",
-    "@entur/icons": "4.3.3",
+    "@entur/button": "3.2.22",
+    "@entur/dropdown": "5.4.7",
+    "@entur/form": "7.1.7",
+    "@entur/icons": "6.16.1",
     "@entur/layout": "2.3.5",
     "@entur/loader": "0.4.65",
     "@entur/menu": "4.2.29",