diff --git a/jsconfig.json b/jsconfig.json
index adec339..97161be 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,13 +1,8 @@
 {
-    "compilerOptions": {
-        "paths": {
-            "@eeacms/volto-elastic-csv-widget": [
-                "addons/volto-elastic-csv-widget/src"
-            ],
-            "@eeacms/volto-marine-theme": [
-                "addons/volto-marine-theme/src"
-            ]
-        },
-        "baseUrl": "src"
-    }
-}
\ No newline at end of file
+  "compilerOptions": {
+    "paths": {
+      "@eeacms/volto-marine-theme": ["addons/volto-marine-theme/src"]
+    },
+    "baseUrl": "src"
+  }
+}
diff --git a/mrs.developer.json b/mrs.developer.json
index 353914b..7e3989b 100644
--- a/mrs.developer.json
+++ b/mrs.developer.json
@@ -1,15 +1,10 @@
-{ "volto-marine-theme": {
-  "url": "git@github.com:eea/volto-marine-theme.git",
-  "https": "https://github.com/eea/volto-marine-theme.git",
-  "package": "@eeacms/volto-marine-theme",
-  "branch": "develop",
-  "develop": true,
-  "path": "src"
-}, "volto-elastic-csv-widget": {
-  "url": "git@github.com:eea/volto-elastic-csv-widget.git",
-  "https": "https://github.com/eea/volto-elastic-csv-widget.git",
-  "package": "@eeacms/volto-elastic-csv-widget",
-  "branch": "develop",
-  "develop": true,
-  "path": "src"
-}}
+{
+  "volto-marine-theme": {
+    "url": "git@github.com:eea/volto-marine-theme.git",
+    "https": "https://github.com/eea/volto-marine-theme.git",
+    "package": "@eeacms/volto-marine-theme",
+    "branch": "develop",
+    "develop": true,
+    "path": "src"
+  }
+}
diff --git a/package.json b/package.json
index c69d694..f776a68 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "@eeacms/volto-searchlib",
     "@eeacms/volto-marine-theme",
     "@eeacms/volto-slots",
-    "@eeacms/volto-measurescatalog:installMeasuresCatalogue",
+    "@eeacms/volto-measurescatalog:installMeasuresCatalogue"
   ],
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "*",
diff --git a/yarn.lock b/yarn.lock
index d238373..cc5eab8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1976,7 +1976,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-eea-website-theme@npm:*, @eeacms/volto-eea-website-theme@npm:1.18.1":
+"@eeacms/volto-eea-website-theme@npm:*":
   version: 1.18.1
   resolution: "@eeacms/volto-eea-website-theme@npm:1.18.1"
   dependencies:
@@ -1986,6 +1986,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eeacms/volto-eea-website-theme@npm:1.19.0":
+  version: 1.19.0
+  resolution: "@eeacms/volto-eea-website-theme@npm:1.19.0"
+  dependencies:
+    "@eeacms/volto-eea-design-system": "*"
+    volto-subsites: "*"
+  checksum: d616a30c0d2cfba1ade9015201673fb8b3c310eb5bf5a137ebe2b631ea6703e2e769bd62a038e388377f312966666ce3bc236df70a24f6d75af138bb144848b7
+  languageName: node
+  linkType: hard
+
 "@eeacms/volto-elastic-csv-widget@workspace:src/addons/volto-elastic-csv-widget":
   version: 0.0.0-use.local
   resolution: "@eeacms/volto-elastic-csv-widget@workspace:src/addons/volto-elastic-csv-widget"
@@ -2066,13 +2076,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-marine-theme@github:eea/volto-marine-theme#0.1.20.eea-design.21":
+"@eeacms/volto-marine-theme@github:eea/volto-marine-theme#0.1.20.eea-design.25":
   version: 0.1.20
-  resolution: "@eeacms/volto-marine-theme@https://github.com/eea/volto-marine-theme.git#commit=94ca7782f45e074453ed2fbaaee500d3e726fc17"
+  resolution: "@eeacms/volto-marine-theme@https://github.com/eea/volto-marine-theme.git#commit=af535837219b41e83cdfd0f5bf784c2dbafe4e39"
   dependencies:
     "@eeacms/volto-eea-design-system": "*"
     "@eeacms/volto-eea-website-theme": "*"
     "@eeacms/volto-embed": "*"
+    "@eeacms/volto-globalsearch": ^1.0.20
+    "@eeacms/volto-searchlib": ^0.6.3
     "@eeacms/volto-slots": "*"
     "@eeacms/volto-tableau": "github:eea/volto-tableau#3.0.8"
     "@eeacms/volto-tabs-block": "*"
@@ -2082,7 +2094,7 @@ __metadata:
     react-lazy-load-image-component: ^1.4.0
     react-slick: ^0.24.0
     slick-carousel: ^1.8.1
-  checksum: d295ee9c12fb6fe2d3e92cb0d82cf8cb0fd5c3b54a916d66c68509b984f68456d5876dcf7184e97f3d3548f83eda0e851fce045623d28a375cfeeb35d2843b1b
+  checksum: 65f7448da1da5dca28f5fc61323bfb7866d61712e99a583f35a272fd418f9b6657f1af000f101f5153b50679c472107860253a3aab6534480f04bea5e868c7d0
   languageName: node
   linkType: hard
 
@@ -2236,7 +2248,51 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-searchlib@npm:0.6.4, @eeacms/volto-searchlib@npm:^0.6.3":
+"@eeacms/volto-searchlib@npm:0.6.3":
+  version: 0.6.3
+  resolution: "@eeacms/volto-searchlib@npm:0.6.3"
+  dependencies:
+    "@eeacms/volto-eea-design-system": "*"
+    "@elastic/react-search-ui": ^1.9.0
+    "@elastic/react-search-ui-views": ^1.9.0
+    "@elastic/search-ui": ^1.9.0
+    "@visx/group": ^1.7.0
+    "@visx/responsive": ^1.10.1
+    "@visx/scale": ^1.11.1
+    "@visx/shape": ^1.12.0
+    "@visx/tooltip": ^1.7.2
+    classnames: ^2.2.6
+    csv-stringify: ^5.6.5
+    d3-array: ^2.12.1
+    d3-scale: ^3.3.0
+    deep-equal: ^2.0.5
+    downshift: ^3.4.8
+    elasticsearch: 16.7.3
+    fast-deep-equal: ^3.1.3
+    http-proxy-middleware: ^2.0.1
+    jotai: ^1.6.0
+    lodash: 4.17.21
+    lodash.clonedeep: ^4.5.0
+    lodash.isfunction: ^3.0.9
+    lodash.uniq: ^4.5.0
+    luxon: ^1.22.0
+    node-fetch: ^2.6.1
+    re-resizable: ^6.9.0
+    react-compound-slider: ^3.4.0
+    react-masonry-component: 6.3.0
+    react-motion: ^0.5.2
+    react-speech-recognition: ^3.8.2
+    react-toastify: 5.4.1
+    redux: 4.1.0
+    semantic-ui-react: 2.0.3
+    superagent: 3.8.2
+    svg-loader: 0.0.2
+    use-deep-compare-effect: 1.8.1
+  checksum: 4b0102f012edb8b20d4a05a900e6664cbdd5f006c492bf593ee8e992c5a4ea161997c7491109ff8e4efddbf17a7430ea40600c16819008b6cc9ce83f1df60eb2
+  languageName: node
+  linkType: hard
+
+"@eeacms/volto-searchlib@npm:^0.6.3":
   version: 0.6.4
   resolution: "@eeacms/volto-searchlib@npm:0.6.4"
   dependencies:
@@ -15437,11 +15493,11 @@ __metadata:
     "@eeacms/volto-datablocks": 6.1.0
     "@eeacms/volto-eea-design-system": 1.16.0
     "@eeacms/volto-eea-kitkat": 18.0.2
-    "@eeacms/volto-eea-website-theme": 1.18.1
+    "@eeacms/volto-eea-website-theme": 1.19.0
     "@eeacms/volto-embed": 6.0.0
-    "@eeacms/volto-marine-theme": "github:eea/volto-marine-theme#0.1.20.eea-design.21"
+    "@eeacms/volto-marine-theme": "github:eea/volto-marine-theme#0.1.20.eea-design.25"
     "@eeacms/volto-measurescatalog": 0.1.3
-    "@eeacms/volto-searchlib": 0.6.4
+    "@eeacms/volto-searchlib": 0.6.3
     "@eeacms/volto-slate-dataentity": 2.1.0
     "@eeacms/volto-slots": 0.1.2
     "@eeacms/volto-tableau": 3.0.8