diff --git a/frontend/mrs.developer.json b/frontend/mrs.developer.json
index 6320943c..479b13fa 100644
--- a/frontend/mrs.developer.json
+++ b/frontend/mrs.developer.json
@@ -1,61 +1,5 @@
 {
   "volto-plonede": {
     "local": "addons/volto-plonede/src"
-  },
-  "volto-slider-block": {
-    "develop": false,
-    "package": "@kitconcept/volto-slider-block",
-    "url": "git@github.com:kitconcept/volto-slider-block.git",
-    "https": "https://github.com/kitconcept/volto-slider-block.git",
-    "path": "src",
-    "branch": "master"
-  },
-  "volto-heading-block": {
-    "develop": false,
-    "package": "@kitconcept/volto-heading-block",
-    "url": "git@github.com:kitconcept/volto-heading-block.git",
-    "https": "https://github.com/kitconcept/volto-heading-block.git",
-    "path": "src",
-    "branch": "master"
-  },
-  "volto-blocks-grid": {
-    "develop": false,
-    "package": "@kitconcept/volto-blocks-grid",
-    "url": "git@github.com:kitconcept/volto-blocks-grid.git",
-    "https": "https://github.com/kitconcept/volto-blocks-grid.git",
-    "path": "src",
-    "branch": "main"
-  },
-  "volto-button-block": {
-    "develop": false,
-    "package": "@kitconcept/volto-button-block",
-    "url": "git@github.com:kitconcept/volto-button-block.git",
-    "https": "https://github.com/kitconcept/volto-button-block.git",
-    "path": "src",
-    "branch": "master"
-  },
-  "volto-separator-block": {
-    "develop": false,
-    "package": "@kitconcept/volto-separator-block",
-    "url": "git@github.com:kitconcept/volto-separator-block.git",
-    "https": "https://github.com/kitconcept/volto-separator-block.git",
-    "path": "src",
-    "branch": "main"
-  },
-  "volto-introduction-block": {
-    "develop": false,
-    "package": "@kitconcept/volto-introduction-block",
-    "url": "git@github.com:kitconcept/volto-introduction-block.git",
-    "https": "https://github.com/kitconcept/volto-introduction-block.git",
-    "path": "src",
-    "branch": "main"
-  },
-  "volto-dsgvo-banner": {
-    "develop": false,
-    "package": "@kitconcept/volto-dsgvo-banner",
-    "url": "git@github.com:kitconcept/volto-dsgvo-banner.git",
-    "https": "https://github.com/kitconcept/volto-dsgvo-banner.git",
-    "path": "src",
-    "branch": "master"
   }
 }
diff --git a/frontend/package.json b/frontend/package.json
index c7a7efab..c4aee40f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -27,7 +27,6 @@
   "addons": [
     "@eeacms/volto-accordion-block",
     "@eeacms/volto-matomo",
-    "@kitconcept/volto-blocks-grid",
     "@kitconcept/volto-button-block",
     "@kitconcept/volto-dsgvo-banner",
     "@kitconcept/volto-export",
@@ -36,6 +35,7 @@
     "@kitconcept/volto-separator-block",
     "@kitconcept/volto-slider-block",
     "@plone-collective/volto-authomatic",
+    "@kitconcept/volto-light-theme",
     "volto-form-block",
     "volto-plonede"
   ],
@@ -142,7 +142,6 @@
   "dependencies": {
     "@eeacms/volto-accordion-block": "10.3.0",
     "@eeacms/volto-matomo": "4.1.3",
-    "@kitconcept/volto-blocks-grid": "8.0.3",
     "@kitconcept/volto-button-block": "2.3.1",
     "@kitconcept/volto-dsgvo-banner": "2.2.0",
     "@kitconcept/volto-export": "1.1.0",
diff --git a/frontend/src/addons/volto-plonede/src/components/index.js b/frontend/src/addons/volto-plonede/src/components/index.js
deleted file mode 100644
index cf9a47fa..00000000
--- a/frontend/src/addons/volto-plonede/src/components/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ButtonBlockSchemaEnhancer } from './manage/Blocks/ButtonBlockEnhancer';
-import { DefaultStylingSchemaEnhancer } from './manage/Blocks/DefaultStylingEnhancer';
-import { HeadingBlockSchemaEnhancer } from './manage/Blocks/HeadingBlockEnhancer';
-import { HeroBlockSchemaEnhancer } from './manage/Blocks/HeroBlockEnhancer';
-import { ImageBlockSchemaEnhancer } from './manage/Blocks/ImageBlockEnhancer';
-import { ListingBlockSchemaEnhancer } from './manage/Blocks/ListingBlockEnhancer';
-import { SliderBlockSchemaEnhancer } from './manage/Blocks/SliderBlockEnhancer';
-import { TeaserBlockSchemaEnhancer } from './manage/Blocks/TeaserBlockEnhancer';
-import { VideoBlockSchemaEnhancer } from './manage/Blocks/VideoBlockEnhancer';
-import EventTemplate from './manage/Blocks/Listing/EventTemplate';
-
-export {
-  ButtonBlockSchemaEnhancer,
-  DefaultStylingSchemaEnhancer,
-  HeadingBlockSchemaEnhancer,
-  HeroBlockSchemaEnhancer,
-  ImageBlockSchemaEnhancer,
-  ListingBlockSchemaEnhancer,
-  SliderBlockSchemaEnhancer,
-  TeaserBlockSchemaEnhancer,
-  VideoBlockSchemaEnhancer,
-  EventTemplate,
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ButtonBlockEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ButtonBlockEnhancer.js
deleted file mode 100644
index f91c59bc..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ButtonBlockEnhancer.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  backgroundColor: {
-    id: 'Background color',
-    defaultMessage: 'Background color',
-  },
-  newTab: {
-    id: 'Open in new tab',
-    defaultMessage: 'Open in new tab',
-  },
-  outerAlign: {
-    id: 'Alignment',
-    defaultMessage: 'Alignment',
-  },
-});
-export const ButtonBlockSchemaEnhancer = ({ schema, intl }) => {
-  //Color
-  const colors = [
-    { name: 'white', label: 'White' },
-    { name: 'blue', label: 'Blue' },
-  ];
-  schema.properties.backgroundColor = {
-    widget: 'color_picker',
-    title: intl.formatMessage(messages.backgroundColor),
-    colors,
-    default: 'blue',
-  };
-  schema.properties.outerAlign = {
-    widget: 'align',
-    title: intl.formatMessage(messages.outerAlign),
-    actions: ['center', 'wide'],
-    default: 'wide',
-  };
-
-  const arr = schema.fieldsets[0].fields;
-  arr.splice(2, 0, 'outerAlign');
-  arr.push('backgroundColor');
-  schema.fieldsets[0].fields = arr;
-
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/DefaultStylingEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/DefaultStylingEnhancer.js
deleted file mode 100644
index d7e48522..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/DefaultStylingEnhancer.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { addStyling } from '@plone/volto/helpers/Extensions/withBlockSchemaEnhancer';
-import { defineMessages } from 'react-intl';
-import config from '@plone/volto/registry';
-
-const messages = defineMessages({
-  backgroundColor: {
-    id: 'Background color',
-    defaultMessage: 'Background color',
-  },
-});
-
-export const DefaultStylingSchemaEnhancer = ({ schema, formData, intl }) => {
-  const DLR_BG_COLORS = [
-    { name: 'transparent', label: 'Transparent' },
-    { name: 'grey', label: 'Grey' },
-  ];
-
-  const colors =
-    config.blocks?.blocksConfig?.[formData['@type']]?.colors || DLR_BG_COLORS;
-
-  const defaultBGColor =
-    config.blocks?.blocksConfig?.[formData['@type']]?.defaultBGColor;
-
-  addStyling({ schema, intl });
-
-  schema.properties.styles.schema.fieldsets[0].fields = [
-    ...schema.properties.styles.schema.fieldsets[0].fields,
-    'backgroundColor',
-  ];
-  schema.properties.styles.schema.properties.backgroundColor = {
-    widget: 'color_picker',
-    title: intl.formatMessage(messages.backgroundColor),
-    colors,
-    default: defaultBGColor,
-  };
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/HeadingBlockEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/HeadingBlockEnhancer.js
deleted file mode 100644
index f0caa042..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/HeadingBlockEnhancer.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export const HeadingBlockSchemaEnhancer = ({ schema }) => {
-  schema.properties.align = {
-    title: 'Align',
-    widget: 'align',
-    actions: ['left', 'center', 'right'],
-    default: 'left',
-  };
-  schema.fieldsets[0].fields = [...schema.fieldsets[0].fields, ...['align']];
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/HeroBlockEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/HeroBlockEnhancer.js
deleted file mode 100644
index ce4f9f05..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/HeroBlockEnhancer.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  //Button
-  buttonColor: {
-    id: 'Button color',
-    defaultMessage: 'Button color',
-  },
-  buttonText: {
-    id: 'Button text',
-    defaultMessage: 'Button text',
-  },
-
-  //Backgroundcolor
-  backgroundColor: {
-    id: 'Background color',
-    defaultMessage: 'Background color',
-  },
-  showButton: {
-    id: 'Show button',
-    defineMessage: 'Show button',
-  },
-  buttonSettings: {
-    id: 'Button settings',
-    defineMessage: 'Button settings',
-  },
-});
-
-export const HeroBlockSchemaEnhancer = ({ schema, formData, intl }) => {
-  //Alignment
-  schema.properties.align = {
-    title: 'Align',
-    widget: 'align',
-    actions: ['left', 'right'],
-    default: 'left',
-  };
-
-  //Button
-  schema.properties.showButton = {
-    type: 'boolean',
-    default: false,
-    title: intl.formatMessage(messages.showButton),
-  };
-
-  const buttonColors = [
-    { name: 'white', label: 'White' },
-    { name: 'blue', label: 'Blue' },
-  ];
-  schema.properties.buttonColor = {
-    widget: 'color_picker',
-    title: intl.formatMessage(messages.buttonColor),
-    colors: buttonColors,
-    default: 'blue',
-  };
-  schema.properties.buttonText = {
-    title: intl.formatMessage(messages.buttonText),
-  };
-
-  schema.fieldsets[0].fields = ['align'];
-
-  schema.fieldsets = [
-    ...schema.fieldsets,
-    {
-      id: 'button settings',
-      title: intl.formatMessage(messages.buttonSettings),
-      fields: [
-        ...(formData.showButton
-          ? ['showButton', 'linkHref', 'buttonText', 'buttonColor']
-          : ['showButton']),
-      ],
-    },
-  ];
-
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ImageBlockEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ImageBlockEnhancer.js
deleted file mode 100644
index ca721a8c..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ImageBlockEnhancer.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  title: {
-    id: 'Title',
-    defaultMessage: 'Title',
-  },
-  credits: {
-    id: 'Credits',
-    defaultMessage: 'Credits',
-  },
-  linkTo: {
-    id: 'Link to',
-    defineMessage: 'Link to',
-  },
-  creditSettings: {
-    id: 'Credit settings',
-    defaultMessage: 'Credit settings',
-  },
-  openLinkInNewTab: {
-    id: 'Open in new tab',
-    defaultMessage: 'Open in new tab',
-  },
-});
-
-export const ImageBlockSchemaEnhancer = ({ intl, formData, schema }) => {
-  schema.properties.align.default = 'center';
-  schema.properties.align.actions = ['left', 'right', 'center', 'wide', 'full'];
-  schema.properties.size.default = 'l';
-  schema.properties.size.disabled =
-    formData.align === 'full' ||
-    formData.align === 'wide' ||
-    formData.align === 'center';
-
-  schema.properties.credits = {
-    title: intl.formatMessage(messages.credits),
-  };
-
-  schema.properties.title = {
-    title: intl.formatMessage(messages.title),
-  };
-
-  schema.properties.linkTo = {
-    title: intl.formatMessage(messages.linkTo),
-    widget: 'object_browser',
-    mode: 'link',
-    selectedItemAttrs: ['Title', 'Description', 'hasPreviewImage'],
-    allowExternals: true,
-  };
-
-  schema.fieldsets = [
-    ...schema.fieldsets,
-    {
-      id: 'credit settings',
-      title: intl.formatMessage(messages.creditSettings),
-      fields: [...['title', 'credits', 'linkTo']],
-    },
-  ];
-
-  //schema.fieldsets[0].fields = [...schema.fieldsets[0].fields, ...['']];
-
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/Listing/EventTemplate.jsx b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/Listing/EventTemplate.jsx
deleted file mode 100644
index ec0c7f6f..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/Listing/EventTemplate.jsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { ConditionalLink, Component } from '@plone/volto/components';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { isInternalURL } from '@plone/volto/helpers/Url/Url';
-import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
-
-const EventTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
-  let link = null;
-  let href = linkHref?.[0]?.['@id'] || '';
-
-  if (isInternalURL(href)) {
-    link = (
-      <ConditionalLink to={flattenToAppURL(href)} condition={!isEditMode}>
-        {linkTitle || href}
-      </ConditionalLink>
-    );
-  } else if (href) {
-    link = <a href={href}>{linkTitle || href}</a>;
-  }
-  return (
-    <>
-      <div className="items">
-        {items.map((item) => (
-          <div className="listing-item" key={item['@id']}>
-            <Component
-              className="listing-image"
-              componentName="PreviewImage"
-              item={item}
-              alt=""
-            />
-            <div className="listing-body">
-              <div className="event-when-where">
-                <div className="date">
-                  {item?.start ? (
-                    <FormattedDate date={item.start} locale="de" />
-                  ) : (
-                    <span className="day">No date</span>
-                  )}{' '}
-                  &mdash;&nbsp;
-                  {item?.end ? (
-                    <FormattedDate date={item.end} />
-                  ) : (
-                    <span className="day">No date</span>
-                  )}
-                </div>
-                {item?.location ? (
-                  <div className="location">, {item.location}</div>
-                ) : (
-                  <></>
-                )}
-              </div>
-              <h3 className="listing-header">
-                <ConditionalLink item={item} condition={!isEditMode}>
-                  {item.title ? item.title : item.id}
-                </ConditionalLink>
-              </h3>
-              <p className="listing-text">{item.description}</p>
-            </div>
-          </div>
-        ))}
-      </div>
-
-      {link && <div className="footer">{link}</div>}
-    </>
-  );
-};
-
-EventTemplate.propTypes = {
-  items: PropTypes.arrayOf(PropTypes.any).isRequired,
-  linkMore: PropTypes.any,
-  isEditMode: PropTypes.bool,
-};
-
-export default EventTemplate;
-
-//item.start && item.end && item.location
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ListingBlockEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ListingBlockEnhancer.js
deleted file mode 100644
index 54ab0dcb..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/ListingBlockEnhancer.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const ListingBlockSchemaEnhancer = ({ schema }) => {
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/SliderBlockEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/SliderBlockEnhancer.js
deleted file mode 100644
index 9c4c7868..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/SliderBlockEnhancer.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  buttonColor: {
-    id: 'Button color',
-    defaultMessage: 'Button color',
-  },
-  buttonText: {
-    id: 'Button text',
-    defaultMessage: 'Button text',
-  },
-  showButton: {
-    id: 'Show button',
-    defaultMessage: 'Show button',
-  },
-  flagAlign: {
-    id: 'Flag alginment',
-    defaultMessage: 'Flag alignment',
-  },
-});
-
-export const SliderBlockSchemaEnhancer = ({ schema, intl, formData }) => {
-  schema.properties.slides.schema.properties.buttonText = {
-    title: intl.formatMessage(messages.buttonText),
-  };
-  schema.properties.slides.schema.properties.flagAlign = {
-    widget: 'inner_align',
-    title: intl.formatMessage(messages.flagAlign),
-    actions: ['left', 'right'],
-    default: 'left',
-  };
-  schema.properties.slides.schema.fieldsets[0].fields = [
-    ...schema.properties.slides.schema.fieldsets[0].fields,
-    ...['buttonText', 'flagAlign'],
-  ];
-  //schema.fieldsets[0].fields = [...schema.fieldsets[0].fields, ...];
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/TeaserBlockEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/TeaserBlockEnhancer.js
deleted file mode 100644
index 6c2057a5..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/TeaserBlockEnhancer.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export const TeaserBlockSchemaEnhancer = ({ schema }) => {
-  schema.properties.align = {
-    title: 'Object-fit',
-    widget: 'align',
-    actions: ['center', 'full'],
-    default: 'full',
-  };
-  schema.fieldsets[0].fields = [...schema.fieldsets[0].fields, ...['align']];
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/VideoBlockEnhancer.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/VideoBlockEnhancer.js
deleted file mode 100644
index a3bb5561..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/VideoBlockEnhancer.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  title: {
-    id: 'Title',
-    defaultMessage: 'Title',
-  },
-  credits: {
-    id: 'Credits',
-    defaultMessage: 'Credits',
-  },
-  linkTo: {
-    id: 'Link to',
-    defineMessage: 'Link to',
-  },
-  creditSettings: {
-    id: 'Credit settings',
-    defaultMessage: 'Credit settings',
-  },
-  openLinkInNewTab: {
-    id: 'Open in new tab',
-    defaultMessage: 'Open in new tab',
-  },
-});
-
-export const VideoBlockSchemaEnhancer = ({ intl, formData, schema }) => {
-  schema.properties.credits = {
-    title: intl.formatMessage(messages.credits),
-  };
-
-  schema.properties.title = {
-    title: intl.formatMessage(messages.title),
-  };
-
-  schema.properties.linkTo = {
-    title: intl.formatMessage(messages.linkTo),
-    widget: 'object_browser',
-    mode: 'link',
-    selectedItemAttrs: ['Title', 'Description', 'hasPreviewImage'],
-    allowExternals: true,
-  };
-
-  schema.fieldsets = [
-    ...schema.fieldsets,
-    {
-      id: 'credit settings',
-      title: intl.formatMessage(messages.creditSettings),
-      fields: [...['title', 'credits', 'linkTo']],
-    },
-  ];
-
-  //schema.fieldsets[0].fields = [...schema.fieldsets[0].fields, ...['']];
-
-  return schema;
-};
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Data.jsx b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Data.jsx
deleted file mode 100644
index f448e1a7..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Data.jsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import { BlockDataForm } from '@plone/volto/components';
-
-import { Schema } from './schema';
-import { useIntl, defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  Quote: {
-    id: 'Quote',
-    defaultMessage: 'Quote',
-  },
-});
-
-const QuoteBlockData = (props) => {
-  const { data, block, onChangeBlock } = props;
-
-  const intl = useIntl();
-
-  React.useEffect(() => {
-    onChangeBlock(block, {
-      ...data,
-      backgroundColor: data.backgroundColor || '#d5dde2',
-      person: data.person,
-      position: data.position,
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return (
-    <BlockDataForm
-      schema={Schema({ ...props, intl })}
-      title={intl.formatMessage(messages.Quote)}
-      onChangeField={(id, value) => {
-        onChangeBlock(block, {
-          ...data,
-          [id]: value,
-        });
-      }}
-      formData={data}
-      fieldIndex={data.index}
-      basic
-      unwrapped
-      block={block}
-    />
-  );
-};
-
-export default QuoteBlockData;
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Edit.jsx b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Edit.jsx
deleted file mode 100644
index a0b78103..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Edit.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-
-import { SidebarPortal } from '@plone/volto/components';
-import View from './View';
-
-import QuoteSidebar from './Data';
-
-const QuoteBlockEdit = (props) => {
-  const { data, block, onChangeBlock, selected } = props;
-
-  return (
-    <>
-      <View {...props} />
-      <SidebarPortal selected={selected}>
-        <QuoteSidebar data={data} block={block} onChangeBlock={onChangeBlock} />
-      </SidebarPortal>
-    </>
-  );
-};
-
-export default QuoteBlockEdit;
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Sidebar.jsx b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Sidebar.jsx
deleted file mode 100644
index 1e0af327..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/Sidebar.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import Data from './Data';
-
-const QuoteSidebar = (props) => {
-  return <Data {...props} />;
-};
-
-export default QuoteSidebar;
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/View.jsx b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/View.jsx
deleted file mode 100644
index 7f500d2e..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/View.jsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from 'react';
-import cx from 'classnames';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import QuoteImage from './quote.png';
-import QuoteImageGrey from './quote-grey.png';
-// import quoteSVG from '@plone/volto/icons/quote.svg';
-// import { Icon } from '@plone/volto/components';
-
-const QuoteBlockView = (props) => {
-  const { data } = props;
-  return (
-    <>
-      {data && (
-        <div
-          className={cx('block quote', data.backgroundColor, {
-            'no-image': !data.image?.length > 0,
-            // The image is returned in an array (empty array = true)
-            // so we are checking the length of the array to set the 'no-image'
-            // class when the array is empty.
-            'align-left': data.align === 'left',
-          })}
-        >
-          <div className="inner-wrapper">
-            {data?.image?.[0] && (
-              <div className="quote-image-wrapper">
-                <img
-                  src={`${flattenToAppURL(
-                    data.image[0]['@id'],
-                  )}/@@images/image/preview`}
-                  alt=""
-                  width="150"
-                  height="150"
-                  loading="lazy"
-                  className="quote-image"
-                />
-              </div>
-            )}
-            <figure className="quotation">
-              <blockquote className="quote-text">
-                {data.align !== 'left' && (
-                  <img
-                    className="quotation-mark"
-                    src={
-                      data.backgroundColor === 'lightGrey'
-                        ? QuoteImage
-                        : QuoteImageGrey
-                    }
-                    alt=""
-                    width="79"
-                    height="70"
-                    loading="lazy"
-                  />
-                )}
-                {data.align === 'left' ? '„' : null}
-                {data.text}“
-              </blockquote>
-              <figcaption className="author">
-                <span className="person">{data.person}</span>
-                {data.position && ', '}
-                {data.position}
-              </figcaption>
-            </figure>
-          </div>
-        </div>
-      )}
-    </>
-  );
-};
-
-export default QuoteBlockView;
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/quote-grey.png b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/quote-grey.png
deleted file mode 100644
index 40f4ad49..00000000
Binary files a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/quote-grey.png and /dev/null differ
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/quote.png b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/quote.png
deleted file mode 100644
index 94ee4e88..00000000
Binary files a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/quote.png and /dev/null differ
diff --git a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/schema.js b/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/schema.js
deleted file mode 100644
index fc32175c..00000000
--- a/frontend/src/addons/volto-plonede/src/components/manage/Blocks/volto-quote-block/schema.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  quote: {
-    id: 'Quote',
-    defaultMessage: 'Quote',
-  },
-  image: {
-    id: 'Image',
-    defaultMessage: 'Image',
-  },
-  quoteText: {
-    id: 'Quote-text',
-    defaultMessage: 'Quote-text',
-  },
-  quotedPerson: {
-    id: 'Quoted person',
-    defaultMessage: 'Quoted person',
-  },
-  name: {
-    id: 'Name',
-    defaultMessage: 'Name',
-  },
-  position: {
-    id: 'Position',
-    defaultMessage: 'Position',
-  },
-  backgroundColor: {
-    id: 'Background color',
-    defaultMessage: 'Background color',
-  },
-  imageAlignment: {
-    id: 'Image Alignment',
-    defaultMessage: 'Image Alignment',
-  },
-});
-export const Schema = (props) => {
-  const { intl } = props;
-  const colors = [
-    { name: 'white', label: 'White' },
-    { name: 'lightGrey', label: 'Light grey' },
-  ];
-  return {
-    block: intl.formatMessage(messages.quote),
-    fieldsets: [
-      {
-        id: 'default',
-        title: 'Default',
-        fields: ['image', 'text', 'backgroundColor', 'align'],
-      },
-      {
-        id: 'person',
-        title: intl.formatMessage(messages.quotedPerson),
-        fields: ['person', 'position'],
-      },
-    ],
-    properties: {
-      image: {
-        title: intl.formatMessage(messages.image),
-        widget: 'object_browser',
-        mode: 'image',
-        selectedItemAttrs: [],
-      },
-      text: {
-        title: intl.formatMessage(messages.quoteText),
-        widget: 'textarea',
-      },
-      person: { title: intl.formatMessage(messages.name) },
-      position: { title: intl.formatMessage(messages.position) },
-      backgroundColor: {
-        title: intl.formatMessage(messages.backgroundColor),
-        widget: 'color_picker',
-        colors,
-        default: 'lightGrey',
-      },
-      align: {
-        title: intl.formatMessage(messages.imageAlignment),
-        widget: 'quoteAlign',
-      },
-    },
-    required: [],
-  };
-};
diff --git a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx b/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx
deleted file mode 100644
index 65516d8a..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Message } from 'semantic-ui-react';
-import { defineMessages, useIntl } from 'react-intl';
-import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { getTeaserImageURL } from '@kitconcept/volto-blocks-grid/components/Teaser/utils';
-import { MaybeWrap } from '@plone/volto/components';
-import { UniversalLink } from '@plone/volto/components';
-import cx from 'classnames';
-import config from '@plone/volto/registry';
-
-const messages = defineMessages({
-  PleaseChooseContent: {
-    id: 'Please choose an existing content as source for this element',
-    defaultMessage:
-      'Please choose an existing content as source for this element',
-  },
-});
-
-const DefaultImage = (props) => <img {...props} alt={props.alt || ''} />;
-
-const TeaserDefaultTemplate = (props) => {
-  const { className, data, isEditMode } = props;
-  const intl = useIntl();
-  const href = data.href?.[0];
-  const image = data.preview_image?.[0];
-  const align = data?.styles?.align;
-
-  const hasImageComponent = config.getComponent('Image').component;
-  const Image = config.getComponent('Image').component || DefaultImage;
-  const defaultImageSrc =
-    href && flattenToAppURL(getTeaserImageURL({ href, image, align }));
-
-  return (
-    <div className={cx('block teaser', className)}>
-      <>
-        {!href && isEditMode && (
-          <Message>
-            <div className="grid-teaser-item placeholder">
-              <img src={imageBlockSVG} alt="" />
-              <p>{intl.formatMessage(messages.PleaseChooseContent)}</p>
-            </div>
-          </Message>
-        )}
-        {href && (
-          <MaybeWrap
-            condition={!isEditMode}
-            as={UniversalLink}
-            href={href['@id']}
-            target={data.openLinkInNewTab ? '_blank' : null}
-          >
-            <div className="grid-teaser-item default">
-              {(href.hasPreviewImage || href.image_field || image) && (
-                <div className="grid-image-wrapper">
-                  <Image
-                    src={hasImageComponent ? href : defaultImageSrc}
-                    alt=""
-                    loading="lazy"
-                    className={cx('object-fit', {
-                      contain: data.align === 'center',
-                      cover: data.align === 'full',
-                    })}
-                  />
-                </div>
-              )}
-              <div className="content">
-                {data?.head_title && (
-                  <div className="headline">{data.head_title}</div>
-                )}
-
-                <h2>{data?.title}</h2>
-                {!data.hide_description && <p>{data?.description}</p>}
-              </div>
-            </div>
-          </MaybeWrap>
-        )}
-      </>
-    </div>
-  );
-};
-
-TeaserDefaultTemplate.propTypes = {
-  data: PropTypes.objectOf(PropTypes.any).isRequired,
-  isEditMode: PropTypes.bool,
-};
-
-export default TeaserDefaultTemplate;
diff --git a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-button-block/components/View.jsx b/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-button-block/components/View.jsx
deleted file mode 100644
index 6e135de1..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-button-block/components/View.jsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import React from 'react';
-import { Button } from 'semantic-ui-react';
-import cx from 'classnames';
-import { ConditionalLink } from '@plone/volto/components';
-import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers';
-import { defineMessages, useIntl } from 'react-intl';
-
-const messages = defineMessages({
-  ButtonText: {
-    id: 'Button text',
-    defaultMessage: 'Button text',
-  },
-});
-
-const View = (props) => {
-  const { className, data, isEditMode } = props;
-  const [hasLink, setHasLink] = React.useState(false);
-  const intl = useIntl();
-
-  React.useEffect(() => {
-    if (data.href) {
-      if (data.href && data.href.length > 0) {
-        setHasLink(true);
-      }
-      if (data.href.length === 0) {
-        setHasLink(false);
-      }
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [data.href]);
-
-  const link = hasLink ? (
-    data.href.length > 0 && isInternalURL(data.href[0]['@id']) ? (
-      <ConditionalLink
-        to={data.href.length > 0 ? flattenToAppURL(data.href[0]['@id']) : ''}
-        condition={!isEditMode}
-      >
-        <Button className={(cx('__button'), data.backgroundColor)}>
-          {data.title || intl.formatMessage(messages.ButtonText)}
-        </Button>
-      </ConditionalLink>
-    ) : (
-      data.href.length > 0 && (
-        <a
-          href={flattenToAppURL(data.href[0]['@id'])}
-          target="_blank"
-          rel="noreferrer"
-        >
-          <Button className={(cx('__button'), data.backgroundColor)}>
-            {data.title || intl.formatMessage(messages.ButtonText)}
-          </Button>
-        </a>
-      )
-    )
-  ) : (
-    <Button className={(cx('noLink'), data.backgroundColor)}>
-      {data.title || intl.formatMessage(messages.ButtonText)}
-    </Button>
-  );
-
-  return (
-    <div
-      className={cx(
-        'block __button',
-        `has--align--${data.outerAlign}`,
-        data.newTab,
-        className,
-      )}
-    >
-      <div className="button container">
-        <div className={cx(`align-${data?.inneralign}`)}>{link}</div>
-      </div>
-    </div>
-  );
-};
-
-export default View;
diff --git a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-dsgvo-banner/components/Banner/Banner.jsx b/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-dsgvo-banner/components/Banner/Banner.jsx
deleted file mode 100644
index bbcf08ed..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-dsgvo-banner/components/Banner/Banner.jsx
+++ /dev/null
@@ -1,292 +0,0 @@
-/* eslint-disable import/no-unresolved */
-import React, { useState, useEffect } from 'react';
-import { includes, isObject } from 'lodash';
-import { Button, Modal, Checkbox, Form } from 'semantic-ui-react';
-import { useCookies } from 'react-cookie';
-import { Link } from 'react-router-dom';
-import { connect } from 'react-redux';
-import config from '@plone/volto/registry';
-import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
-import Google from '@kitconcept/volto-dsgvo-banner/components/Banner/Google';
-import Matomo from '@kitconcept/volto-dsgvo-banner/components/Banner/Matomo';
-import { BodyClass } from '@plone/volto/helpers';
-
-import { hideDSGVOBanner } from '@kitconcept/volto-dsgvo-banner/actions';
-
-const messages = defineMessages({
-  technically_required: {
-    id: 'Technically required',
-    defaultMessage: 'Technically required',
-  },
-  tracking: {
-    id: 'Tracking',
-    defaultMessage: 'Tracking',
-  },
-});
-
-const Banner = (props) => {
-  let privacy_url = config.settings.DSGVOBanner.privacy_url;
-  const modules = config.settings.DSGVOBanner.modules;
-  const [cookies, setCookie, removeCookie] = useCookies();
-  const [configureCookies, setConfigureCookies] = useState(false);
-  const showConfirmModal = !Number(cookies.confirm_cookies) || props.show;
-  const intl = useIntl();
-
-  if (isObject(privacy_url)) {
-    privacy_url = privacy_url[intl.locale];
-  }
-  const [confirmTracking, setConfirmTracking] = useState(
-    !!Number(cookies.confirm_tracking),
-  );
-  const [confirmYoutube, setConfirmYoutube] = useState(
-    !!Number(cookies.confirm_youtube),
-  );
-  const [confirmFacebook, setConfirmFacebook] = useState(
-    !!Number(cookies.confirm_facebook),
-  );
-  const [confirmGoogle, setConfirmGoogle] = useState(
-    !!Number(cookies.confirm_google),
-  );
-
-  const expiryDate = new Date();
-  expiryDate.setMonth(expiryDate.getMonth() + 1);
-  const options = { path: '/', expires: expiryDate };
-
-  const confirmSelection = () => {
-    let expiryDate = new Date();
-    expiryDate.setMonth(expiryDate.getMonth() + 1);
-    if (confirmTracking) {
-      setCookie('confirm_tracking', 1, options);
-      window[`ga-disable-${config.settings.DSGVOBanner.trackingId}`] = false;
-    } else {
-      removeCookie('confirm_tracking', options);
-      window[`ga-disable-${config.settings.DSGVOBanner.trackingId}`] = true;
-      removeCookie('_ga', options);
-      removeCookie('_gat', options);
-      removeCookie('_gid', options);
-    }
-
-    if (confirmFacebook) {
-      setCookie('confirm_facebook', 1, options);
-    } else {
-      removeCookie('confirm_facebook', options);
-    }
-
-    if (confirmYoutube) {
-      setCookie('confirm_youtube', 1, options);
-    } else {
-      removeCookie('confirm_youtube', options);
-    }
-
-    if (confirmGoogle) {
-      setCookie('confirm_google', 1, options);
-    } else {
-      removeCookie('confirm_google', options);
-    }
-
-    setCookie('confirm_cookies', 1, options);
-    props.hideDSGVOBanner();
-  };
-
-  const confirmAll = () => {
-    setCookie('confirm_tracking', 1, options);
-    window[`ga-disable-${config.settings.DSGVOBanner.trackingId}`] = false;
-
-    setCookie('confirm_facebook', 1, options);
-    setCookie('confirm_youtube', 1, options);
-    setCookie('confirm_google', 1, options);
-    setCookie('confirm_cookies', 1, options);
-
-    props.hideDSGVOBanner();
-  };
-
-  useEffect(() => {
-    if (document && showConfirmModal) {
-      document.getElementById('question-landing').focus();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    <>
-      {config.settings.DSGVOBanner.tracker.type === 'google' && <Google />}
-      {config.settings.DSGVOBanner.tracker.type === 'matomo' && <Matomo />}
-      <BodyClass className={showConfirmModal ? 'openCookieBanner' : ''} />
-      <Modal
-        id="question-landing"
-        open={showConfirmModal}
-        dimmer="inverted"
-        closeOnDimmerClick={false}
-        className="dsgvo-banner"
-      >
-        {!configureCookies ? (
-          <>
-            <Modal.Content>
-              <h2>
-                <FormattedMessage
-                  id="Privacy Notice"
-                  defaultMessage="Privacy Notice"
-                />
-              </h2>
-
-              <p className="cookie-text">
-                <FormattedMessage
-                  id="To give you the best possible user experience, we use cookies on our website. Cookies required for the operation of the site are set automatically. You can also allow other cookies. You can {agree_all_cookies} or {adjust_privacy_settings}."
-                  defaultMessage="To give you the best possible user experience, we use cookies on our website. Cookies required for the operation of the site are set automatically. You can also allow other cookies. You can {agree_all_cookies} or {adjust_privacy_settings}."
-                  values={{
-                    agree_all_cookies: (
-                      <b>
-                        <FormattedMessage
-                          id="agree to all cookies"
-                          defaultMessage="agree to all cookies"
-                        />
-                      </b>
-                    ),
-                    adjust_privacy_settings: (
-                      <b>
-                        <FormattedMessage
-                          id="adjust the privacy settings"
-                          defaultMessage="adjust the privacy settings"
-                        />
-                      </b>
-                    ),
-                  }}
-                />
-              </p>
-              <p>
-                <FormattedMessage
-                  id="You can find more information on the used cookies and how you can subsequently revoke your consent in our"
-                  defaultMessage="You can find more information on the used cookies and how you can subsequently revoke your consent in our"
-                />{' '}
-                <b>
-                  <Link to={privacy_url} onClick={confirmSelection}>
-                    <FormattedMessage
-                      id="Privacy Policy"
-                      defaultMessage="Privacy Policy"
-                    />
-                  </Link>
-                </b>
-                .
-              </p>
-            </Modal.Content>
-            <Modal.Actions>
-              <Button className="branded blue" onClick={() => confirmAll()}>
-                <FormattedMessage
-                  id="Agree to all cookies"
-                  defaultMessage="Agree to all cookies"
-                />
-              </Button>
-              {modules.length > 0 && (
-                <Button
-                  className="branded blue inverted"
-                  branded
-                  onClick={() => setConfigureCookies(true)}
-                >
-                  <FormattedMessage
-                    id="Adjust privacy settings"
-                    defaultMessage="Adjust privacy settings"
-                  />
-                </Button>
-              )}
-            </Modal.Actions>
-          </>
-        ) : (
-          <>
-            <Modal.Content>
-              <h2>
-                <FormattedMessage
-                  id="Privacy Notice"
-                  defaultMessage="Privacy Notice"
-                />
-              </h2>
-              <Form>
-                <Form.Field>
-                  <Checkbox
-                    toggle
-                    label={intl.formatMessage(messages.technically_required)}
-                    checked
-                    disabled
-                  />
-                </Form.Field>
-                {includes(modules, 'tracking') && (
-                  <Form.Field>
-                    <Checkbox
-                      toggle
-                      label={intl.formatMessage(messages.tracking)}
-                      onChange={() => setConfirmTracking(!confirmTracking)}
-                      checked={confirmTracking}
-                    />
-                  </Form.Field>
-                )}
-                {includes(modules, 'youtube') && (
-                  <Form.Field>
-                    <Checkbox
-                      toggle
-                      label="Youtube"
-                      onChange={() => setConfirmYoutube(!confirmYoutube)}
-                      checked={confirmYoutube}
-                    />
-                  </Form.Field>
-                )}
-                {includes(modules, 'facebook') && (
-                  <Form.Field>
-                    <Checkbox
-                      toggle
-                      label="Facebook"
-                      onChange={() => setConfirmFacebook(!confirmFacebook)}
-                      checked={confirmFacebook}
-                    />
-                  </Form.Field>
-                )}
-                {includes(modules, 'google') && (
-                  <Form.Field>
-                    <Checkbox
-                      toggle
-                      label="Google"
-                      onChange={() => setConfirmGoogle(!confirmGoogle)}
-                      checked={confirmGoogle}
-                    />
-                  </Form.Field>
-                )}
-              </Form>
-            </Modal.Content>
-            <Modal.Actions>
-              <Button
-                className="back"
-                onClick={() => setConfigureCookies(false)}
-              >
-                {'< '}
-                <FormattedMessage id="Back" defaultMessage="Back" />
-              </Button>
-              <Button
-                className="branded blue inverted"
-                onClick={() => confirmAll()}
-              >
-                <FormattedMessage
-                  id="Agree to all cookies"
-                  defaultMessage="Agree to all cookies"
-                />
-              </Button>
-              <Button
-                className="branded blue"
-                branded
-                onClick={confirmSelection}
-              >
-                <FormattedMessage id="Save" defaultMessage="Save" />
-              </Button>
-            </Modal.Actions>
-          </>
-        )}
-      </Modal>
-    </>
-  );
-};
-
-export default connect(
-  (state, props) => ({
-    show: state.DSGVOBanner.show,
-  }),
-  {
-    hideDSGVOBanner,
-  },
-)(Banner);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-dsgvo-banner/components/IfConfirm/IfConfirm.jsx b/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-dsgvo-banner/components/IfConfirm/IfConfirm.jsx
deleted file mode 100644
index a56a6747..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-dsgvo-banner/components/IfConfirm/IfConfirm.jsx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* eslint-disable import/no-unresolved */
-import React from 'react';
-import { Button, Message } from 'semantic-ui-react';
-import { useCookies } from 'react-cookie';
-import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
-import { showDSGVOBanner } from '@kitconcept/volto-dsgvo-banner/actions';
-
-const IfConfirm = ({ children, module, showDSGVOBanner }) => {
-  const [cookies] = useCookies();
-
-  // We bail out if module is undefined, while this is most likely
-  // a bug in the caller, there is nothing we can do here,
-  // but we want to avoid a traceback.
-  // See https://gitlab.dlr.de/internet-cms/cms-plone/dlr-internet/-/issues/1384
-
-  if (!module || !!Number(cookies[`confirm_${module}`])) {
-    return <>{children}</>;
-  } else {
-    return (
-      <div className="block">
-        <Message>
-          <div>
-            <FormattedMessage
-              id="You can not view this content at this moment because you have selected to disable {module} cookies in the privacy settings."
-              defaultMessage="You can not view this content at this moment because you have selected to disable {module} cookies in the privacy settings."
-              values={{
-                module: <b>{module}</b>,
-              }}
-            />{' '}
-            <Button onClick={showDSGVOBanner}>
-              <FormattedMessage
-                id="Enable {module} cookies"
-                defaultMessage="Enable {module} cookies"
-                values={{
-                  module: <b>{module}</b>,
-                }}
-              />
-            </Button>
-            <FormattedMessage id=", or " defaultMessage=", or " />
-            <Button onClick={showDSGVOBanner}>
-              <FormattedMessage
-                id="Customize your Privacy Settings"
-                defaultMessage="Customize your Privacy Settings"
-              />
-            </Button>
-          </div>
-        </Message>
-      </div>
-    );
-  }
-};
-
-export default connect((state, props) => ({}), {
-  showDSGVOBanner,
-})(IfConfirm);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-heading-block/components/Edit.jsx b/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-heading-block/components/Edit.jsx
deleted file mode 100644
index 29f5b539..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-heading-block/components/Edit.jsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import React from 'react';
-import ContentEditable from 'react-contenteditable';
-import { withBlockExtensions } from '@plone/volto/helpers';
-import { SidebarPortal } from '@plone/volto/components';
-import HeadingSidebar from '@kitconcept/volto-heading-block/components/Sidebar';
-import config from '@plone/volto/registry';
-import cx from 'classnames';
-
-// Source: https://stackoverflow.com/questions/5796718/html-entity-decode
-var decodeHTMLEntities = (function () {
-  if (__SERVER__) {
-    return () => {
-      throw new Error('DecodeHTMLEntities is not supported in SSR.');
-    };
-  }
-  // closure to avoid creating the object each time
-  var element = document.createElement('div');
-
-  function decodeHTMLEntities(str) {
-    if (str && typeof str === 'string') {
-      // strip script/html tags
-      str = str.replace(/<script[^>]*>([\S\s]*?)<\/script>/gim, '');
-      str = str.replace(/<\/?\w(?:[^"'>]|"[^"]*"|'[^']*')*>/gim, '');
-      element.innerHTML = str;
-      str = element.textContent;
-      element.textContent = '';
-    }
-
-    return str;
-  }
-
-  return decodeHTMLEntities;
-})();
-
-class HeadingEdit extends React.Component {
-  constructor(props) {
-    super();
-    this.state = {
-      html: props.data.heading || '',
-    };
-  }
-
-  editable = React.createRef();
-  componentDidUpdate(prevProps) {
-    if (this.props.selected && this.editable.current) {
-      this.editable.current.focus();
-    }
-  }
-
-  handleChange = (event) => {
-    const { block, data } = this.props;
-    // Strip all html tags and decode html entities. Apparently this is necessary.
-    const cleanedText = decodeHTMLEntities(event.target.value);
-    if (event.nativeEvent.inputType === 'insertFromPaste') {
-      this.setState({ html: cleanedText });
-    } else {
-      this.setState({ html: event.target.value });
-    }
-    this.props.onChangeBlock(block, { ...data, heading: cleanedText });
-  };
-
-  render = () => {
-    const { block, data, onChangeBlock, selected } = this.props;
-    const show_alignment = config.blocks?.blocksConfig?.heading?.show_alignment;
-    return (
-      <div
-        className={cx('block heading', {
-          selected: selected,
-          'align-left': data.align === 'left',
-          'align-center': data.align === 'center',
-          'align-right': data.align === 'right',
-        })}
-      >
-        <div className="heading-wrapper">
-          <ContentEditable
-            innerRef={this.editable}
-            className="editable"
-            style={show_alignment ? { textAlign: data.alignment } : {}}
-            tagName={data.tag ?? 'h2'}
-            html={this.state.html} // innerHTML of the editable div
-            onChange={this.handleChange} // handle innerHTML change
-            onKeyDown={(e) => {
-              if (e.key === 'Enter') {
-                e.preventDefault();
-                e.stopPropagation();
-                this.props.onSelectBlock(
-                  this.props.onAddBlock(
-                    config.settings.defaultBlockType,
-                    this.props.index + 1,
-                  ),
-                );
-              } else if (e.key === 'ArrowUp') {
-                e.preventDefault();
-                e.stopPropagation();
-                this.props.onFocusPreviousBlock(
-                  this.props.block,
-                  this.editable.current,
-                );
-              } else if (e.key === 'ArrowDown') {
-                e.preventDefault();
-                e.stopPropagation();
-                this.props.onFocusNextBlock(
-                  this.props.block,
-                  this.editable.current,
-                );
-              }
-            }}
-          />
-          <SidebarPortal selected={selected}>
-            <HeadingSidebar
-              {...this.props}
-              data={data}
-              block={block}
-              onChangeBlock={onChangeBlock}
-            />
-          </SidebarPortal>
-        </div>
-      </div>
-    );
-  };
-}
-
-export default withBlockExtensions(HeadingEdit);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-heading-block/components/View.jsx b/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-heading-block/components/View.jsx
deleted file mode 100644
index 2f88e9ac..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-heading-block/components/View.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import { withBlockExtensions } from '@plone/volto/helpers';
-import cx from 'classnames';
-import config from '@plone/volto/registry';
-
-const HeadingView = (props) => {
-  const { className, data } = props;
-  const Element = data.tag || 'h2';
-  const show_alignment = config.blocks?.blocksConfig?.heading?.show_alignment;
-  return (
-    <>
-      {data && (
-        <div
-          className={cx('block heading', className, {
-            'align-left': data.align === 'left',
-            'align-center': data.align === 'center',
-            'align-right': data.align === 'right',
-          })}
-        >
-          {' '}
-          <div className="heading-wrapper">
-            <Element
-              style={show_alignment ? { textAlign: data.alignment } : {}}
-              className="heading"
-            >
-              {data?.heading || ''}
-            </Element>
-          </div>
-        </div>
-      )}
-    </>
-  );
-};
-
-export default withBlockExtensions(HeadingView);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-slider-block/components/DefaultBody.jsx b/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-slider-block/components/DefaultBody.jsx
deleted file mode 100644
index bec54d0e..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/@kitconcept/volto-slider-block/components/DefaultBody.jsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import React from 'react';
-import { useIntl, defineMessages } from 'react-intl';
-import { Icon, MaybeWrap, UniversalLink } from '@plone/volto/components';
-import { Input, Button, Message } from 'semantic-ui-react';
-import cx from 'classnames';
-import navTreeSVG from '@plone/volto/icons/nav.svg';
-import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg';
-import config from '@plone/volto/registry';
-
-const messages = defineMessages({
-  PleaseChooseContent: {
-    id: 'Please choose an existing content as source for this element',
-    defaultMessage:
-      'Please choose an existing content as source for this element',
-  },
-  moreInfo: {
-    id: 'moreInfo',
-    defaultMessage: 'More info',
-  },
-  source: {
-    id: 'Source',
-    defaultMessage: 'Source',
-  },
-  buttonText: {
-    id: 'Continue reading',
-    defaultMessage: 'Continue reading',
-  },
-  buttonColor: {
-    id: 'Button color',
-    defaultMessage: 'Button color',
-  },
-});
-
-const DefaultImage = (props) => <img {...props} alt={props.alt || ''} />;
-
-const SliderBody = ({
-  index,
-  onChangeBlock,
-  block,
-  data,
-  dataBlock,
-  isEditMode,
-  openObjectBrowser,
-}) => {
-  const intl = useIntl();
-  const href = data.href?.[0];
-  const image = data.preview_image?.[0];
-
-  const Image = config.getComponent('Image').component || DefaultImage;
-
-  const handleClick = () => {
-    openObjectBrowser({
-      onSelectItem: (url, document) => {
-        dataBlock.slides[index].title = document.Title;
-        dataBlock.slides[index].description = document.Description;
-        dataBlock.slides[index].href = [
-          {
-            '@id': document['@id'],
-            Title: document.Title,
-            Description: document.Description,
-            title: document.Title,
-            image_field: document.image_field,
-            hasPreviewImage: document.hasPreviewImage,
-          },
-        ];
-        onChangeBlock(block, dataBlock);
-      },
-      mode: 'link',
-    });
-  };
-
-  return (
-    <div
-      className={cx('grid-teaser-item top', {
-        'empty-slide': !href && isEditMode,
-      })}
-    >
-      {!href && isEditMode && (
-        <Message>
-          <div className="grid-teaser-item default">
-            <img src={imageBlockSVG} alt="" />
-            <p>{intl.formatMessage(messages.PleaseChooseContent)}</p>
-            <div className="toolbar-inner">
-              <Button.Group>
-                <Button onClick={handleClick} icon basic>
-                  <Icon name={navTreeSVG} size="24px" />
-                </Button>
-              </Button.Group>
-              <Input
-                placeholder={`${intl.formatMessage(messages.source)}...`}
-                onClick={handleClick}
-                onFocus={(e) => e.target.blur()}
-              />
-            </div>
-          </div>
-        </Message>
-      )}
-      {href && (
-        <MaybeWrap
-          className={cx('teaser-item top', {
-            right: data.flagAlign === 'right',
-            left: data.flagAlign === 'left',
-          })}
-          condition={isEditMode}
-          tabIndex="-1"
-        >
-          <MaybeWrap
-            className={cx('teaser-item link', {
-              right: data.flagAlign === 'right',
-              left: data.flagAlign === 'left',
-            })}
-            condition={!isEditMode}
-            as={UniversalLink}
-            href={href['@id']}
-            target={data.openLinkInNewTab ? '_blank' : null}
-            tabIndex="-1"
-          >
-            {/* START CUSTOMSTARTIZATION */}
-            {(href?.hasPreviewImage || href.image_field || image) && (
-              <div className="highlight-image-wrapper gradient">
-                <Image
-                  item={image || href}
-                  imageField={image ? image.image_field : href.image_field}
-                  alt=""
-                  loading="lazy"
-                  responsive={true}
-                />
-              </div>
-            )}
-            {/* END CUSTOMIZATION */}
-            <div className="teaser-item-title fix-width-issue">
-              <div className="title">
-                {data?.head_title && (
-                  <span className="supertitle">{data?.head_title}</span>
-                )}
-                <h2>{data?.nav_title || data?.title}</h2>
-              </div>
-              <div className="body">
-                <p>{data?.description}</p>
-              </div>
-              <Button className="white">
-                {data.buttonText || intl.formatMessage(messages.buttonText)}
-              </Button>
-            </div>
-          </MaybeWrap>
-        </MaybeWrap>
-      )}
-    </div>
-  );
-};
-
-export default SliderBody;
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/HeroImageLeft/Edit.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/HeroImageLeft/Edit.jsx
deleted file mode 100644
index 1ee678bc..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/HeroImageLeft/Edit.jsx
+++ /dev/null
@@ -1,501 +0,0 @@
-/**
- * Edit Hero block.
- * @module components/manage/Blocks/Image/Edit
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-import { readAsDataURL } from 'promise-file-reader';
-import { Button, Dimmer, Loader, Message } from 'semantic-ui-react';
-import { isEqual } from 'lodash';
-import { defineMessages, injectIntl } from 'react-intl';
-import { UniversalLink } from '@plone/volto/components';
-import cx from 'classnames';
-
-import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
-import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers';
-import { createContent } from '@plone/volto/actions';
-import { Icon, SidebarPortal } from '@plone/volto/components';
-
-import clearSVG from '@plone/volto/icons/clear.svg';
-
-import Data from '@plone/volto/components/manage/Blocks/HeroImageLeft/Data';
-
-const messages = defineMessages({
-  title: {
-    id: 'Title',
-    defaultMessage: 'Title',
-  },
-  description: {
-    id: 'Description',
-    defaultMessage: 'Description',
-  },
-  placeholder: {
-    id: 'Upload a new image',
-    defaultMessage: 'Upload a new image',
-  },
-  image: {
-    id: 'Image',
-    defaultMessage: 'Image',
-  },
-  browse: {
-    id: 'Browse',
-    defaultMessage: 'Browse',
-  },
-  uploading: {
-    id: 'Uploading image',
-    defaultMessage: 'Uploading image',
-  },
-  buttonText: {
-    id: 'Button text',
-    defineMessage: 'Button text',
-  },
-});
-
-/**
- * Edit image block class.
- * @class Edit
- * @extends Component
- */
-class EditComponent extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    selected: PropTypes.bool.isRequired,
-    block: PropTypes.string.isRequired,
-    index: PropTypes.number.isRequired,
-    data: PropTypes.objectOf(PropTypes.any).isRequired,
-    content: PropTypes.objectOf(PropTypes.any),
-    request: PropTypes.shape({
-      loading: PropTypes.bool,
-      loaded: PropTypes.bool,
-    }).isRequired,
-    pathname: PropTypes.string.isRequired,
-    onChangeBlock: PropTypes.func.isRequired,
-    onSelectBlock: PropTypes.func.isRequired,
-    onDeleteBlock: PropTypes.func.isRequired,
-    onFocusPreviousBlock: PropTypes.func.isRequired,
-    onFocusNextBlock: PropTypes.func.isRequired,
-    handleKeyDown: PropTypes.func.isRequired,
-    createContent: PropTypes.func.isRequired,
-    editable: PropTypes.bool,
-  };
-
-  /**
-   * Default properties
-   * @property {Object} defaultProps Default properties.
-   * @static
-   */
-  static defaultProps = {
-    editable: true,
-  };
-
-  /**
-   * Constructor
-   * @method constructor
-   * @param {Object} props Component properties
-   * @constructs WysiwygEditor
-   */
-  constructor(props) {
-    super(props);
-
-    this.onUploadImage = this.onUploadImage.bind(this);
-    this.state = {
-      uploading: false,
-    };
-
-    const { Map } = this.props.immutableLib;
-
-    if (!__SERVER__) {
-      const { DefaultDraftBlockRenderMap, EditorState } = props.draftJs;
-      const { stateFromHTML } = props.draftJsImportHtml;
-
-      const blockTitleRenderMap = Map({
-        unstyled: {
-          element: 'h1',
-        },
-      });
-
-      const blockDescriptionRenderMap = Map({
-        unstyled: {
-          element: 'div',
-        },
-      });
-
-      this.extendedBlockRenderMap = DefaultDraftBlockRenderMap.merge(
-        blockTitleRenderMap,
-      );
-
-      this.extendedDescripBlockRenderMap = DefaultDraftBlockRenderMap.merge(
-        blockDescriptionRenderMap,
-      );
-
-      let titleEditorState;
-      let descriptionEditorState;
-      if (props.data && props.data.title) {
-        titleEditorState = EditorState.createWithContent(
-          stateFromHTML(props.data.title),
-        );
-      } else {
-        titleEditorState = EditorState.createEmpty();
-      }
-      if (props.data && props.data.description) {
-        descriptionEditorState = EditorState.createWithContent(
-          stateFromHTML(props.data.description),
-        );
-      } else {
-        descriptionEditorState = EditorState.createEmpty();
-      }
-      this.state = {
-        uploading: false,
-        titleEditorState,
-        descriptionEditorState,
-        currentFocused: 'title',
-      };
-    }
-
-    this.onChangeTitle = this.onChangeTitle.bind(this);
-    this.onChangeDescription = this.onChangeDescription.bind(this);
-  }
-
-  /**
-   * Component did mount
-   * @method componentDidMount
-   * @returns {undefined}
-   */
-  componentDidMount() {
-    if (this.props.selected) {
-      this.titleEditor.focus();
-    }
-  }
-
-  /**
-   * Component will receive props
-   * @method componentWillReceiveProps
-   * @param {Object} nextProps Next properties
-   * @returns {undefined}
-   */
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (
-      this.props.request.loading &&
-      nextProps.request.loaded &&
-      this.state.uploading
-    ) {
-      this.setState({
-        uploading: false,
-      });
-      this.props.onChangeBlock(this.props.block, {
-        ...this.props.data,
-        url: nextProps.content['@id'],
-      });
-    }
-
-    const { EditorState } = this.props.draftJs;
-    const { stateFromHTML } = this.props.draftJsImportHtml;
-
-    if (
-      nextProps.data.title &&
-      this.props.data.title !== nextProps.data.title &&
-      !this.props.selected
-    ) {
-      const contentState = stateFromHTML(nextProps.data.title);
-      this.setState({
-        titleEditorState: nextProps.data.title
-          ? EditorState.createWithContent(contentState)
-          : EditorState.createEmpty(),
-      });
-    }
-
-    if (
-      nextProps.data.description &&
-      this.props.data.description !== nextProps.data.description &&
-      !this.props.selected
-    ) {
-      const contentState = stateFromHTML(nextProps.data.description);
-      this.setState({
-        descriptionEditorState: nextProps.data.description
-          ? EditorState.createWithContent(contentState)
-          : EditorState.createEmpty(),
-      });
-    }
-
-    if (nextProps.selected !== this.props.selected) {
-      if (this.state.currentFocused === 'title') {
-        this.titleEditor.focus();
-      } else {
-        this.descriptionEditor.focus();
-      }
-    }
-  }
-
-  /**
-   * @param {*} nextProps
-   * @param {*} nextState
-   * @returns {boolean}
-   * @memberof Edit
-   */
-  shouldComponentUpdate(nextProps) {
-    return this.props.selected || !isEqual(this.props.data, nextProps.data);
-  }
-
-  /**
-   * Change Title handler
-   * @method onChangeTitle
-   * @param {object} titleEditorState Editor state.
-   * @returns {undefined}
-   */
-  onChangeTitle(titleEditorState) {
-    this.setState({ titleEditorState }, () => {
-      this.props.onChangeBlock(this.props.block, {
-        ...this.props.data,
-        title: titleEditorState.getCurrentContent().getPlainText(),
-      });
-    });
-  }
-
-  /**
-   * Change Description handler
-   * @method onChangeDescription
-   * @param {object} descriptionEditorState Editor state.
-   * @returns {undefined}
-   */
-  onChangeDescription(descriptionEditorState) {
-    this.setState({ descriptionEditorState }, () => {
-      this.props.onChangeBlock(this.props.block, {
-        ...this.props.data,
-        description: descriptionEditorState.getCurrentContent().getPlainText(),
-      });
-    });
-  }
-
-  /**
-   * Upload image handler
-   * @method onUploadImage
-   * @returns {undefined}
-   */
-  onUploadImage({ target }) {
-    const file = target.files[0];
-    this.setState({
-      uploading: true,
-    });
-    readAsDataURL(file).then((data) => {
-      const fields = data.match(/^data:(.*);(.*),(.*)$/);
-      this.props.createContent(
-        getBaseUrl(this.props.pathname),
-        {
-          '@type': 'Image',
-          image: {
-            data: fields[3],
-            encoding: fields[2],
-            'content-type': fields[1],
-            filename: file.name,
-          },
-        },
-        this.props.block,
-      );
-    });
-  }
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    if (__SERVER__) {
-      return <div />;
-    }
-    const data = this.props.data;
-    const href = this.props.data.linkHref?.[0];
-    const { Editor } = this.props.draftJs;
-    const placeholder =
-      this.props.data.placeholder ||
-      this.props.intl.formatMessage(messages.placeholder);
-    return (
-      <div
-        className={cx('block hero', {
-          selected: this.props.selected,
-          'align-left': this.props.data.align === 'left',
-          'align-right': this.props.data.align === 'right',
-        })}
-      >
-        {this.props.selected && this.props.editable && !!this.props.data.url && (
-          <div className="toolbar">
-            <Button.Group>
-              <Button
-                icon
-                basic
-                onClick={() =>
-                  this.props.onChangeBlock(this.props.block, {
-                    ...this.props.data,
-                    url: '',
-                  })
-                }
-              >
-                <Icon name={clearSVG} size="24px" color="#e40166" />
-              </Button>
-            </Button.Group>
-          </div>
-        )}
-        <div className="block-inner-wrapper">
-          {this.props.data.url ? (
-            <img
-              className="hero-image"
-              src={`${flattenToAppURL(this.props.data.url)}/@@images/image`}
-              alt=""
-            />
-          ) : (
-            <div className="image-add">
-              <Message className="image-message">
-                {this.state.uploading && (
-                  <Dimmer active>
-                    <Loader indeterminate>
-                      {this.props.intl.formatMessage(messages.uploading)}
-                    </Loader>
-                  </Dimmer>
-                )}
-                <center>
-                  <h4>{this.props.intl.formatMessage(messages.image)}</h4>
-                  {this.props.editable && (
-                    <>
-                      <p>{placeholder}</p>
-                      <p>
-                        <label className="ui button file">
-                          {this.props.intl.formatMessage(messages.browse)}
-                          <input
-                            type="file"
-                            onChange={this.onUploadImage}
-                            style={{ display: 'none' }}
-                          />
-                        </label>
-                      </p>
-                    </>
-                  )}
-                </center>
-              </Message>
-            </div>
-          )}
-          <div className="hero-body">
-            <div className="hero-text">
-              <Editor
-                ref={(node) => {
-                  this.titleEditor = node;
-                }}
-                readOnly={!this.props.editable}
-                onChange={this.onChangeTitle}
-                editorState={this.state.titleEditorState}
-                blockRenderMap={this.extendedBlockRenderMap}
-                handleReturn={() => true}
-                placeholder={this.props.intl.formatMessage(messages.title)}
-                blockStyleFn={() => 'title-editor'}
-                onUpArrow={() => {
-                  const selectionState = this.state.titleEditorState.getSelection();
-                  const { titleEditorState } = this.state;
-                  if (
-                    titleEditorState
-                      .getCurrentContent()
-                      .getBlockMap()
-                      .first()
-                      .getKey() === selectionState.getFocusKey()
-                  ) {
-                    this.props.onFocusPreviousBlock(
-                      this.props.block,
-                      this.props.blockNode.current,
-                    );
-                  }
-                }}
-                onDownArrow={() => {
-                  const selectionState = this.state.titleEditorState.getSelection();
-                  const { titleEditorState } = this.state;
-                  if (
-                    titleEditorState
-                      .getCurrentContent()
-                      .getBlockMap()
-                      .last()
-                      .getKey() === selectionState.getFocusKey()
-                  ) {
-                    this.setState(() => ({ currentFocused: 'description' }));
-                    this.descriptionEditor.focus();
-                  }
-                }}
-              />
-              <Editor
-                ref={(node) => {
-                  this.descriptionEditor = node;
-                }}
-                readOnly={!this.props.editable}
-                onChange={this.onChangeDescription}
-                editorState={this.state.descriptionEditorState}
-                blockRenderMap={this.extendedDescripBlockRenderMap}
-                handleReturn={() => true}
-                placeholder={this.props.intl.formatMessage(
-                  messages.description,
-                )}
-                blockStyleFn={() => 'description-editor'}
-                onUpArrow={() => {
-                  const selectionState = this.state.descriptionEditorState.getSelection();
-                  const currentCursorPosition = selectionState.getStartOffset();
-
-                  if (currentCursorPosition === 0) {
-                    this.setState(() => ({ currentFocused: 'title' }));
-                    this.titleEditor.focus();
-                  }
-                }}
-                onDownArrow={() => {
-                  const selectionState = this.state.descriptionEditorState.getSelection();
-                  const { descriptionEditorState } = this.state;
-                  const currentCursorPosition = selectionState.getStartOffset();
-                  const blockLength = descriptionEditorState
-                    .getCurrentContent()
-                    .getFirstBlock()
-                    .getLength();
-
-                  if (currentCursorPosition === blockLength) {
-                    this.props.onFocusNextBlock(
-                      this.props.block,
-                      this.props.blockNode.current,
-                    );
-                  }
-                }}
-              />
-            </div>
-            {href && data.showButton && (
-              <UniversalLink
-                href={href?.['@id']}
-                target={data.openLinkInNewTab ? '_blank' : null}
-              >
-                <Button className={(cx('button'), data.buttonColor)}>
-                  {data.buttonText ||
-                    this.props.intl.formatMessage(messages.buttonText)}
-                </Button>
-              </UniversalLink>
-            )}
-          </div>
-        </div>
-        <SidebarPortal selected={this.props.selected}>
-          <Data {...this.props} />
-        </SidebarPortal>
-      </div>
-    );
-  }
-}
-
-const Edit = injectLazyLibs(['draftJs', 'immutableLib', 'draftJsImportHtml'])(
-  EditComponent,
-);
-
-export default compose(
-  injectIntl,
-  connect(
-    (state, ownProps) => ({
-      request: state.content.subrequests[ownProps.block] || {},
-      content: state.content.subrequests[ownProps.block]?.data,
-    }),
-    { createContent },
-  ),
-)(Edit);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/HeroImageLeft/View.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/HeroImageLeft/View.jsx
deleted file mode 100644
index 09aac3ab..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/HeroImageLeft/View.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * View image block.
- * @module components/manage/Blocks/Hero/View
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { UniversalLink } from '@plone/volto/components';
-import { useIntl, defineMessages } from 'react-intl';
-import { Button } from 'semantic-ui-react';
-import cx from 'classnames';
-
-/**
- * View image block class.
- * @class View
- * @extends Component
- */
-const messages = defineMessages({
-  PleaseChooseContent: {
-    id: 'Please choose an existing content as source for this element',
-    defaultMessage:
-      'Please choose an existing content as source for this element',
-  },
-  moreInfo: {
-    id: 'moreInfo',
-    defaultMessage: 'More info',
-  },
-  source: {
-    id: 'Source',
-    defaultMessage: 'Source',
-  },
-  ButtonText: {
-    id: 'Continue reading',
-    defaultMessage: 'Continue reading',
-  },
-});
-
-const View = (props) => {
-  const { className, data } = props;
-  const intl = useIntl();
-  const href = data.linkHref?.[0];
-  return (
-    <div
-      className={cx('block hero', className, {
-        'align-left': data.align === 'left',
-        'align-right': data.align === 'right',
-      })}
-    >
-      <div className="block-inner-wrapper">
-        {data.url && (
-          <img
-            src={`${flattenToAppURL(data.url)}/@@images/image`}
-            alt=""
-            className="hero-image"
-            loading="lazy"
-          />
-        )}
-        <div className="hero-body">
-          <div className="hero-text">
-            {data.title && <h1>{data.title}</h1>}
-            {data.description && <p>{data.description}</p>}
-          </div>
-          {href && data.showButton && (
-            <UniversalLink
-              href={href['@id']}
-              target={data.openLinkInNewTab ? '_blank' : null}
-            >
-              <Button className={(cx('button'), data.buttonColor)}>
-                {data.buttonText || intl.formatMessage(messages.ButtonText)}
-              </Button>
-            </UniversalLink>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-/**
- * Property types.
- * @property {Object} propTypes Property types.
- * @static
- */
-View.propTypes = {
-  data: PropTypes.objectOf(PropTypes.any).isRequired,
-};
-
-export default View;
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Image/Edit.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Image/Edit.jsx
deleted file mode 100644
index 81ce0e43..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Image/Edit.jsx
+++ /dev/null
@@ -1,431 +0,0 @@
-/**
- * Edit image block.
- * @module components/manage/Blocks/Image/Edit
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-import { readAsDataURL } from 'promise-file-reader';
-import { Button, Dimmer, Input, Loader, Message } from 'semantic-ui-react';
-import { defineMessages, injectIntl } from 'react-intl';
-import loadable from '@loadable/component';
-import cx from 'classnames';
-import { isEqual } from 'lodash';
-
-import {
-  Icon,
-  ImageSidebar,
-  SidebarPortal,
-  UniversalLink,
-} from '@plone/volto/components';
-import { withBlockExtensions } from '@plone/volto/helpers';
-import { createContent } from '@plone/volto/actions';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  isInternalURL,
-} from '@plone/volto/helpers';
-
-import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg';
-import clearSVG from '@plone/volto/icons/clear.svg';
-import navTreeSVG from '@plone/volto/icons/nav.svg';
-import aheadSVG from '@plone/volto/icons/ahead.svg';
-import uploadSVG from '@plone/volto/icons/upload.svg';
-
-const Dropzone = loadable(() => import('react-dropzone'));
-
-const messages = defineMessages({
-  ImageBlockInputPlaceholder: {
-    id: 'Browse the site, drop an image, or type an URL',
-    defaultMessage: 'Browse the site, drop an image, or type an URL',
-  },
-  uploadingImage: {
-    id: 'Uploading image',
-    defaultMessage: 'Uploading image',
-  },
-  credits: {
-    id: 'Credits',
-    defaultMessage: 'Credits',
-  },
-  creditMessage: {
-    id: 'Plone Foundation',
-    defaultMessage: 'Plone Foundation',
-  },
-});
-
-/**
- * Edit image block class.
- * @class Edit
- * @extends Component
- */
-class Edit extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    selected: PropTypes.bool.isRequired,
-    block: PropTypes.string.isRequired,
-    index: PropTypes.number.isRequired,
-    data: PropTypes.objectOf(PropTypes.any).isRequired,
-    content: PropTypes.objectOf(PropTypes.any).isRequired,
-    request: PropTypes.shape({
-      loading: PropTypes.bool,
-      loaded: PropTypes.bool,
-    }).isRequired,
-    pathname: PropTypes.string.isRequired,
-    onChangeBlock: PropTypes.func.isRequired,
-    onSelectBlock: PropTypes.func.isRequired,
-    onDeleteBlock: PropTypes.func.isRequired,
-    onFocusPreviousBlock: PropTypes.func.isRequired,
-    onFocusNextBlock: PropTypes.func.isRequired,
-    handleKeyDown: PropTypes.func.isRequired,
-    createContent: PropTypes.func.isRequired,
-    openObjectBrowser: PropTypes.func.isRequired,
-  };
-
-  state = {
-    uploading: false,
-    url: '',
-    dragging: false,
-  };
-
-  /**
-   * Component will receive props
-   * @method componentWillReceiveProps
-   * @param {Object} nextProps Next properties
-   * @returns {undefined}
-   */
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (
-      this.props.request.loading &&
-      nextProps.request.loaded &&
-      this.state.uploading
-    ) {
-      this.setState({
-        uploading: false,
-      });
-      this.props.onChangeBlock(this.props.block, {
-        ...this.props.data,
-        url: nextProps.content['@id'],
-        alt: '',
-      });
-    }
-  }
-
-  /**
-   * @param {*} nextProps
-   * @returns {boolean}
-   * @memberof Edit
-   */
-  shouldComponentUpdate(nextProps) {
-    return (
-      this.props.selected ||
-      nextProps.selected ||
-      !isEqual(this.props.data, nextProps.data)
-    );
-  }
-
-  /**
-   * Upload image handler (not used), but useful in case that we want a button
-   * not powered by react-dropzone
-   * @method onUploadImage
-   * @returns {undefined}
-   */
-  onUploadImage = (e) => {
-    e.stopPropagation();
-    const file = e.target.files[0];
-    this.setState({
-      uploading: true,
-    });
-    readAsDataURL(file).then((data) => {
-      const fields = data.match(/^data:(.*);(.*),(.*)$/);
-      this.props.createContent(
-        getBaseUrl(this.props.pathname),
-        {
-          '@type': 'Image',
-          title: file.name,
-          image: {
-            data: fields[3],
-            encoding: fields[2],
-            'content-type': fields[1],
-            filename: file.name,
-          },
-        },
-        this.props.block,
-      );
-    });
-  };
-
-  /**
-   * Change url handler
-   * @method onChangeUrl
-   * @param {Object} target Target object
-   * @returns {undefined}
-   */
-  onChangeUrl = ({ target }) => {
-    this.setState({
-      url: target.value,
-    });
-  };
-
-  /**
-   * Submit url handler
-   * @method onSubmitUrl
-   * @param {object} e Event
-   * @returns {undefined}
-   */
-  onSubmitUrl = () => {
-    this.props.onChangeBlock(this.props.block, {
-      ...this.props.data,
-      url: flattenToAppURL(this.state.url),
-    });
-  };
-
-  /**
-   * Drop handler
-   * @method onDrop
-   * @param {array} files File objects
-   * @returns {undefined}
-   */
-  onDrop = (file) => {
-    this.setState({
-      uploading: true,
-    });
-
-    readAsDataURL(file[0]).then((data) => {
-      const fields = data.match(/^data:(.*);(.*),(.*)$/);
-      this.props.createContent(
-        getBaseUrl(this.props.pathname),
-        {
-          '@type': 'Image',
-          title: file[0].name,
-          image: {
-            data: fields[3],
-            encoding: fields[2],
-            'content-type': fields[1],
-            filename: file[0].name,
-          },
-        },
-        this.props.block,
-      );
-    });
-  };
-
-  /**
-   * Keydown handler on Variant Menu Form
-   * This is required since the ENTER key is already mapped to a onKeyDown
-   * event and needs to be overriden with a child onKeyDown.
-   * @method onKeyDownVariantMenuForm
-   * @param {Object} e Event object
-   * @returns {undefined}
-   */
-  onKeyDownVariantMenuForm = (e) => {
-    if (e.key === 'Enter') {
-      e.preventDefault();
-      e.stopPropagation();
-      this.onSubmitUrl();
-    } else if (e.key === 'Escape') {
-      e.preventDefault();
-      e.stopPropagation();
-      // TODO: Do something on ESC key
-    }
-  };
-  onDragEnter = () => {
-    this.setState({ dragging: true });
-  };
-  onDragLeave = () => {
-    this.setState({ dragging: false });
-  };
-
-  node = React.createRef();
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const { data } = this.props;
-    const placeholder =
-      this.props.data.placeholder ||
-      this.props.intl.formatMessage(messages.ImageBlockInputPlaceholder);
-    const creditHref = data?.linkTo?.[0]?.['@id'] || '';
-    return (
-      <div
-        className={cx(
-          'block image align',
-          {
-            center: !Boolean(data.align),
-          },
-          data.align,
-          {
-            large: data.size === 'l',
-            medium: data.size === 'm',
-            small: data.size === 's',
-          },
-        )}
-      >
-        {data.url ? (
-          <figure
-            className={cx('figure', data.align, {
-              large: data.size === 'l',
-              medium: data.size === 'm',
-              small: data.size === 's',
-            })}
-          >
-            <img
-              src={
-                isInternalURL(data.url)
-                  ? // Backwards compat in the case that the block is storing the full server URL
-                    (() => {
-                      if (data.size === 'l')
-                        return `${flattenToAppURL(data.url)}/@@images/image`;
-                      if (data.size === 'm')
-                        return `${flattenToAppURL(
-                          data.url,
-                        )}/@@images/image/preview`;
-                      if (data.size === 's')
-                        return `${flattenToAppURL(
-                          data.url,
-                        )}/@@images/image/mini`;
-                      return `${flattenToAppURL(data.url)}/@@images/image`;
-                    })()
-                  : data.url
-              }
-              alt={data.alt || ''}
-              loading="lazy"
-            />
-            <figcaption className="figure-caption">
-              <div className="title">{data.title}</div>
-              <div className="credits">
-                Credit:{' '}
-                <UniversalLink href={creditHref || '/imprint'}>
-                  {'© '}
-                  {data.credits ||
-                    this.props.intl.formatMessage(messages.creditMessage)}
-                </UniversalLink>
-              </div>
-            </figcaption>
-          </figure>
-        ) : (
-          <div>
-            {this.props.editable && (
-              <Dropzone
-                noClick
-                onDrop={this.onDrop}
-                onDragEnter={this.onDragEnter}
-                onDragLeave={this.onDragLeave}
-                className="dropzone"
-              >
-                {({ getRootProps, getInputProps }) => (
-                  <div {...getRootProps()}>
-                    <Message>
-                      {this.state.dragging && <Dimmer active></Dimmer>}
-                      {this.state.uploading && (
-                        <Dimmer active>
-                          <Loader indeterminate>
-                            {this.props.intl.formatMessage(
-                              messages.uploadingImage,
-                            )}
-                          </Loader>
-                        </Dimmer>
-                      )}
-                      <div className="no-image-wrapper">
-                        <img src={imageBlockSVG} alt="" />
-                        <div className="toolbar-inner">
-                          <Button.Group>
-                            <Button
-                              basic
-                              icon
-                              onClick={(e) => {
-                                e.stopPropagation();
-                                e.preventDefault();
-                                this.props.openObjectBrowser();
-                              }}
-                            >
-                              <Icon name={navTreeSVG} size="24px" />
-                            </Button>
-                          </Button.Group>
-                          <Button.Group>
-                            <label className="ui button basic icon">
-                              <Icon name={uploadSVG} size="24px" />
-                              <input
-                                {...getInputProps({
-                                  type: 'file',
-                                  onChange: this.onUploadImage,
-                                  style: { display: 'none' },
-                                })}
-                              />
-                            </label>
-                          </Button.Group>
-                          <Input
-                            onKeyDown={this.onKeyDownVariantMenuForm}
-                            onChange={this.onChangeUrl}
-                            placeholder={placeholder}
-                            value={this.state.url}
-                            onClick={(e) => {
-                              e.target.focus();
-                            }}
-                            onFocus={(e) => {
-                              this.props.onSelectBlock(this.props.id);
-                            }}
-                          />
-                          {this.state.url && (
-                            <Button.Group>
-                              <Button
-                                basic
-                                className="cancel"
-                                onClick={(e) => {
-                                  e.stopPropagation();
-                                  this.setState({ url: '' });
-                                }}
-                              >
-                                <Icon name={clearSVG} size="30px" />
-                              </Button>
-                            </Button.Group>
-                          )}
-                          <Button.Group>
-                            <Button
-                              basic
-                              primary
-                              disabled={!this.state.url}
-                              onClick={(e) => {
-                                e.stopPropagation();
-                                this.onSubmitUrl();
-                              }}
-                            >
-                              <Icon name={aheadSVG} size="30px" />
-                            </Button>
-                          </Button.Group>
-                        </div>
-                      </div>
-                    </Message>
-                  </div>
-                )}
-              </Dropzone>
-            )}
-          </div>
-        )}
-        <SidebarPortal selected={this.props.selected}>
-          <ImageSidebar {...this.props} />
-        </SidebarPortal>
-      </div>
-    );
-  }
-}
-
-export default compose(
-  injectIntl,
-  withBlockExtensions,
-  connect(
-    (state, ownProps) => ({
-      request: state.content.subrequests[ownProps.block] || {},
-      content: state.content.subrequests[ownProps.block]?.data,
-    }),
-    { createContent },
-  ),
-)(Edit);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Image/View.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Image/View.jsx
deleted file mode 100644
index dfaf8287..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Image/View.jsx
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * View image block.
- * @module components/manage/Blocks/Image/View
- */
-
-import PropTypes from 'prop-types';
-import { UniversalLink } from '@plone/volto/components';
-import cx from 'classnames';
-import { withBlockExtensions } from '@plone/volto/helpers';
-import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers';
-import { useIntl, defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  credits: {
-    id: 'Credits',
-    defaultMessage: 'Credits',
-  },
-  creditMessage: {
-    id: 'Plone Foundation',
-    defaultMessage: 'Plone Foundation',
-  },
-});
-
-/**
- * View image block class.
- * @class View
- * @extends Component
- */
-export const View = (props) => {
-  const { className, data, detached } = props;
-  const href = data?.href?.[0]?.['@id'] || '';
-  const creditHref = data?.linkTo?.[0]?.['@id'] || '';
-  const intl = useIntl();
-
-  return (
-    <div
-      className={cx(
-        'block image align',
-        className,
-        {
-          center: !Boolean(data.align),
-          detached,
-        },
-        data.align,
-        {
-          large: data.size === 'l',
-          medium: data.size === 'm',
-          small: data.size === 's',
-        },
-      )}
-    >
-      {data.url && (
-        <>
-          {(() => {
-            const image = (
-              <figure
-                className={cx('figure', data.align, {
-                  large: data.size === 'l',
-                  medium: data.size === 'm',
-                  small: data.size === 's',
-                })}
-              >
-                <img
-                  src={
-                    isInternalURL(data.url)
-                      ? // Backwards compat in the case that the block is storing the full server URL
-                        (() => {
-                          if (data.size === 'l')
-                            return `${flattenToAppURL(
-                              data.url,
-                            )}/@@images/image`;
-                          if (data.size === 'm')
-                            return `${flattenToAppURL(
-                              data.url,
-                            )}/@@images/image/preview`;
-                          if (data.size === 's')
-                            return `${flattenToAppURL(
-                              data.url,
-                            )}/@@images/image/mini`;
-                          return `${flattenToAppURL(data.url)}/@@images/image`;
-                        })()
-                      : data.url
-                  }
-                  alt={data.alt || ''}
-                  loading="lazy"
-                />
-                <figcaption className="figure-caption">
-                  <div className="title">{data.title}</div>
-                  <div className="credits">
-                    Credit:{' '}
-                    <UniversalLink href={creditHref || '/imprint'}>
-                      {'© '}
-                      {data.credits ||
-                        intl.formatMessage(messages.creditMessage)}
-                    </UniversalLink>
-                  </div>
-                </figcaption>
-              </figure>
-            );
-            if (href) {
-              return (
-                <UniversalLink
-                  href={href}
-                  openLinkInNewTab={data.openLinkInNewTab}
-                >
-                  {image}
-                </UniversalLink>
-              );
-            } else {
-              return image;
-            }
-          })()}
-        </>
-      )}
-    </div>
-  );
-};
-
-/**
- * Property types.
- * @property {Object} propTypes Property types.
- * @static
- */
-View.propTypes = {
-  data: PropTypes.objectOf(PropTypes.any).isRequired,
-};
-
-export default withBlockExtensions(View);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx
deleted file mode 100644
index 1cae5cc9..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import React, { createRef } from 'react';
-import { FormattedMessage, injectIntl } from 'react-intl';
-import { Pagination, Dimmer, Loader } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
-import config from '@plone/volto/registry';
-import withQuerystringResults from '@plone/volto/components/manage/Blocks/Listing/withQuerystringResults';
-
-import paginationLeftSVG from '@plone/volto/icons/left-key.svg';
-import paginationRightSVG from '@plone/volto/icons/right-key.svg';
-
-const ListingBody = withQuerystringResults((props) => {
-  const {
-    data = {},
-    isEditMode,
-    listingItems,
-    totalPages,
-    onPaginationChange,
-    variation,
-    currentPage,
-    prevBatch,
-    nextBatch,
-    isFolderContentsListing,
-    hasLoaded,
-  } = props;
-
-  let ListingBodyTemplate;
-  // Legacy support if template is present
-  const variations = config.blocks?.blocksConfig['listing']?.variations || [];
-  const defaultVariation = variations.filter((item) => item.isDefault)?.[0];
-
-  if (data.template && !data.variation) {
-    const legacyTemplateConfig = variations.find(
-      (item) => item.id === data.template,
-    );
-    ListingBodyTemplate = legacyTemplateConfig.template;
-  } else {
-    ListingBodyTemplate =
-      variation?.template ?? defaultVariation?.template ?? null;
-  }
-
-  const listingRef = createRef();
-
-  return listingItems?.length > 0 ? (
-    <div className="listing-wrapper" ref={listingRef}>
-      <ListingBodyTemplate
-        items={listingItems}
-        isEditMode={isEditMode}
-        {...data}
-        {...variation}
-      />
-      {totalPages > 1 && (
-        <div className="pagination-wrapper">
-          <Pagination
-            activePage={currentPage}
-            totalPages={totalPages}
-            onPageChange={(e, { activePage }) => {
-              !isEditMode &&
-                listingRef.current.scrollIntoView({ behavior: 'smooth' });
-              onPaginationChange(e, { activePage });
-            }}
-            firstItem={null}
-            lastItem={null}
-            prevItem={{
-              content: <Icon name={paginationLeftSVG} size="18px" />,
-              icon: true,
-              'aria-disabled': !prevBatch,
-              className: !prevBatch ? 'disabled' : null,
-            }}
-            nextItem={{
-              content: <Icon name={paginationRightSVG} size="18px" />,
-              icon: true,
-              'aria-disabled': !nextBatch,
-              className: !nextBatch ? 'disabled' : null,
-            }}
-          />
-        </div>
-      )}
-    </div>
-  ) : isEditMode ? (
-    <div className="listing message" ref={listingRef}>
-      {isFolderContentsListing && (
-        <FormattedMessage
-          id="No items found in this container."
-          defaultMessage="No items found in this container."
-        />
-      )}
-      {hasLoaded && (
-        <FormattedMessage
-          id="No results found."
-          defaultMessage="No results found."
-        />
-      )}
-      <Dimmer active={!hasLoaded} inverted>
-        <Loader indeterminate size="small">
-          <FormattedMessage id="loading" defaultMessage="Loading" />
-        </Loader>
-      </Dimmer>
-    </div>
-  ) : (
-    <div style={{ textAlign: 'center' }}>
-      {hasLoaded && (
-        <FormattedMessage
-          id="No results found."
-          defaultMessage="No results found."
-        />
-      )}
-      <Dimmer active={!hasLoaded} inverted>
-        <Loader indeterminate size="small">
-          <FormattedMessage id="loading" defaultMessage="Loading" />
-        </Loader>
-      </Dimmer>
-    </div>
-  );
-});
-
-export default injectIntl(ListingBody);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Listing/SummaryTemplate.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Listing/SummaryTemplate.jsx
deleted file mode 100644
index 75e7e8d4..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Listing/SummaryTemplate.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { ConditionalLink, Component } from '@plone/volto/components';
-import { flattenToAppURL } from '@plone/volto/helpers';
-
-import { isInternalURL } from '@plone/volto/helpers/Url/Url';
-
-const SummaryTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
-  let link = null;
-  let href = linkHref?.[0]?.['@id'] || '';
-
-  if (isInternalURL(href)) {
-    link = (
-      <ConditionalLink to={flattenToAppURL(href)} condition={!isEditMode}>
-        {linkTitle || href}
-      </ConditionalLink>
-    );
-  } else if (href) {
-    link = <a href={href}>{linkTitle || href}</a>;
-  }
-
-  return (
-    <>
-      <div className="items">
-        {items.map((item) => (
-          <div className="listing-item" key={item['@id']}>
-            <div className="image-wrapper">
-              <Component
-                className="listing-image"
-                componentName="PreviewImage"
-                item={item}
-                alt=""
-              />
-            </div>
-            <div className="listing-body">
-              <h3>
-                <ConditionalLink item={item} condition={!isEditMode}>
-                  {item.title ? item.title : item.id}
-                </ConditionalLink>
-              </h3>
-              <p>{item.description}</p>
-            </div>
-          </div>
-        ))}
-      </div>
-
-      {link && <div className="footer">{link}</div>}
-    </>
-  );
-};
-
-SummaryTemplate.propTypes = {
-  items: PropTypes.arrayOf(PropTypes.any).isRequired,
-  linkMore: PropTypes.any,
-  isEditMode: PropTypes.bool,
-};
-
-export default SummaryTemplate;
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Maps/View.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Maps/View.jsx
deleted file mode 100644
index 252e8f08..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Maps/View.jsx
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * View map block.
- * @module components/manage/Blocks/Maps/View
- */
-
-import React from 'react';
-import { injectIntl } from 'react-intl';
-import PropTypes from 'prop-types';
-import cx from 'classnames';
-import { compose } from 'redux';
-import { withBlockExtensions } from '@plone/volto/helpers';
-
-/**
- * View image block class.
- * @class View
- * @extends Component
- */
-
-const View = ({ data, intl }) => (
-  <div
-    className={cx(
-      'block maps align',
-      {
-        center: !Boolean(data.align),
-      },
-      data.align,
-    )}
-  >
-    <div className="maps-inner">
-      <iframe
-        title={data.title}
-        src={data.url}
-        className="google-map"
-        frameBorder="0"
-        allowFullScreen
-      />
-    </div>
-  </div>
-);
-
-/**
- * Property types.
- * @property {Object} propTypes Property types.
- * @static
- */
-View.propTypes = {
-  data: PropTypes.objectOf(PropTypes.any).isRequired,
-};
-
-export default compose(injectIntl, withBlockExtensions)(View);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Search/components/CheckboxFacet.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Search/components/CheckboxFacet.jsx
deleted file mode 100644
index dcb68d50..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Search/components/CheckboxFacet.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import { Checkbox, Header } from 'semantic-ui-react';
-import {
-  selectFacetSchemaEnhancer,
-  selectFacetStateToValue,
-  selectFacetValueToQuery,
-} from '@plone/volto/components/manage/Blocks/Search/components/base';
-
-/**
- * A facet that uses radio/checkboxes to provide an explicit list of values for
- * filtering
- */
-const CheckboxFacet = (props) => {
-  const { facet, choices, isMulti, onChange, value, isEditMode } = props;
-  const facetValue = value;
-
-  return (
-    <div className="checkbox-facet">
-      <Header as="h4">{facet.title ?? facet?.field?.label}</Header>
-      <div className="entries">
-        {choices.map(({ label, value }, i) => (
-          <div className="entry" key={value}>
-            <Checkbox
-              disabled={isEditMode}
-              label={label}
-              checked={
-                isMulti
-                  ? !!facetValue?.find((f) => f.value === value)
-                  : facetValue && facetValue.value === value
-              }
-              onChange={(e, { checked }) =>
-                onChange(
-                  facet.field.value,
-                  isMulti
-                    ? [
-                        ...facetValue
-                          .filter((f) => f.value !== value)
-                          .map((f) => f.value),
-                        ...(checked ? [value] : []),
-                      ]
-                    : checked
-                    ? value
-                    : null,
-                )
-              }
-            />
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-};
-
-CheckboxFacet.schemaEnhancer = selectFacetSchemaEnhancer;
-CheckboxFacet.stateToValue = selectFacetStateToValue;
-CheckboxFacet.valueToQuery = selectFacetValueToQuery;
-
-export default CheckboxFacet;
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/Body.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/Body.jsx
deleted file mode 100644
index 40e2ee9a..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/Body.jsx
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Body video block.
- * @module components/manage/Blocks/Video/Body
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
-import { Embed, Message } from 'semantic-ui-react';
-import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
-
-/**
- * Body video block class.
- * @class Body
- * @extends Component
- */
-const Body = ({ data, isEditMode }) => {
-  let placeholder = data.preview_image
-    ? isInternalURL(data.preview_image)
-      ? `${flattenToAppURL(data.preview_image)}/@@images/image`
-      : data.preview_image
-    : null;
-
-  let videoID = null;
-  let listID = null;
-
-  if (data.url) {
-    if (data.url.match('youtu')) {
-      if (data.url.match('list')) {
-        const matches = data.url.match(/^.*\?list=(.*)|^.*&list=(.*)$/);
-        listID = matches[1] || matches[2];
-      } else {
-        videoID = data.url.match(/.be\//)
-          ? data.url.match(/^.*\.be\/(.*)/)[1]
-          : data.url.match(/^.*\?v=(.*)$/)[1];
-      }
-
-      if (!placeholder) {
-        //load video preview image from youtube
-        placeholder =
-          'https://img.youtube.com/vi/' + videoID + '/sddefault.jpg';
-      }
-    } else if (data.url.match('vimeo')) {
-      videoID = data.url.match(/^.*\.com\/(.*)/)[1];
-      if (!placeholder) {
-        placeholder = 'https://vumbnail.com/' + videoID + '.jpg';
-      }
-    }
-  }
-
-  const ref = React.createRef();
-  const onKeyDown = (e) => {
-    if (e.nativeEvent.keyCode === 13) {
-      ref.current.handleClick();
-    }
-  };
-
-  const embedSettings = {
-    placeholder: placeholder,
-    icon: 'play',
-    defaultActive: false,
-    autoplay: false,
-    aspectRatio: '16:9',
-    tabIndex: 0,
-    onKeyPress: onKeyDown,
-    ref: ref,
-  };
-
-  return (
-    <>
-      {data.url.match('youtu') ? (
-        <>
-          {data.url.match('list') ? (
-            <Embed
-              url={`https://www.youtube.com/embed/videoseries?list=${listID}`}
-              {...embedSettings}
-            />
-          ) : (
-            <Embed id={videoID} source="youtube" {...embedSettings} />
-          )}
-        </>
-      ) : (
-        <>
-          {data.url.match('vimeo') ? (
-            <Embed id={videoID} source="vimeo" {...embedSettings} />
-          ) : (
-            <>
-              {data.url.match('.mp4') ? (
-                // eslint-disable-next-line jsx-a11y/media-has-caption
-                <video
-                  src={
-                    isInternalURL(data.url)
-                      ? data.url.includes('@@download')
-                        ? data.url
-                        : `${flattenToAppURL(data.url)}/@@download/file`
-                      : data.url
-                  }
-                  controls
-                  poster={placeholder}
-                  type="video/mp4"
-                />
-              ) : isEditMode ? (
-                <div>
-                  <Message>
-                    <center>
-                      <FormattedMessage
-                        id="Please enter a valid URL by deleting the block and adding a new video block."
-                        defaultMessage="Please enter a valid URL by deleting the block and adding a new video block."
-                      />
-                    </center>
-                  </Message>
-                </div>
-              ) : (
-                <div className="invalidVideoFormat" />
-              )}
-            </>
-          )}
-        </>
-      )}
-    </>
-  );
-};
-
-/**
- * Property types.
- * @property {Object} propTypes Property types.
- * @static
- */
-Body.propTypes = {
-  data: PropTypes.objectOf(PropTypes.any).isRequired,
-};
-
-export default Body;
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/Edit.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/Edit.jsx
deleted file mode 100644
index a6056eee..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/Edit.jsx
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Edit video block.
- * @module components/manage/Blocks/Title/Edit
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
-import { Button, Input, Message } from 'semantic-ui-react';
-import cx from 'classnames';
-import { isEqual } from 'lodash';
-
-import { Icon, SidebarPortal, VideoSidebar } from '@plone/volto/components';
-import clearSVG from '@plone/volto/icons/clear.svg';
-import aheadSVG from '@plone/volto/icons/ahead.svg';
-import videoBlockSVG from '@plone/volto/components/manage/Blocks/Video/block-video.svg';
-import Body from '@plone/volto/components/manage/Blocks/Video/Body';
-import { withBlockExtensions } from '@plone/volto/helpers';
-import { compose } from 'redux';
-import { UniversalLink } from '@plone/volto/components';
-
-const messages = defineMessages({
-  VideoFormDescription: {
-    id: 'Specify a youtube video or playlist url',
-    defaultMessage: 'Specify a youtube video or playlist url',
-  },
-  VideoBlockInputPlaceholder: {
-    id: 'Type a Video (YouTube, Vimeo or mp4) URL',
-    defaultMessage: 'Type a Video (YouTube, Vimeo or mp4) URL',
-  },
-  defaultCredits: {
-    id: '© Plone Foundation',
-    defaultMessage: '© Plone Foundation',
-  },
-});
-
-/**
- * Edit video block class.
- * @class Edit
- * @extends Component
- */
-class Edit extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    selected: PropTypes.bool.isRequired,
-    block: PropTypes.string.isRequired,
-    index: PropTypes.number.isRequired,
-    data: PropTypes.objectOf(PropTypes.any).isRequired,
-    onChangeBlock: PropTypes.func.isRequired,
-    onSelectBlock: PropTypes.func.isRequired,
-    onDeleteBlock: PropTypes.func.isRequired,
-    onFocusPreviousBlock: PropTypes.func.isRequired,
-    onFocusNextBlock: PropTypes.func.isRequired,
-    handleKeyDown: PropTypes.func.isRequired,
-  };
-
-  /**
-   * Constructor
-   * @method constructor
-   * @param {Object} props Component properties
-   * @constructs WysiwygEditor
-   */
-  constructor(props) {
-    super(props);
-
-    this.onChangeUrl = this.onChangeUrl.bind(this);
-    this.onSubmitUrl = this.onSubmitUrl.bind(this);
-    this.onKeyDownVariantMenuForm = this.onKeyDownVariantMenuForm.bind(this);
-    this.state = {
-      url: '',
-    };
-  }
-
-  /**
-   * Change url handler
-   * @method onChangeUrl
-   * @param {Object} target Target object
-   * @returns {undefined}
-   */
-  onChangeUrl({ target }) {
-    this.setState({
-      url: target.value,
-    });
-  }
-
-  /**
-   * @param {*} nextProps
-   * @returns {boolean}
-   * @memberof Edit
-   */
-  shouldComponentUpdate(nextProps) {
-    return (
-      this.props.selected ||
-      nextProps.selected ||
-      !isEqual(this.props.data, nextProps.data)
-    );
-  }
-
-  /**
-   * Submit url handler
-   * @method onSubmitUrl
-   * @returns {undefined}
-   */
-  onSubmitUrl() {
-    this.props.onChangeBlock(this.props.block, {
-      ...this.props.data,
-      url: this.state.url,
-    });
-  }
-
-  resetSubmitUrl = () => {
-    this.setState({
-      url: '',
-    });
-  };
-
-  /**
-   * Keydown handler on Variant Menu Form
-   * This is required since the ENTER key is already mapped to a onKeyDown
-   * event and needs to be overriden with a child onKeyDown.
-   * @method onKeyDownVariantMenuForm
-   * @param {Object} e Event object
-   * @returns {undefined}
-   */
-  onKeyDownVariantMenuForm(e) {
-    if (e.key === 'Enter') {
-      e.preventDefault();
-      e.stopPropagation();
-      this.onSubmitUrl();
-    } else if (e.key === 'Escape') {
-      e.preventDefault();
-      e.stopPropagation();
-      // TODO: Do something on ESC key
-    }
-  }
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const { data } = this.props;
-    const placeholder =
-      this.props.data.placeholder ||
-      this.props.intl.formatMessage(messages.VideoBlockInputPlaceholder);
-    const creditHref = data?.linkTo?.[0]?.['@id'] || '';
-    return (
-      <div
-        className={cx(
-          'block video align',
-          {
-            selected: this.props.selected,
-            center: !Boolean(this.props.data.align),
-          },
-          this.props.data.align,
-        )}
-      >
-        {data.url ? (
-          <>
-            {
-              <figure className="video-inner">
-                <Body data={this.props.data} isEditMode={true} />
-                <figcaption className="figure-caption">
-                  <div className="title">{this.props.data.title}</div>
-                  <div className="credits">
-                    Credit:{' '}
-                    <UniversalLink href={creditHref || '/imprint'}>
-                      {this.props.data.credits ||
-                        this.props.intl.formatMessage(messages.defaultCredits)}
-                    </UniversalLink>
-                  </div>
-                </figcaption>
-              </figure>
-            }
-          </>
-        ) : (
-          <Message>
-            <center>
-              <img src={videoBlockSVG} alt="" />
-              <div className="toolbar-inner">
-                <Input
-                  onKeyDown={this.onKeyDownVariantMenuForm}
-                  onChange={this.onChangeUrl}
-                  placeholder={placeholder}
-                  value={this.state.url}
-                  // Prevents propagation to the Dropzone and the opening
-                  // of the upload browser dialog
-                  onClick={(e) => e.stopPropagation()}
-                />
-                {this.state.url && (
-                  <Button.Group>
-                    <Button
-                      basic
-                      className="cancel"
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        this.setState({ url: '' });
-                      }}
-                    >
-                      <Icon name={clearSVG} size="30px" />
-                    </Button>
-                  </Button.Group>
-                )}
-                <Button.Group>
-                  <Button
-                    basic
-                    primary
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      this.onSubmitUrl();
-                    }}
-                  >
-                    <Icon name={aheadSVG} size="30px" />
-                  </Button>
-                </Button.Group>
-              </div>
-            </center>
-          </Message>
-        )}
-        <SidebarPortal selected={this.props.selected}>
-          <VideoSidebar {...this.props} resetSubmitUrl={this.resetSubmitUrl} />
-        </SidebarPortal>
-      </div>
-    );
-  }
-}
-
-export default compose(injectIntl, withBlockExtensions)(Edit);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/View.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/View.jsx
deleted file mode 100644
index 89a0a885..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/manage/Blocks/Video/View.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * View video block.
- * @module components/manage/Blocks/Video/View
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import Body from '@plone/volto/components/manage/Blocks/Video/Body';
-import { withBlockExtensions } from '@plone/volto/helpers';
-import cx from 'classnames';
-import { useIntl, defineMessages } from 'react-intl';
-import { UniversalLink } from '@plone/volto/components';
-
-const messages = defineMessages({
-  defaultCredits: {
-    id: '© Plone Foundation',
-    defaultMessage: '© Plone Foundation',
-  },
-});
-
-/**
- * View video block class.
- * @class View
- * @extends Component
- */
-const View = (props) => {
-  const { data, className } = props;
-  const intl = useIntl();
-
-  return (
-    <div
-      className={cx(
-        'block video align',
-        {
-          center: !Boolean(data.align),
-        },
-        data.align,
-        className,
-      )}
-    >
-      <figure className="video-inner">
-        <Body data={data} />
-        <figcaption className="figure-caption">
-          <div className="title">{data.title}</div>
-          <div className="credits">
-            Credit:{' '}
-            <UniversalLink href={data.creditHref || '/imprint'}>
-              {data.credits || intl.formatMessage(messages.defaultCredits)}
-            </UniversalLink>
-          </div>
-        </figcaption>
-      </figure>
-    </div>
-  );
-};
-
-/**
- * Property types.
- * @property {Object} propTypes Property types.
- * @static
- */
-View.propTypes = {
-  data: PropTypes.objectOf(PropTypes.any).isRequired,
-};
-
-export default withBlockExtensions(View);
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/helpers/Html/Html.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/helpers/Html/Html.jsx
deleted file mode 100644
index b210a02c..00000000
--- a/frontend/src/addons/volto-plonede/src/customizations/volto/helpers/Html/Html.jsx
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Html helper.
- * @module helpers/Html
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import Helmet from '@plone/volto/helpers/Helmet/Helmet';
-import serialize from 'serialize-javascript';
-import { join } from 'lodash';
-import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
-import { runtimeConfig } from '@plone/volto/runtime_config';
-import config from '@plone/volto/registry';
-
-const CRITICAL_CSS_TEMPLATE = `function alter() {
-  document.querySelectorAll("head link[rel='prefetch']").forEach(function(el) { el.rel = 'stylesheet'});
-}
-if (window.addEventListener) {
-  window.addEventListener('DOMContentLoaded', alter, false)
-} else {
-  window.onload=alter
-}`;
-
-export const loadReducers = (state = {}) => {
-  const { settings } = config;
-  return Object.assign(
-    {},
-    ...Object.keys(state).map((name) =>
-      settings.initialReducersBlacklist.includes(name)
-        ? {}
-        : { [name]: state[name] },
-    ),
-  );
-};
-
-/**
- * Html class.
- * Wrapper component containing HTML metadata and boilerplate tags.
- * Used in server-side code only to wrap the string output of the
- * rendered route component.
- *
- * The only thing this component doesn't (and can't) include is the
- * HTML doctype declaration, which is added to the rendered output
- * by the server.js file.
- *
- * Critical.css behaviour: when a file `public/critical.css` is present, the
- * loading of stylesheets is changed. The styles in critical.css are inlined in
- * the generated HTML, and the whole story needs to change completely: instead
- * of treating stylesheets as priority for rendering, we want to defer their
- * loading as much as possible. So we change the stylesheets to be prefetched
- * and we switch their rel back to stylesheets at document ready event.
- *
- * @function Html
- * @param {Object} props Component properties.
- * @param {Object} props.assets Assets to be rendered.
- * @param {Object} props.component Content to be rendered as child node.
- * @param {Object} props.store Store object.
- * @returns {string} Markup of the not found page.
- */
-
-/**
- * Html class.
- * @class Html
- * @extends Component
- */
-class Html extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    extractor: PropTypes.shape({
-      getLinkElements: PropTypes.func.isRequired,
-      getScriptElements: PropTypes.func.isRequired,
-      getStyleElements: PropTypes.func.isRequired,
-    }).isRequired,
-    markup: PropTypes.string.isRequired,
-    store: PropTypes.shape({
-      getState: PropTypes.func,
-    }).isRequired,
-  };
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const {
-      extractor,
-      markup,
-      store,
-      criticalCss,
-      apiPath,
-      publicURL,
-    } = this.props;
-    const head = Helmet.rewind();
-    const bodyClass = join(BodyClass.rewind(), ' ');
-    const htmlAttributes = head.htmlAttributes.toComponent();
-
-    return (
-      <html lang={htmlAttributes.lang}>
-        <head>
-          <meta charSet="utf-8" />
-          {head.base.toComponent()}
-          {head.title.toComponent()}
-          {head.meta.toComponent()}
-          {head.link.toComponent()}
-          {head.script.toComponent()}
-
-          <script
-            dangerouslySetInnerHTML={{
-              __html: `window.env = ${serialize({
-                ...runtimeConfig,
-                // Seamless mode requirement, the client need to know where the API is located
-                // if not set in the API_PATH
-                ...(apiPath && {
-                  apiPath,
-                }),
-                ...(publicURL && {
-                  publicURL,
-                }),
-              })};`,
-            }}
-          />
-
-          <link rel="icon" href="/favicon.ico" sizes="any" />
-          <link rel="icon" href="/icon.svg" type="image/svg+xml" />
-          <link
-            rel="apple-touch-icon"
-            sizes="180x180"
-            href="/apple-touch-icon.png"
-          />
-          <link rel="manifest" href="/site.webmanifest" />
-          <meta name="generator" content="Plone 6 - https://plone.org" />
-          <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <meta name="apple-mobile-web-app-capable" content="yes" />
-          {/* Google Search Console */}
-          <meta
-            name="google-site-verification"
-            content="n-pY8maozW9Wawz7UKaR0jvXy5HpKfz1YXnxas3H0hs"
-          />
-          {process.env.NODE_ENV === 'production' && criticalCss && (
-            <style
-              dangerouslySetInnerHTML={{ __html: this.props.criticalCss }}
-            />
-          )}
-          {/* Add the crossorigin while in development */}
-          {extractor.getLinkElements().map((elem) =>
-            React.cloneElement(elem, {
-              crossOrigin:
-                process.env.NODE_ENV === 'production' ? undefined : 'true',
-              rel: !criticalCss
-                ? elem.props.rel
-                : elem.props.as === 'style'
-                ? 'prefetch'
-                : elem.props.rel,
-            }),
-          )}
-          {/* Styles in development are loaded with Webpack's style-loader, in production,
-              they need to be static*/}
-          {process.env.NODE_ENV === 'production' ? (
-            criticalCss ? (
-              <>
-                <script
-                  dangerouslySetInnerHTML={{
-                    __html: CRITICAL_CSS_TEMPLATE,
-                  }}
-                ></script>
-                {extractor.getStyleElements().map((elem) => (
-                  <noscript>
-                    {React.cloneElement(elem, {
-                      rel: 'stylesheet',
-                      crossOrigin:
-                        process.env.NODE_ENV === 'production'
-                          ? undefined
-                          : 'true',
-                    })}
-                  </noscript>
-                ))}
-              </>
-            ) : (
-              extractor.getStyleElements()
-            )
-          ) : undefined}
-        </head>
-        <body className={bodyClass}>
-          <div role="navigation" aria-label="Toolbar" id="toolbar" />
-          <div id="main" dangerouslySetInnerHTML={{ __html: markup }} />
-          <div id="sidebar" />
-          <script
-            dangerouslySetInnerHTML={{
-              __html: `window.__data=${serialize(
-                loadReducers(store.getState()),
-              )};`,
-            }}
-            charSet="UTF-8"
-          />
-          {/* Add the crossorigin while in development */}
-          {this.props.extractScripts !== false
-            ? extractor.getScriptElements().map((elem) =>
-                React.cloneElement(elem, {
-                  crossOrigin:
-                    process.env.NODE_ENV === 'production' ? undefined : 'true',
-                }),
-              )
-            : ''}
-        </body>
-      </html>
-    );
-  }
-}
-
-export default Html;
diff --git a/frontend/src/addons/volto-plonede/src/index.js b/frontend/src/addons/volto-plonede/src/index.js
index 8f08000f..f70f1556 100644
--- a/frontend/src/addons/volto-plonede/src/index.js
+++ b/frontend/src/addons/volto-plonede/src/index.js
@@ -1,55 +1,5 @@
-import {
-  ButtonBlockSchemaEnhancer,
-  DefaultStylingSchemaEnhancer,
-  HeroBlockSchemaEnhancer,
-  ImageBlockSchemaEnhancer,
-  ListingBlockSchemaEnhancer,
-  SliderBlockSchemaEnhancer,
-  TeaserBlockSchemaEnhancer,
-  VideoBlockSchemaEnhancer,
-  EventTemplate,
-} from 'volto-plonede/components';
-import { defineMessages } from 'react-intl';
-import { composeSchema, getPreviousNextBlock } from '@plone/volto/helpers';
-import { SeparatorStyleEnhancer } from '@kitconcept/volto-separator-block/components/schema.js';
-import { gridTeaserDisableStylingSchema } from '@kitconcept/volto-blocks-grid/components/Teaser/schema';
-import cx from 'classnames';
-
-import TeaserViewBlock from '@plone/volto/components/manage/Blocks/Teaser/View';
-import TeaserEditBlock from '@plone/volto/components/manage/Blocks/Teaser/Edit';
-import TeaserBlockDefaultBody from '@plone/volto/components/manage/Blocks/Teaser/DefaultBody';
-import { TeaserSchema } from '@plone/volto/components/manage/Blocks/Teaser/schema';
-import { TeaserBlockDataAdapter } from '@plone/volto/components/manage/Blocks/Teaser/adapter';
-
-/* Quote  Block */
-import quoteSVG from '@plone/volto/icons/quote.svg';
-import QuoteBlockView from './components/manage/Blocks/volto-quote-block/View';
-import QuoteBlockEdit from './components/manage/Blocks/volto-quote-block/Edit';
-
-defineMessages({
-  Imprint: { id: 'Imprint', defaultMessage: 'Imprint' },
-  Accessibility: { id: 'Accessibility', defaultMessage: 'Accessibility' },
-  Contact: { id: 'Contact', defineMessage: 'Contact' },
-  'Site Map': { id: 'Site Map', defineMessage: 'Site Map' },
-  'Button text': { id: 'Button text', defaultMessage: 'Button text' },
-  EnableCookies: {
-    id: 'Enable {module} cookies',
-    defaultMessage: 'Enable {module} cookies',
-    values: {
-      module: <b>{module}</b>,
-    },
-  },
-  CustomizePrivacySettings: {
-    id: 'Customize your Privacy Settings',
-    defaultMessage: 'Customize your Privacy Settings',
-  },
-  Or: {
-    id: ', or ',
-    defaultMessage: ', or ',
-  },
-});
-
 const applyConfig = (config) => {
+  config.settings.DSGVOBanner.modules = ['youtube', 'google'];
   config.settings = {
     ...config.settings,
     supportedLanguages: ['de', 'en'],
@@ -59,286 +9,6 @@ const applyConfig = (config) => {
     matomoUrlBase: 'https://stats.plone.de/',
     enableFatMenu: false,
   };
-
-  /* Teaser  Block */
-  config.blocks.blocksConfig.teaser = {
-    ...config.blocks.blocksConfig.teaser,
-    schemaEnhancer: composeSchema(
-      TeaserBlockSchemaEnhancer,
-      DefaultStylingSchemaEnhancer,
-    ),
-    view: TeaserViewBlock,
-    edit: TeaserEditBlock,
-    blockSchema: TeaserSchema,
-    dataAdapter: TeaserBlockDataAdapter,
-    variations: [
-      {
-        id: 'default',
-        isDefault: true,
-        title: 'Default',
-        template: TeaserBlockDefaultBody,
-      },
-    ],
-  };
-
-  /* Button  Block */
-  config.blocks.blocksConfig.__button = {
-    ...config.blocks.blocksConfig.__button,
-    schemaEnhancer: composeSchema(
-      ButtonBlockSchemaEnhancer,
-      DefaultStylingSchemaEnhancer,
-    ),
-  };
-
-  /* Image  Block */
-  config.blocks.blocksConfig.image = {
-    ...config.blocks.blocksConfig.image,
-    schemaEnhancer: composeSchema(
-      ImageBlockSchemaEnhancer,
-      DefaultStylingSchemaEnhancer,
-    ),
-  };
-
-  /* Separator  Block */
-  config.blocks.blocksConfig.separator = {
-    ...config.blocks.blocksConfig.separator,
-    schemaEnhancer: composeSchema(
-      DefaultStylingSchemaEnhancer,
-      SeparatorStyleEnhancer,
-    ),
-  };
-
-  /* Heading  Block */
-  config.blocks.blocksConfig.heading = {
-    ...config.blocks.blocksConfig.heading,
-    show_alignment: true,
-    schemaEnhancer: DefaultStylingSchemaEnhancer,
-  };
-
-  /* Hero  Block */
-  config.blocks.blocksConfig.hero = {
-    ...config.blocks.blocksConfig.hero,
-    schemaEnhancer: composeSchema(
-      HeroBlockSchemaEnhancer,
-      DefaultStylingSchemaEnhancer,
-    ),
-  };
-
-  config.blocks.requiredBlocks = [];
-  config.settings = {
-    ...config.settings,
-    isMultilingual: false,
-    supportedLanguages: ['de'],
-    defaultLanguage: 'de',
-  };
-
-  /* Listing  Block */
-  config.blocks.blocksConfig.listing = {
-    ...config.blocks.blocksConfig.listing,
-    schemaEnhancer: composeSchema(
-      ListingBlockSchemaEnhancer,
-      DefaultStylingSchemaEnhancer,
-    ),
-  };
-
-  config.blocks.blocksConfig.listing.variations = [
-    ...config.blocks.blocksConfig.listing.variations,
-    {
-      id: 'events',
-      title: 'Events',
-      template: EventTemplate,
-    },
-  ];
-
-  /* Quote  Block */
-  config.blocks.blocksConfig.quote = {
-    id: 'quote',
-    title: 'Quote',
-    icon: quoteSVG,
-    group: 'text',
-    view: QuoteBlockView,
-    edit: QuoteBlockEdit,
-    blockHasOwnFocusManagement: true,
-    restricted: false,
-    mostUsed: false,
-    sidebarTab: 1,
-  };
-
-  /* Slider  Block */
-  config.blocks.blocksConfig.slider = {
-    ...config.blocks.blocksConfig.slider,
-    schemaEnhancer: composeSchema(
-      SliderBlockSchemaEnhancer,
-      DefaultStylingSchemaEnhancer,
-    ),
-  };
-
-  /* Teaser/Image  Grid  Block */
-  config.blocks.blocksConfig.teaserGrid = {
-    ...config.blocks.blocksConfig.teaserGrid,
-    schemaEnhancer: DefaultStylingSchemaEnhancer,
-  };
-
-  config.blocks.blocksConfig.imagesGrid = {
-    ...config.blocks.blocksConfig.imagesGrid,
-    schemaEnhancer: DefaultStylingSchemaEnhancer,
-  };
-
-  const EnhancedSlateViewComponent = config.blocks.blocksConfig.slate.view;
-  config.blocks.blocksConfig.__grid = {
-    ...config.blocks.blocksConfig.__grid,
-    schemaEnhancer: DefaultStylingSchemaEnhancer,
-    blocksConfig: {
-      ...config.blocks.blocksConfig,
-      slate: {
-        ...config.blocks.blocksConfig.slate,
-        // Slate in grids must have an extra wrapper with the `slate` className
-        view: (props) => {
-          return (
-            <div className="block slate">
-              <EnhancedSlateViewComponent {...props} />
-            </div>
-          );
-        },
-      },
-      teaser: {
-        ...config.blocks.blocksConfig.teaser,
-        schemaEnhancer: composeSchema(
-          gridTeaserDisableStylingSchema,
-          TeaserBlockSchemaEnhancer,
-          DefaultStylingSchemaEnhancer,
-        ),
-      },
-    },
-    restricted: true,
-  };
-
-  // NEW CORE GRID
-  config.blocks.blocksConfig.gridBlock = {
-    ...config.blocks.blocksConfig.gridBlock,
-    schemaEnhancer: DefaultStylingSchemaEnhancer,
-    blocksConfig: {
-      ...config.blocks.blocksConfig,
-      slate: {
-        ...config.blocks.blocksConfig.slate,
-        // Slate in grids must have an extra wrapper with the `slate` className
-        view: (props) => {
-          return (
-            <div className="block slate">
-              <EnhancedSlateViewComponent {...props} />
-            </div>
-          );
-        },
-      },
-      teaser: {
-        ...config.blocks.blocksConfig.teaser,
-        schemaEnhancer: composeSchema(
-          gridTeaserDisableStylingSchema,
-          TeaserBlockSchemaEnhancer,
-          DefaultStylingSchemaEnhancer,
-        ),
-      },
-    },
-  };
-
-  /* Video  Block */
-  config.blocks.blocksConfig.video = {
-    ...config.blocks.blocksConfig.video,
-    schemaEnhancer: composeSchema(
-      VideoBlockSchemaEnhancer,
-      DefaultStylingSchemaEnhancer,
-    ),
-  };
-
-  /* Introduction  Block */
-  config.blocks.blocksConfig.introduction = {
-    ...config.blocks.blocksConfig.introduction,
-    schemaEnhancer: composeSchema(DefaultStylingSchemaEnhancer),
-  };
-
-  /* Slate  Block */
-  config.blocks.blocksConfig.slate = {
-    ...config.blocks.blocksConfig.slate,
-    schemaEnhancer: composeSchema(DefaultStylingSchemaEnhancer),
-    // Slate in grids must have an extra wrapper with the `slate` className
-    view: (props) => {
-      const { className } = props;
-      return (
-        <div className={cx('block slate', className)}>
-          <EnhancedSlateViewComponent {...props} />
-        </div>
-      );
-    },
-  };
-
-  // Register custom StyleWrapper ClassNames
-  config.settings.styleClassNameExtenders = [
-    ({ block, content, data, classNames }) => {
-      let styles = [];
-      const [previousBlock, nextBlock] = getPreviousNextBlock({
-        content,
-        block,
-      });
-
-      // Inject a class depending of which type is the next block
-      if (nextBlock?.['@type']) {
-        styles.push(`next--is--${nextBlock['@type']}`);
-      }
-
-      // Inject a class depending if previous is the same type of block
-      if (data?.['@type'] === previousBlock?.['@type']) {
-        styles.push('previous--is--same--block-type');
-      }
-
-      // Inject a class depending if next is the same type of block
-      if (data?.['@type'] === nextBlock?.['@type']) {
-        styles.push('next--is--same--block-type');
-      }
-
-      // Inject a class depending if it's the first of block type
-      if (data?.['@type'] !== previousBlock?.['@type']) {
-        styles.push('is--first--of--block-type');
-      }
-
-      // Inject a class depending if it's the last of block type
-      if (data?.['@type'] !== nextBlock?.['@type']) {
-        styles.push('is--last--of--block-type');
-      }
-
-      // Given a StyleWrapper defined `backgroundColor` style
-      const previousColor =
-        previousBlock?.styles?.backgroundColor ?? 'transparent';
-      const currentColor = data?.styles?.backgroundColor ?? 'transparent';
-      const nextColor = nextBlock?.styles?.backgroundColor ?? 'transparent';
-
-      // Inject a class depending if the previous block has the same `backgroundColor`
-      if (currentColor === previousColor) {
-        styles.push('previous--has--same--backgroundColor');
-      } else if (currentColor !== previousColor) {
-        styles.push('previous--has--different--backgroundColor');
-      }
-
-      // Inject a class depending if the next block has the same `backgroundColor`
-      if (currentColor === nextColor) {
-        styles.push('next--has--same--backgroundColor');
-      } else if (currentColor !== nextColor) {
-        styles.push('next--has--different--backgroundColor');
-      }
-
-      return [...classNames, ...styles];
-    },
-  ];
-
-  config.settings.DSGVOBanner.modules = ['youtube', 'google'];
-
-  delete config.blocks.blocksConfig.text;
-  delete config.blocks.blocksConfig.description;
-  config.blocks.blocksConfig.__grid.gridAllowedBlocks = [
-    ...config.blocks.blocksConfig.__grid.gridAllowedBlocks,
-    '__button',
-    'quote',
-  ];
-
   return config;
 };
 
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 68d6442f..864c87c0 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1903,55 +1903,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@dnd-kit/accessibility@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "@dnd-kit/accessibility@npm:3.0.1"
-  dependencies:
-    tslib: ^2.0.0
-  peerDependencies:
-    react: ">=16.8.0"
-  checksum: 0afc2c0fce9a1c107453620ca0da1778f182d340e74ffbc6e369ef0ac8943cafb929d3a6c0891d9b915aa23b2b92137ff4fad958f43118466586d8129a3359d5
-  languageName: node
-  linkType: hard
-
-"@dnd-kit/core@npm:6.0.8":
-  version: 6.0.8
-  resolution: "@dnd-kit/core@npm:6.0.8"
-  dependencies:
-    "@dnd-kit/accessibility": ^3.0.0
-    "@dnd-kit/utilities": ^3.2.1
-    tslib: ^2.0.0
-  peerDependencies:
-    react: ">=16.8.0"
-    react-dom: ">=16.8.0"
-  checksum: abe48ff7395f84fd8c15e6c8b13da4df153dc1f1076096d783acd0c25539516c77e4854ea59be6621dde55739cb0df1d62924ad069df3267fe05ad90ef729b2f
-  languageName: node
-  linkType: hard
-
-"@dnd-kit/sortable@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@dnd-kit/sortable@npm:7.0.2"
-  dependencies:
-    "@dnd-kit/utilities": ^3.2.0
-    tslib: ^2.0.0
-  peerDependencies:
-    "@dnd-kit/core": ^6.0.7
-    react: ">=16.8.0"
-  checksum: 4ce705aceb15766a0deefe25a9d95a87e9413c3fb9088ea3eb0962e57f844895000117fcec7c0944a0d4ae4e1e889cfa69e3d3778164d4d23115fb1edb218283
-  languageName: node
-  linkType: hard
-
-"@dnd-kit/utilities@npm:^3.2.0, @dnd-kit/utilities@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "@dnd-kit/utilities@npm:3.2.1"
-  dependencies:
-    tslib: ^2.0.0
-  peerDependencies:
-    react: ">=16.8.0"
-  checksum: 038fd5cc1328bf4c9dca17cd48046e5a687bbf9d904c7197f851aab869ab52d9dee2734b2e255256fd6158245acd00063a23deed962c7673c0fadfbf061f04ca
-  languageName: node
-  linkType: hard
-
 "@eeacms/volto-accordion-block@npm:10.3.0":
   version: 10.3.0
   resolution: "@eeacms/volto-accordion-block@npm:10.3.0"
@@ -2697,18 +2648,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kitconcept/volto-blocks-grid@npm:8.0.3":
-  version: 8.0.3
-  resolution: "@kitconcept/volto-blocks-grid@npm:8.0.3"
-  dependencies:
-    "@dnd-kit/core": 6.0.8
-    "@dnd-kit/sortable": 7.0.2
-  peerDependencies:
-    "@plone/volto": ">=16.0.0"
-  checksum: 34446c00ea0a8c6077bd53e3a5fe8c970315d8fed87ebaba5f8994edd0fe5f76409baf5666d3e096ee52b5e0a216e9acf8d706a8e6cd30eea25b632e8bee3463
-  languageName: node
-  linkType: hard
-
 "@kitconcept/volto-button-block@npm:2.3.1":
   version: 2.3.1
   resolution: "@kitconcept/volto-button-block@npm:2.3.1"
@@ -12159,7 +12098,6 @@ __metadata:
   dependencies:
     "@eeacms/volto-accordion-block": 10.3.0
     "@eeacms/volto-matomo": 4.1.3
-    "@kitconcept/volto-blocks-grid": 8.0.3
     "@kitconcept/volto-button-block": 2.3.1
     "@kitconcept/volto-dsgvo-banner": 2.2.0
     "@kitconcept/volto-export": 1.1.0