diff --git a/jsconfig.json b/jsconfig.json
index 1603bbef..c1d953f2 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -7,13 +7,13 @@
             "@eeacms/volto-grid-block": [
                 "develop/volto-grid-block/src"
             ],
-            "@eeacms/volto-datablocks": [
+            "volto-datablocks": [
                 "develop/volto-datablocks/src"
             ],
             "volto-addons": [
                 "develop/volto-addons/src"
             ],
-            "@eeacms/volto-embed": [
+            "volto-embed": [
                 "develop/volto-embed/src"
             ],
             "volto-matomo": [
diff --git a/mrs.developer.json b/mrs.developer.json
index fab72117..29cb186a 100644
--- a/mrs.developer.json
+++ b/mrs.developer.json
@@ -13,8 +13,7 @@
   "volto-datablocks": {
     "url": "https://github.com/eea/volto-datablocks.git",
     "branch": "master",
-    "path": "src",
-    "package": "@eeacms/volto-datablocks"
+    "path": "src"
   },
   "volto-addons": {
     "url": "https://github.com/eea/volto-addons.git",
@@ -24,8 +23,7 @@
   "volto-embed": {
     "url": "https://github.com/eea/volto-embed.git",
     "branch": "master",
-    "path": "src",
-    "package": "@eeacms/volto-embed"
+    "path": "src"
   },
   "volto-matomo": {
     "url": "https://github.com/eea/volto-matomo.git",
diff --git a/package.json b/package.json
index ea9ca5ef..0ec49f31 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,8 @@
     "@eeacms/volto-grid-block",
     "@eeacms/volto-matomo",
     "@eeacms/volto-sentry-rancher-config",
-    "@eeacms/volto-datablocks",
-    "@eeacms/volto-embed",
+    "volto-datablocks",
+    "volto-embed",
     "volto-addons"
   ],
   "scripts": {
diff --git a/src/components/manage/Blocks/DetailedLink/View.jsx b/src/components/manage/Blocks/DetailedLink/View.jsx
index 40bdffea..bbf6273d 100644
--- a/src/components/manage/Blocks/DetailedLink/View.jsx
+++ b/src/components/manage/Blocks/DetailedLink/View.jsx
@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import { settings } from '~/config';
 import cx from 'classnames';
 import './style.css';
-import { deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import { deleteQueryParam } from 'volto-datablocks/actions';
 
 const getPath = (url) => {
   if (!url) return '';
diff --git a/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx b/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx
index 22471bc1..2a8e64c7 100644
--- a/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx
+++ b/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx
@@ -4,8 +4,8 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray } from 'lodash';
 import { Dropdown, Header } from 'semantic-ui-react';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
-import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam } from 'volto-datablocks/actions';
+import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
 import ReactTooltip from 'react-tooltip';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';
diff --git a/src/components/manage/Blocks/DiscodataComponents/List/View.jsx b/src/components/manage/Blocks/DiscodataComponents/List/View.jsx
index b2709dac..899195e0 100644
--- a/src/components/manage/Blocks/DiscodataComponents/List/View.jsx
+++ b/src/components/manage/Blocks/DiscodataComponents/List/View.jsx
@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray, isDate } from 'lodash';
 import { Link } from 'react-router-dom';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam } from 'volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';
 import cx from 'classnames';
diff --git a/src/components/manage/Blocks/DiscodataComponents/Select/View.jsx b/src/components/manage/Blocks/DiscodataComponents/Select/View.jsx
index f263157b..ef04aea4 100644
--- a/src/components/manage/Blocks/DiscodataComponents/Select/View.jsx
+++ b/src/components/manage/Blocks/DiscodataComponents/Select/View.jsx
@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray } from 'lodash';
 import { Dropdown } from 'semantic-ui-react';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam } from 'volto-datablocks/actions';
 
 import cx from 'classnames';
 
diff --git a/src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx b/src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx
index 35a47d73..7fb49d73 100644
--- a/src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx
+++ b/src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import qs from 'query-string';
 import View from './View';
-import DiscodataSqlBuilderEdit from '@eeacms/volto-datablocks/DiscodataSqlBuilder/Edit';
+import DiscodataSqlBuilderEdit from 'volto-datablocks/DiscodataSqlBuilder/Edit';
 
 const makeChoices = (keys) => keys && keys.map((k) => [k, k]);
 
diff --git a/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx b/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx
index 8478f40e..e83c4696 100644
--- a/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx
@@ -8,8 +8,8 @@ import { arrayToTree } from 'performant-array-to-tree';
 import qs from 'query-string';
 import { Table, Dropdown, List, Header } from 'semantic-ui-react';
 import './style.css';
-import DiscodataSqlBuilderView from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import DiscodataSqlBuilderView from 'volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
 import cx from 'classnames';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/Edit.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/Edit.jsx
index fa6288dd..3f9d1a6e 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/Edit.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/Edit.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 
diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx
index 0951d609..aa23d4b9 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx
@@ -8,7 +8,7 @@ import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import { settings } from '~/config';
 
-import '@eeacms/volto-embed/css/embed-styles.css';
+import 'volto-embed/css/embed-styles.css';
 
 const key = (domain_key) => `accept-${domain_key}`;
 
diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
index 6e5eac74..21cd246c 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -16,7 +16,7 @@ import { isArray } from 'lodash';
 import { Icon as VoltoIcon, Toast } from '@plone/volto/components';
 import PrivacyProtection from './PrivacyProtection';
 // VOLTO-DATABLOCKS
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam } from 'volto-datablocks/actions';
 // SEMANTIC REACT UI
 import { Grid, Header } from 'semantic-ui-react';
 // SVGs
diff --git a/src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx b/src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx
index 0d99c116..a5fbf7e0 100644
--- a/src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx
+++ b/src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { injectIntl } from 'react-intl';
 import View from './View';
-import DiscodataSqlBuilderEdit from '@eeacms/volto-datablocks/DiscodataSqlBuilder/Edit';
+import DiscodataSqlBuilderEdit from 'volto-datablocks/DiscodataSqlBuilder/Edit';
 
 const schema = {
   itemsCountKey: {
diff --git a/src/components/manage/Blocks/DiscodataTableBlock/View.jsx b/src/components/manage/Blocks/DiscodataTableBlock/View.jsx
index 42b2e42c..7b4b0e85 100644
--- a/src/components/manage/Blocks/DiscodataTableBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataTableBlock/View.jsx
@@ -8,8 +8,8 @@ import { Table, Pagination } from 'semantic-ui-react';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import { Icon } from '@plone/volto/components';
-import DiscodataSqlBuilderView from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import DiscodataSqlBuilderView from 'volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam } from 'volto-datablocks/actions';
 import { Dimmer, Loader } from 'semantic-ui-react';
 import LinearProgress from '@material/react-linear-progress';
 
diff --git a/src/components/manage/Blocks/FiltersBlock/Edit.jsx b/src/components/manage/Blocks/FiltersBlock/Edit.jsx
index 2b110534..daab0902 100644
--- a/src/components/manage/Blocks/FiltersBlock/Edit.jsx
+++ b/src/components/manage/Blocks/FiltersBlock/Edit.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 
diff --git a/src/components/manage/Blocks/FiltersBlock/View.jsx b/src/components/manage/Blocks/FiltersBlock/View.jsx
index cf74a026..f203bae5 100644
--- a/src/components/manage/Blocks/FiltersBlock/View.jsx
+++ b/src/components/manage/Blocks/FiltersBlock/View.jsx
@@ -8,7 +8,7 @@ import { Icon } from '@plone/volto/components';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import { settings } from '~/config';
 import _uniqueId from 'lodash/uniqueId';
 import axios from 'axios';
diff --git a/src/components/manage/Blocks/GlossarySearchBlock/View.jsx b/src/components/manage/Blocks/GlossarySearchBlock/View.jsx
index dec9dba0..f86f3531 100644
--- a/src/components/manage/Blocks/GlossarySearchBlock/View.jsx
+++ b/src/components/manage/Blocks/GlossarySearchBlock/View.jsx
@@ -16,7 +16,7 @@ import {
 } from 'volto-addons/actions';
 import Highlighter from 'react-highlight-words';
 import cx from 'classnames';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
 import './style.css';
 
 const messages = defineMessages({
diff --git a/src/components/manage/Blocks/Iframe/Edit.jsx b/src/components/manage/Blocks/Iframe/Edit.jsx
index d645b4b0..962190a7 100644
--- a/src/components/manage/Blocks/Iframe/Edit.jsx
+++ b/src/components/manage/Blocks/Iframe/Edit.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 import './style.css';
diff --git a/src/components/manage/Blocks/LinkButton/Edit.jsx b/src/components/manage/Blocks/LinkButton/Edit.jsx
index b0a2925b..8ac68b36 100644
--- a/src/components/manage/Blocks/LinkButton/Edit.jsx
+++ b/src/components/manage/Blocks/LinkButton/Edit.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 
diff --git a/src/components/manage/Blocks/NavigationBlock/Edit.jsx b/src/components/manage/Blocks/NavigationBlock/Edit.jsx
index f554a7c4..a11a543f 100644
--- a/src/components/manage/Blocks/NavigationBlock/Edit.jsx
+++ b/src/components/manage/Blocks/NavigationBlock/Edit.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 
diff --git a/src/components/manage/Blocks/NavigationBlock/View.jsx b/src/components/manage/Blocks/NavigationBlock/View.jsx
index 9737b0b7..5c58b517 100644
--- a/src/components/manage/Blocks/NavigationBlock/View.jsx
+++ b/src/components/manage/Blocks/NavigationBlock/View.jsx
@@ -15,7 +15,7 @@ import {
 import {
   deleteQueryParam,
   setQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import { useEffect } from 'react';
 
 const View = ({ content, ...props }) => {
diff --git a/src/components/manage/Blocks/PollutantIndex/View.jsx b/src/components/manage/Blocks/PollutantIndex/View.jsx
index a91887a4..70071cff 100644
--- a/src/components/manage/Blocks/PollutantIndex/View.jsx
+++ b/src/components/manage/Blocks/PollutantIndex/View.jsx
@@ -2,11 +2,11 @@ import React, { useState, useEffect, useRef } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { Tab, Dropdown, Table } from 'semantic-ui-react';
-import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import cx from 'classnames';
 import './style.css';
 
diff --git a/src/components/manage/Blocks/QueryParamButton/Edit.jsx b/src/components/manage/Blocks/QueryParamButton/Edit.jsx
index 4b7b0820..095cf1d9 100644
--- a/src/components/manage/Blocks/QueryParamButton/Edit.jsx
+++ b/src/components/manage/Blocks/QueryParamButton/Edit.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 
diff --git a/src/components/manage/Blocks/QueryParamText/Edit.jsx b/src/components/manage/Blocks/QueryParamText/Edit.jsx
index 24b95f3a..2d3e303b 100644
--- a/src/components/manage/Blocks/QueryParamText/Edit.jsx
+++ b/src/components/manage/Blocks/QueryParamText/Edit.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 import './style.css';
diff --git a/src/components/manage/Blocks/SidebarBlock/Edit.jsx b/src/components/manage/Blocks/SidebarBlock/Edit.jsx
index e476379f..4d18cd6b 100644
--- a/src/components/manage/Blocks/SidebarBlock/Edit.jsx
+++ b/src/components/manage/Blocks/SidebarBlock/Edit.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 
diff --git a/src/components/manage/Blocks/SidebarBlock/View.jsx b/src/components/manage/Blocks/SidebarBlock/View.jsx
index 88b5b735..7d187a16 100644
--- a/src/components/manage/Blocks/SidebarBlock/View.jsx
+++ b/src/components/manage/Blocks/SidebarBlock/View.jsx
@@ -12,7 +12,7 @@ import {
   getBasePath,
 } from 'volto-tabsview/helpers';
 
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
 
 import { getFacilities, getInstallations, getLcps } from '~/helpers/api';
 
diff --git a/src/components/manage/Blocks/SiteBlocks/Header/View.jsx b/src/components/manage/Blocks/SiteBlocks/Header/View.jsx
index b817ca38..3c00fb4e 100644
--- a/src/components/manage/Blocks/SiteBlocks/Header/View.jsx
+++ b/src/components/manage/Blocks/SiteBlocks/Header/View.jsx
@@ -6,7 +6,7 @@ import QueryBuilder from '../QueryBuilder';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import './style.css';
 
 const View = (props) => {
diff --git a/src/components/manage/Blocks/SiteBlocks/LcpDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/LcpDetails/View.jsx
index 682c2686..d30c1171 100644
--- a/src/components/manage/Blocks/SiteBlocks/LcpDetails/View.jsx
+++ b/src/components/manage/Blocks/SiteBlocks/LcpDetails/View.jsx
@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import './style.css';
 
 const View = (props) => {
diff --git a/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx
index 2fdceb8d..32911716 100644
--- a/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx
+++ b/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx
@@ -5,7 +5,7 @@ import ReactTooltip from 'react-tooltip';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import CompetentAuthority from '../CompetentAuthority';
diff --git a/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx
index bceef8a7..0f47b781 100644
--- a/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx
+++ b/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx
@@ -6,7 +6,7 @@ import ReactTooltip from 'react-tooltip';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import _uniqueId from 'lodash/uniqueId';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import CompetentAuthority from '../CompetentAuthority';
diff --git a/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx b/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx
index ddb1eca2..6507cd7f 100644
--- a/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx
+++ b/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
-import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
 import Flags from '~/components/manage/Blocks/Flags/View';
 
 const QueryBuilder = (props) => {
diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx
index 894948e3..1f4eb0c7 100644
--- a/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx
+++ b/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx
@@ -5,7 +5,7 @@ import ReactTooltip from 'react-tooltip';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import PermitingAuthority from '../PermitingAuthority';
 import cx from 'classnames';
diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx
index 66de4528..0af8f379 100644
--- a/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx
+++ b/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx
@@ -5,7 +5,7 @@ import ReactTooltip from 'react-tooltip';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import PermitingAuthority from '../PermitingAuthority';
 import cx from 'classnames';
diff --git a/src/components/theme/View/DefaultView.jsx b/src/components/theme/View/DefaultView.jsx
index 3a55d14b..17d84c3d 100644
--- a/src/components/theme/View/DefaultView.jsx
+++ b/src/components/theme/View/DefaultView.jsx
@@ -13,7 +13,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { Container, Image } from 'semantic-ui-react';
 import { map } from 'lodash';
 import qs from 'query-string';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam } from 'volto-datablocks/actions';
 
 import { blocks } from '~/config';
 
diff --git a/src/components/theme/View/DiscodataView.jsx b/src/components/theme/View/DiscodataView.jsx
index b7d5fc9d..baa4035a 100644
--- a/src/components/theme/View/DiscodataView.jsx
+++ b/src/components/theme/View/DiscodataView.jsx
@@ -6,7 +6,7 @@ import qs from 'query-string';
 /* ROOT IMPORTS */
 import DefaultViewNoHeading from './DefaultViewNoHeading';
 /* LOCAL IMPORTS */
-import { getDiscodataResource, setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { getDiscodataResource, setQueryParam } from 'volto-datablocks/actions';
 import { Dimmer, Loader } from 'semantic-ui-react';
 /* =================================================== */
 const DiscodataView = (props) => {
diff --git a/src/config.js b/src/config.js
index 338efc8e..f9245143 100644
--- a/src/config.js
+++ b/src/config.js
@@ -19,7 +19,7 @@ import {
   installExpendableList,
   installFolderListing,
 } from 'volto-addons';
-import { installDiscodataBlocks } from '@eeacms/volto-datablocks';
+import { installDiscodataBlocks } from 'volto-datablocks';
 import { applyConfig as eprtrConfig } from './localconfig';
 
 const consoleError = console.error.bind(console);
diff --git a/src/customizations/volto/components/theme/App/App.jsx b/src/customizations/volto/components/theme/App/App.jsx
index 75e1f84e..a65d2bb1 100644
--- a/src/customizations/volto/components/theme/App/App.jsx
+++ b/src/customizations/volto/components/theme/App/App.jsx
@@ -102,10 +102,6 @@ class App extends Component {
     const action = getView(this.props.pathname);
     const isCmsUI = isCmsUi(this.props.pathname);
     const ConnectionRefusedView = views.errorViews.ECONNREFUSED;
-    console.error('APP: has error ?', this.state.hasError);
-    if (this.state.hasError) {
-      console.error('APP: error info ', this.state.errorInfo);
-    }
     return (
       <Fragment>
         <BodyClass className={`view-${action}view`} />
@@ -137,7 +133,8 @@ class App extends Component {
           <Segment basic className="content-area">
             <main>
               <OutdatedBrowser />
-              {this.props.connectionRefused ? (
+              <h1>APP</h1>
+              {/* {this.props.connectionRefused ? (
                 <ConnectionRefusedView />
               ) : this.state.hasError ? (
                 <Error
@@ -148,7 +145,7 @@ class App extends Component {
                 renderRoutes(this.props.route.routes, {
                   staticContext: this.props.staticContext,
                 })
-              )}
+              )} */}
             </main>
           </Segment>
         </MultilingualRedirector>
diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx
index af39fe80..ec0d5c99 100644
--- a/src/customizations/volto/components/theme/Navigation/Navigation.jsx
+++ b/src/customizations/volto/components/theme/Navigation/Navigation.jsx
@@ -16,7 +16,7 @@ import { getBaseUrl } from '@plone/volto/helpers';
 import { settings } from '~/config';
 
 import { getNavigation } from '@plone/volto/actions';
-import { resetQueryParam } from '@eeacms/volto-datablocks/actions';
+import { resetQueryParam } from 'volto-datablocks/actions';
 
 import clearSVG from '@plone/volto/icons/clear.svg';
 
@@ -156,53 +156,55 @@ class Navigation extends Component {
             </span>
           </button>
         </div>
-        <Menu
-          stackable
-          pointing
-          secondary
-          className={
-            this.state.isMobileMenuOpen
-              ? 'open'
-              : 'computer large screen widescreen only'
-          }
-        >
-          <Button
-            icon
-            basic
-            title="Close menu"
-            className="close-button"
-            onClick={this.closeMobileMenu}
+        <div className={this.state.isMobileMenuOpen ? 'open menu-wrapper' : ''}>
+          <Menu
+            stackable
+            pointing
+            secondary
+            className={
+              this.state.isMobileMenuOpen
+                ? 'open'
+                : 'computer large screen widescreen only'
+            }
           >
-            <Icon name={clearSVG} size="32px" />
-          </Button>
-          {this.props.items.map(
-            (item) =>
-              !settings.excludeFromNavigation.includes(item.url) && (
-                <NavLink
-                  to={item.url === '' ? '/' : item.url}
-                  key={item.url}
-                  className="item"
-                  activeClassName="active"
-                  onClick={() => {
-                    if (
-                      !item.url.includes('/industrial-site') &&
-                      !item.url.includes('/analysis')
-                    ) {
-                      this.props.resetQueryParam();
+            <Button
+              icon
+              basic
+              title="Close menu"
+              className="close-button"
+              onClick={this.closeMobileMenu}
+            >
+              <Icon name={clearSVG} size="32px" />
+            </Button>
+            {this.props.items.map(
+              (item) =>
+                !settings.excludeFromNavigation.includes(item.url) && (
+                  <NavLink
+                    to={item.url === '' ? '/' : item.url}
+                    key={item.url}
+                    className="item"
+                    activeClassName="active"
+                    onClick={() => {
+                      if (
+                        !item.url.includes('/industrial-site') &&
+                        !item.url.includes('/analysis')
+                      ) {
+                        this.props.resetQueryParam();
+                      }
+                      this.closeMobileMenu();
+                    }}
+                    exact={
+                      settings.isMultilingual
+                        ? item.url === `/${lang}`
+                        : item.url === ''
                     }
-                    this.closeMobileMenu();
-                  }}
-                  exact={
-                    settings.isMultilingual
-                      ? item.url === `/${lang}`
-                      : item.url === ''
-                  }
-                >
-                  {item.title}
-                </NavLink>
-              ),
-          )}
-        </Menu>
+                  >
+                    {item.title}
+                  </NavLink>
+                ),
+            )}
+          </Menu>
+        </div>
       </nav>
     );
   }
diff --git a/src/customizations/volto/components/theme/Search/Search.jsx b/src/customizations/volto/components/theme/Search/Search.jsx
index b1d8077b..08de4657 100644
--- a/src/customizations/volto/components/theme/Search/Search.jsx
+++ b/src/customizations/volto/components/theme/Search/Search.jsx
@@ -19,8 +19,8 @@ import { Helmet } from '@plone/volto/helpers';
 import { searchContent } from '@plone/volto/actions';
 import { Toolbar, Icon } from '@plone/volto/components';
 import Highlighter from 'react-highlight-words';
-import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam } from 'volto-datablocks/actions';
 import paginationLeftSVG from '@plone/volto/icons/left-key.svg';
 import paginationRightSVG from '@plone/volto/icons/right-key.svg';
 
diff --git a/src/customizations/volto/components/theme/View/View.jsx b/src/customizations/volto/components/theme/View/View.jsx
index affbfbbb..87d35b2d 100644
--- a/src/customizations/volto/components/theme/View/View.jsx
+++ b/src/customizations/volto/components/theme/View/View.jsx
@@ -230,8 +230,6 @@ class View extends Component {
    * @returns {string} Markup for the component.
    */
   render() {
-    console.error('VIEW: error: ', this.props.error);
-    console.error('VIEW: connection refused ? ', this.props.connectionRefused);
     if (this.props.error && !this.props.connectionRefused) {
       let FoundView;
       if (this.props.error.status === undefined) {
diff --git a/src/helpers/api.jsx b/src/helpers/api.jsx
index 8fb1adec..d98c6b42 100644
--- a/src/helpers/api.jsx
+++ b/src/helpers/api.jsx
@@ -2,7 +2,7 @@ import { settings } from '~/config';
 import {
   setDiscodataResource,
   setDiscodataResourcePending,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import axios from 'axios';
 
 export const parseResponse = (response) => {
diff --git a/src/helpers/index.js b/src/helpers/index.js
index 4b4effde..3554f9aa 100644
--- a/src/helpers/index.js
+++ b/src/helpers/index.js
@@ -6,7 +6,7 @@
  */
 import { settings } from '~/config';
 import { getBaseUrl } from '@plone/volto/helpers';
-import { setConnectedDataParameters } from '@eeacms/volto-datablocks/actions';
+import { setConnectedDataParameters } from 'volto-datablocks/actions';
 
 export function addCustomGroup(config, customGroup) {
   const hasCustomGroup = config.blocks.groupBlocksOrder.filter((el) => {