diff --git a/.config/externals.js b/.config/externals.js
index c58ec8319..55756185c 100644
--- a/.config/externals.js
+++ b/.config/externals.js
@@ -22,27 +22,28 @@ const camelCaseDash = string => string.replace(
  */
 const externals = [
 	'api-fetch',
-    'blocks',
-    'components',
-    'compose',
-    'data',
-    'date',
-    'htmlEntities',
-    'hooks',
+	'block-editor',
+	'blocks',
+	'components',
+	'compose',
+	'data',
+	'date',
+	'htmlEntities',
+	'hooks',
 	'edit-post',
-    'element',
-    'editor',
+	'element',
+	'editor',
 	'i18n',
-    'plugins',
-    'viewport',
+	'plugins',
+	'viewport',
 	'ajax',
 	'codeEditor',
 ].reduce( ( externals, name ) => ( {
 	...externals,
 	[ `@wordpress/${ name }` ]: `wp.${ camelCaseDash( name ) }`,
 } ), {
-    wp: 'wp',
-    lodash: 'lodash', // WP loads lodash already.
+	wp: 'wp',
+	lodash: 'lodash', // WP loads lodash already.
 	stackable: 'stackable', // Our localized JS variable.
 	fetch: 'fetch', // Used in our debugger sidebar.
 } );
diff --git a/plugin.php b/plugin.php
index a9874b9a5..dfcd46f19 100644
--- a/plugin.php
+++ b/plugin.php
@@ -88,6 +88,7 @@ function stackable_php_requirement_notice() {
  * Block Initializer.
  */
 require_once( plugin_dir_path( __FILE__ ) . 'src/block/disabled-blocks.php' );
+require_once( plugin_dir_path( __FILE__ ) . 'src/init-deprecated.php' );
 require_once( plugin_dir_path( __FILE__ ) . 'src/init.php' );
 require_once( plugin_dir_path( __FILE__ ) . 'src/fonts.php' );
 require_once( plugin_dir_path( __FILE__ ) . 'src/block/blog-posts/index.php' );
diff --git a/src/block/accordion/deprecated.js b/src/block/accordion/deprecated.js
index 528981f0d..2600c22b1 100644
--- a/src/block/accordion/deprecated.js
+++ b/src/block/accordion/deprecated.js
@@ -2,7 +2,7 @@ import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
 import md5 from 'md5'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import SVGArrowIconV112 from './images/arrow-v1-12.svg'
 
 const deprecatedSchema_1_12 = {
diff --git a/src/block/accordion/edit.js b/src/block/accordion/edit.js
index 09b6c2f91..8e677300e 100644
--- a/src/block/accordion/edit.js
+++ b/src/block/accordion/edit.js
@@ -6,7 +6,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl, ToggleControl,
 } from '@wordpress/components'
diff --git a/src/block/accordion/save.js b/src/block/accordion/save.js
index 1f75279cf..a0204416f 100644
--- a/src/block/accordion/save.js
+++ b/src/block/accordion/save.js
@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ArrowIcon } from './index'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 // Accessibility: https://www.w3.org/TR/wai-aria-practices/examples/accordion/accordion.html
 const save = props => {
diff --git a/src/block/blockquote/deprecated.js b/src/block/blockquote/deprecated.js
index 7a2ff054d..9386d1f43 100644
--- a/src/block/blockquote/deprecated.js
+++ b/src/block/blockquote/deprecated.js
@@ -4,7 +4,7 @@ import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
 import { QUOTE_ICONS } from './quotes'
 import { QUOTE_ICONS_1_11 } from './deprecated-quotes'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_13 = props => {
 	const { className } = props
diff --git a/src/block/blockquote/edit-new.js b/src/block/blockquote/edit-new.js
index faf94f8a9..9496b3394 100644
--- a/src/block/blockquote/edit-new.js
+++ b/src/block/blockquote/edit-new.js
@@ -13,7 +13,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
diff --git a/src/block/blockquote/edit.js b/src/block/blockquote/edit.js
index faf94f8a9..9496b3394 100644
--- a/src/block/blockquote/edit.js
+++ b/src/block/blockquote/edit.js
@@ -13,7 +13,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
diff --git a/src/block/blockquote/save.js b/src/block/blockquote/save.js
index 808d5036e..ecf48e7e9 100644
--- a/src/block/blockquote/save.js
+++ b/src/block/blockquote/save.js
@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { QUOTE_ICONS } from './quotes'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props
diff --git a/src/block/blog-posts/edit.js b/src/block/blog-posts/edit.js
index 88ef6e9b4..df735dae8 100644
--- a/src/block/blog-posts/edit.js
+++ b/src/block/blog-posts/edit.js
@@ -1,7 +1,7 @@
 import './designs'
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { Component, Fragment } from '@wordpress/element'
 import { dateI18n, format } from '@wordpress/date'
 import { DesignPanelBody, ProControl, ProControlButton } from '@stackable/components/'
diff --git a/src/block/button/edit.js b/src/block/button/edit.js
index 8bfb508ee..8bbc11af8 100644
--- a/src/block/button/edit.js
+++ b/src/block/button/edit.js
@@ -1,6 +1,6 @@
 import {
 	BlockAlignmentToolbar, BlockControls, InspectorControls,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	ButtonEdit, PanelButtonSettings, ProControl, URLInputControl,
 } from '@stackable/components'
diff --git a/src/block/call-to-action/deprecated.js b/src/block/call-to-action/deprecated.js
index 0d7a0fa0e..73ba46b56 100644
--- a/src/block/call-to-action/deprecated.js
+++ b/src/block/call-to-action/deprecated.js
@@ -8,7 +8,7 @@ import {
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_12 = {
 	url: {
diff --git a/src/block/call-to-action/edit.js b/src/block/call-to-action/edit.js
index e2720aa84..4416d1d8c 100644
--- a/src/block/call-to-action/edit.js
+++ b/src/block/call-to-action/edit.js
@@ -3,7 +3,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl, ToggleControl,
 } from '@wordpress/components'
diff --git a/src/block/call-to-action/save.js b/src/block/call-to-action/save.js
index aca590a9c..5f4c657ae 100644
--- a/src/block/call-to-action/save.js
+++ b/src/block/call-to-action/save.js
@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props
diff --git a/src/block/card/deprecated.js b/src/block/card/deprecated.js
index 09b350c0f..a3d470e5c 100644
--- a/src/block/card/deprecated.js
+++ b/src/block/card/deprecated.js
@@ -7,7 +7,7 @@ import {
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_12 = props => {
 	const { className } = props
diff --git a/src/block/card/edit.js b/src/block/card/edit.js
index 936391e86..65495a8f7 100644
--- a/src/block/card/edit.js
+++ b/src/block/card/edit.js
@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	ButtonEdit, ColorPaletteControl, DesignPanelBody, ImageUploadPlaceholder, PanelButtonSettings, ProControl, ProControlButton, URLInputControl,
 } from '@stackable/components'
diff --git a/src/block/card/save.js b/src/block/card/save.js
index 3a35d0a9b..a4cfc1e4c 100644
--- a/src/block/card/save.js
+++ b/src/block/card/save.js
@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props
diff --git a/src/block/container/deprecated.js b/src/block/container/deprecated.js
index 78b023f6c..d4c1044c8 100644
--- a/src/block/container/deprecated.js
+++ b/src/block/container/deprecated.js
@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { InnerBlocks } from '@wordpress/editor'
+import { InnerBlocks } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	textColor: {
diff --git a/src/block/container/edit.js b/src/block/container/edit.js
index eba206470..c0a805d04 100644
--- a/src/block/container/edit.js
+++ b/src/block/container/edit.js
@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InnerBlocks, InspectorControls, PanelColorSettings,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	HorizontalAlignmentToolbar, PanelBackgroundSettings, ProControl, VerticalAlignmentToolbar,
 } from '@stackable/components'
diff --git a/src/block/container/save.js b/src/block/container/save.js
index 2974e2795..17ce0cf3c 100644
--- a/src/block/container/save.js
+++ b/src/block/container/save.js
@@ -1,6 +1,6 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
-import { InnerBlocks } from '@wordpress/editor'
+import { InnerBlocks } from '@wordpress/block-editor'
 
 const save = props => {
 	const {
diff --git a/src/block/count-up/deprecated.js b/src/block/count-up/deprecated.js
index 63fc1b700..d26bc12c2 100644
--- a/src/block/count-up/deprecated.js
+++ b/src/block/count-up/deprecated.js
@@ -3,7 +3,7 @@ import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { getFontFamily } from './deprecated-font'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 export const deprecatedSave_1_15_4 = props => {
 	const { className, attributes } = props
diff --git a/src/block/count-up/edit.js b/src/block/count-up/edit.js
index 8b083f328..78777ecf5 100644
--- a/src/block/count-up/edit.js
+++ b/src/block/count-up/edit.js
@@ -29,7 +29,7 @@ import { Fragment } from '@wordpress/element'
 import ImageDesignPlain from './images/plain.png'
 import ImageDesignPlain2 from './images/plain-2.png'
 import { range } from 'lodash'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import { showProNotice } from 'stackable'
 
 addFilter( 'stackable.count-up.edit.inspector.layout.before', 'stackable/count-up', ( output, props ) => {
diff --git a/src/block/count-up/save.js b/src/block/count-up/save.js
index cf244f68e..99b6cd8b1 100644
--- a/src/block/count-up/save.js
+++ b/src/block/count-up/save.js
@@ -6,7 +6,7 @@ import classnames from 'classnames'
 import { compose } from '@wordpress/compose'
 import createStyles from './style'
 import { Fragment } from '@wordpress/element'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className, attributes } = props
diff --git a/src/block/divider/edit.js b/src/block/divider/edit.js
index 633450162..0f7c2625d 100644
--- a/src/block/divider/edit.js
+++ b/src/block/divider/edit.js
@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { PanelBody, RangeControl } from '@wordpress/components'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
diff --git a/src/block/expand/deprecated.js b/src/block/expand/deprecated.js
index a0ffc7c92..3edacf01c 100644
--- a/src/block/expand/deprecated.js
+++ b/src/block/expand/deprecated.js
@@ -1,6 +1,6 @@
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	text: {
diff --git a/src/block/expand/edit.js b/src/block/expand/edit.js
index 6b19c01d5..e57c61a1f 100644
--- a/src/block/expand/edit.js
+++ b/src/block/expand/edit.js
@@ -1,4 +1,4 @@
-import { InspectorControls, RichText } from '@wordpress/editor'
+import { InspectorControls, RichText } from '@wordpress/block-editor'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
diff --git a/src/block/expand/save.js b/src/block/expand/save.js
index d63a361da..237f20103 100644
--- a/src/block/expand/save.js
+++ b/src/block/expand/save.js
@@ -1,6 +1,6 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props
diff --git a/src/block/feature-grid/deprecated.js b/src/block/feature-grid/deprecated.js
index 0fe154048..6cec43788 100644
--- a/src/block/feature-grid/deprecated.js
+++ b/src/block/feature-grid/deprecated.js
@@ -1,7 +1,7 @@
 import { descriptionPlaceholder, range } from '@stackable/util'
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_10 = props => {
 	const { attributes, className } = props
diff --git a/src/block/feature-grid/edit.js b/src/block/feature-grid/edit.js
index a0848e763..4984fc2d9 100644
--- a/src/block/feature-grid/edit.js
+++ b/src/block/feature-grid/edit.js
@@ -3,7 +3,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl,
 } from '@wordpress/components'
diff --git a/src/block/feature-grid/save.js b/src/block/feature-grid/save.js
index da6ebe4b6..92af60ef2 100644
--- a/src/block/feature-grid/save.js
+++ b/src/block/feature-grid/save.js
@@ -2,7 +2,7 @@ import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import striptags from 'striptags'
 
 const save = props => {
diff --git a/src/block/feature/deprecated.js b/src/block/feature/deprecated.js
index c498bbbdd..9eaef7416 100644
--- a/src/block/feature/deprecated.js
+++ b/src/block/feature/deprecated.js
@@ -6,7 +6,7 @@ import {
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	textColor: {
diff --git a/src/block/feature/edit.js b/src/block/feature/edit.js
index 72784e2f9..0ad750a0f 100644
--- a/src/block/feature/edit.js
+++ b/src/block/feature/edit.js
@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	ButtonEdit, DesignPanelBody, ImageUploadPlaceholder, PanelBackgroundSettings, PanelButtonSettings, ProControl, ProControlButton, URLInputControl,
 } from '@stackable/components'
diff --git a/src/block/feature/save.js b/src/block/feature/save.js
index 5a9f2894f..9e09a45f1 100644
--- a/src/block/feature/save.js
+++ b/src/block/feature/save.js
@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import striptags from 'striptags'
 
 const save = props => {
diff --git a/src/block/ghost-button/edit.js b/src/block/ghost-button/edit.js
index 25fce5f46..a54c218c1 100644
--- a/src/block/ghost-button/edit.js
+++ b/src/block/ghost-button/edit.js
@@ -1,6 +1,6 @@
 import {
 	BlockAlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText, URLInput,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	Dashicon, IconButton, PanelBody, RangeControl, SelectControl,
 } from '@wordpress/components'
diff --git a/src/block/ghost-button/save.js b/src/block/ghost-button/save.js
index c2ab458a5..37f9bda5b 100644
--- a/src/block/ghost-button/save.js
+++ b/src/block/ghost-button/save.js
@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props
diff --git a/src/block/header/deprecated.js b/src/block/header/deprecated.js
index cac509678..b6837c0ac 100644
--- a/src/block/header/deprecated.js
+++ b/src/block/header/deprecated.js
@@ -8,7 +8,7 @@ import {
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_12 = props => {
 	const { className } = props
diff --git a/src/block/header/edit.js b/src/block/header/edit.js
index 484cc8ad8..43e27a798 100644
--- a/src/block/header/edit.js
+++ b/src/block/header/edit.js
@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	ButtonEdit, DesignPanelBody, PanelBackgroundSettings, PanelButtonSettings, ProControl, ProControlButton, URLInputControl,
 } from '@stackable/components'
diff --git a/src/block/header/save.js b/src/block/header/save.js
index a12ac279f..eebbbe0d8 100644
--- a/src/block/header/save.js
+++ b/src/block/header/save.js
@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props
diff --git a/src/block/icon-list/deprecated.js b/src/block/icon-list/deprecated.js
index b250a6eca..b24841afe 100644
--- a/src/block/icon-list/deprecated.js
+++ b/src/block/icon-list/deprecated.js
@@ -2,7 +2,7 @@ import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { getIconSVGBase64 as deprecatedGetIconSVGBase64 } from './deprecated-util'
 import { getIconSVGBase64 } from './util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_15_4 = props => {
 	const { className } = props
diff --git a/src/block/icon-list/edit.js b/src/block/icon-list/edit.js
index 11bede7bb..f72bf779d 100644
--- a/src/block/icon-list/edit.js
+++ b/src/block/icon-list/edit.js
@@ -22,7 +22,7 @@ import classnames from 'classnames'
 import { compose } from '@wordpress/compose'
 import createStyles from './style'
 import { Fragment } from '@wordpress/element'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 addFilter( 'stackable.icon-list.edit.inspector.style.before', 'stackable/icon-list', ( output, props ) => {
 	const { setAttributes } = props
diff --git a/src/block/icon-list/save.js b/src/block/icon-list/save.js
index 0aea3fb39..50bfb9168 100644
--- a/src/block/icon-list/save.js
+++ b/src/block/icon-list/save.js
@@ -5,7 +5,7 @@ import classnames from 'classnames'
 import { compose } from '@wordpress/compose'
 import createStyles from './style'
 import { Fragment } from '@wordpress/element'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props
diff --git a/src/block/image-box/deprecated.js b/src/block/image-box/deprecated.js
index e4057a2e2..fc5d74804 100644
--- a/src/block/image-box/deprecated.js
+++ b/src/block/image-box/deprecated.js
@@ -2,7 +2,7 @@ import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { omit } from 'lodash'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	columns: {
diff --git a/src/block/image-box/edit.js b/src/block/image-box/edit.js
index 6732d4605..72f754c6b 100644
--- a/src/block/image-box/edit.js
+++ b/src/block/image-box/edit.js
@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	DesignPanelBody, ImageUploadPlaceholder, ProControl, ProControlButton, URLInputControl, VerticalAlignmentToolbar,
 } from '@stackable/components'
diff --git a/src/block/image-box/save.js b/src/block/image-box/save.js
index f161ea7d2..0495d16da 100644
--- a/src/block/image-box/save.js
+++ b/src/block/image-box/save.js
@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import SVGArrow from './images/arrow.svg'
 
 const save = props => {
diff --git a/src/block/notification/deprecated.js b/src/block/notification/deprecated.js
index 169470d63..cf4e71b2e 100644
--- a/src/block/notification/deprecated.js
+++ b/src/block/notification/deprecated.js
@@ -1,7 +1,7 @@
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
 import md5 from 'md5'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import SVGCloseIconV112 from './images/close-icon-v1-12.svg'
 
 const deprecatedSchema_1_12 = {
diff --git a/src/block/notification/edit.js b/src/block/notification/edit.js
index 0ff97cb2e..4e45ab9ca 100644
--- a/src/block/notification/edit.js
+++ b/src/block/notification/edit.js
@@ -1,6 +1,6 @@
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl, SelectControl, ToggleControl,
 } from '@wordpress/components'
diff --git a/src/block/notification/save.js b/src/block/notification/save.js
index 5feb4ac87..28532bea5 100644
--- a/src/block/notification/save.js
+++ b/src/block/notification/save.js
@@ -1,6 +1,6 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import SVGCloseIcon from './images/close-icon.svg'
 
 const save = props => {
diff --git a/src/block/number-box/deprecated.js b/src/block/number-box/deprecated.js
index 28b510d01..f3d0e75f2 100644
--- a/src/block/number-box/deprecated.js
+++ b/src/block/number-box/deprecated.js
@@ -3,7 +3,7 @@ import { omit, range } from 'lodash'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_15 = {
 	num1: {
diff --git a/src/block/number-box/edit.js b/src/block/number-box/edit.js
index e8476e877..b0fb5dcd0 100644
--- a/src/block/number-box/edit.js
+++ b/src/block/number-box/edit.js
@@ -24,7 +24,7 @@ import createStyles from './style'
 import { Fragment } from '@wordpress/element'
 import ImageDesignBasic from './images/basic.png'
 import ImageDesignPlain from './images/plain.png'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import { showProNotice } from 'stackable'
 
 addFilter( 'stackable.number-box.edit.inspector.layout.before', 'stackable/number-box', ( output, props ) => {
diff --git a/src/block/number-box/save.js b/src/block/number-box/save.js
index cbd47fa60..f7f108f7c 100644
--- a/src/block/number-box/save.js
+++ b/src/block/number-box/save.js
@@ -7,7 +7,7 @@ import createStyles from './style'
 import { Fragment } from '@wordpress/element'
 import { hasBackgroundOverlay } from '@stackable/util'
 import { range } from 'lodash'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className, attributes } = props
diff --git a/src/block/pricing-box/deprecated.js b/src/block/pricing-box/deprecated.js
index eb71c1ba2..332d339cf 100644
--- a/src/block/pricing-box/deprecated.js
+++ b/src/block/pricing-box/deprecated.js
@@ -6,7 +6,7 @@ import {
 import { descriptionPlaceholder, isDarkColor, range } from '@stackable/util'
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import striptags from 'striptags'
 
 const deprecatedSave_1_12 = props => {
diff --git a/src/block/pricing-box/edit.js b/src/block/pricing-box/edit.js
index 74fd343fe..6383793a7 100644
--- a/src/block/pricing-box/edit.js
+++ b/src/block/pricing-box/edit.js
@@ -4,7 +4,7 @@ import {
 import { descriptionPlaceholder, isDarkColor, range } from '@stackable/util'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl,
 } from '@wordpress/components'
diff --git a/src/block/pricing-box/save.js b/src/block/pricing-box/save.js
index 33df31fb3..dafbd8945 100644
--- a/src/block/pricing-box/save.js
+++ b/src/block/pricing-box/save.js
@@ -3,7 +3,7 @@ import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
 import { Fragment } from '@wordpress/element'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import striptags from 'striptags'
 
 const save = props => {
diff --git a/src/block/pullquote/edit.js b/src/block/pullquote/edit.js
index b8aa299ec..1154db830 100644
--- a/src/block/pullquote/edit.js
+++ b/src/block/pullquote/edit.js
@@ -1,6 +1,6 @@
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
diff --git a/src/block/pullquote/save.js b/src/block/pullquote/save.js
index 26d27a250..e10060e7e 100644
--- a/src/block/pullquote/save.js
+++ b/src/block/pullquote/save.js
@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props
diff --git a/src/block/team-member/deprecated.js b/src/block/team-member/deprecated.js
index d15ce051d..6483334ef 100644
--- a/src/block/team-member/deprecated.js
+++ b/src/block/team-member/deprecated.js
@@ -2,7 +2,7 @@ import { descriptionPlaceholder, range } from '@stackable/util'
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { omit } from 'lodash'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_10 = props => {
 	const { className, attributes } = props
diff --git a/src/block/team-member/edit.js b/src/block/team-member/edit.js
index 33a5259bd..7bac3b39d 100644
--- a/src/block/team-member/edit.js
+++ b/src/block/team-member/edit.js
@@ -3,7 +3,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl, SelectControl,
 } from '@wordpress/components'
diff --git a/src/block/team-member/save.js b/src/block/team-member/save.js
index db50bf6c7..bd05370b5 100644
--- a/src/block/team-member/save.js
+++ b/src/block/team-member/save.js
@@ -2,7 +2,7 @@ import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { Fragment } from '@wordpress/element'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className, attributes } = props
diff --git a/src/block/testimonial/deprecated.js b/src/block/testimonial/deprecated.js
index dab368f16..4f08499d5 100644
--- a/src/block/testimonial/deprecated.js
+++ b/src/block/testimonial/deprecated.js
@@ -2,7 +2,7 @@ import { descriptionPlaceholder, range } from '@stackable/util'
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { omit } from 'lodash'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	mediaID1: {
diff --git a/src/block/testimonial/edit.js b/src/block/testimonial/edit.js
index 85441b1a0..ffb8e8110 100644
--- a/src/block/testimonial/edit.js
+++ b/src/block/testimonial/edit.js
@@ -7,7 +7,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { PanelBody, RangeControl, ToggleControl } from '@wordpress/components'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
diff --git a/src/block/testimonial/save.js b/src/block/testimonial/save.js
index 4c3e92397..ed44b64ab 100644
--- a/src/block/testimonial/save.js
+++ b/src/block/testimonial/save.js
@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className, attributes } = props
diff --git a/src/block/video-popup/edit.js b/src/block/video-popup/edit.js
index fe9800ba1..60e277f53 100644
--- a/src/block/video-popup/edit.js
+++ b/src/block/video-popup/edit.js
@@ -8,7 +8,7 @@ import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { Fragment } from '@wordpress/element'
 import { getVideoProviderFromURL } from '@stackable/util'
-import { InspectorControls } from '@wordpress/editor'
+import { InspectorControls } from '@wordpress/block-editor'
 import { showProNotice } from 'stackable'
 
 const edit = props => {
diff --git a/src/components/button-edit/deprecated.js b/src/components/button-edit/deprecated.js
index 1ac6e0096..8a3155a10 100644
--- a/src/components/button-edit/deprecated.js
+++ b/src/components/button-edit/deprecated.js
@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import { SvgIcon } from '@stackable/components'
 
 export const DeprecatedButtonContent_1_12 = props => {
diff --git a/src/components/button-edit/index.js b/src/components/button-edit/index.js
index e398cf132..83a6e6572 100644
--- a/src/components/button-edit/index.js
+++ b/src/components/button-edit/index.js
@@ -1,6 +1,6 @@
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import { SvgIcon } from '@stackable/components'
 
 // Deprecated ButtonEdit.Content methods.
diff --git a/src/components/color-palette-control/index.js b/src/components/color-palette-control/index.js
index dedd9f507..7afd75d13 100644
--- a/src/components/color-palette-control/index.js
+++ b/src/components/color-palette-control/index.js
@@ -7,7 +7,7 @@
 import { __, sprintf } from '@wordpress/i18n'
 import { BaseControl, ColorIndicator, ColorPalette } from '@wordpress/components'
 import { compose, ifCondition } from '@wordpress/compose'
-import { getColorObjectByColorValue, withColorContext } from '@wordpress/editor'
+import { getColorObjectByColorValue, withColorContext } from '@wordpress/block-editor'
 import { Fragment } from '@wordpress/element'
 
 // translators: first %s: The type of color (e.g. background color), second %s: the color name or value (e.g. red or #ff0000)
diff --git a/src/components/image-control/index.js b/src/components/image-control/index.js
index 0469a41f6..e7ed0a8e9 100644
--- a/src/components/image-control/index.js
+++ b/src/components/image-control/index.js
@@ -2,7 +2,7 @@ import { BaseControl, Dashicon } from '@wordpress/components'
 import { __ } from '@wordpress/i18n'
 import { BaseControlMultiLabel } from '@stackable/components'
 import { Fragment } from '@wordpress/element'
-import { MediaUpload } from '@wordpress/editor'
+import { MediaUpload } from '@wordpress/block-editor'
 import SVGImageIcon from './images/image.svg'
 
 const ImageControl = props => {
diff --git a/src/components/image-upload-placeholder/index.js b/src/components/image-upload-placeholder/index.js
index 218fdeb73..6a9bf68ce 100644
--- a/src/components/image-upload-placeholder/index.js
+++ b/src/components/image-upload-placeholder/index.js
@@ -1,6 +1,6 @@
 import classnames from 'classnames'
 import { Dashicon } from '@wordpress/components'
-import { MediaUpload } from '@wordpress/editor'
+import { MediaUpload } from '@wordpress/block-editor'
 import SVGImageIcon from './images/image.svg'
 
 const ImageUploadPlaceholder = props => {
diff --git a/src/components/panel-tabs/inspector-panel-controls.js b/src/components/panel-tabs/inspector-panel-controls.js
index 8f70c0895..f6daa5d46 100644
--- a/src/components/panel-tabs/inspector-panel-controls.js
+++ b/src/components/panel-tabs/inspector-panel-controls.js
@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { InspectorControls } from '@wordpress/editor'
+import { InspectorControls } from '@wordpress/block-editor'
 
 const InspectorPanelControls = props => {
 	const mainClasses = classnames( [
diff --git a/src/components/url-input-control/index.js b/src/components/url-input-control/index.js
index bc22b82c3..b48d9ce21 100644
--- a/src/components/url-input-control/index.js
+++ b/src/components/url-input-control/index.js
@@ -1,7 +1,7 @@
 import { Dashicon, IconButton, ToggleControl } from '@wordpress/components'
 import { __ } from '@wordpress/i18n'
 import { Component } from '@wordpress/element'
-import { URLInput } from '@wordpress/editor'
+import { URLInput } from '@wordpress/block-editor'
 
 const ariaClosed = __( 'Show more tools & options' )
 const ariaOpen = __( 'Hide more tools & options' )
diff --git a/src/higher-order/with-tabbed-inspector/index.js b/src/higher-order/with-tabbed-inspector/index.js
index 4a6c024f6..cbe484dea 100644
--- a/src/higher-order/with-tabbed-inspector/index.js
+++ b/src/higher-order/with-tabbed-inspector/index.js
@@ -2,7 +2,7 @@ import { Component, Fragment } from '@wordpress/element'
 import { InspectorPanelControls, PanelTabs } from '@stackable/components'
 import { applyFilters } from '@wordpress/hooks'
 import { createHigherOrderComponent } from '@wordpress/compose'
-import { InspectorControls } from '@wordpress/editor'
+import { InspectorControls } from '@wordpress/block-editor'
 
 const withTabbedInspector = ( tabs = null ) => createHigherOrderComponent(
 	WrappedComponent => class extends Component {
diff --git a/src/init-deprecated.php b/src/init-deprecated.php
new file mode 100644
index 000000000..91d598ec5
--- /dev/null
+++ b/src/init-deprecated.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Blocks Initializer - For supporting backward compatibility with WordPress / Gutenberg.
+ *
+ * @since 	1.15.5
+ * @package Stackable
+ */
+
+// Exit if accessed directly.
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! function_exists( 'stackable_gutenberg_blockeditor_5_1_backward_compatibility' ) ) {
+
+	/**
+	 * In Gutenberg 5.9, a lot of Components in @wordpress/editor moved to @wordpress/block-editor.
+	 * Stackable scripts have migrated to '@wordpress/block-editor' (wp.blockEditor), but this was only introduced
+	 * in WordPress 5.2.
+	 *
+	 * This function brings support for WordPress 5.1, where wp.blockEditor was not yet available.
+	 */
+	function stackable_gutenberg_blockeditor_5_1_backward_compatibility() {
+		$custom_js = "if ( typeof wp.blockEditor === 'undefined' ) { wp.blockEditor = wp.editor }";
+		wp_add_inline_script( 'ugb-block-js-vendor', $custom_js );
+	}
+	add_action( 'enqueue_block_assets', 'stackable_gutenberg_blockeditor_5_1_backward_compatibility', 8 );
+}
diff --git a/src/modules/block-background/index.js b/src/modules/block-background/index.js
index cda1aaa6d..2457f07f4 100644
--- a/src/modules/block-background/index.js
+++ b/src/modules/block-background/index.js
@@ -3,7 +3,7 @@ import {
 	BackgroundControlsHelper,
 	PanelAdvancedSettings,
 } from '@stackable/components'
-import { BlockAlignmentToolbar, BlockControls } from '@wordpress/editor'
+import { BlockAlignmentToolbar, BlockControls } from '@wordpress/block-editor'
 import {
 	createBackgroundAttributeNames,
 	createBackgroundAttributes,
diff --git a/src/modules/block-title/index.js b/src/modules/block-title/index.js
index 5bde7b1ae..f40c9f502 100644
--- a/src/modules/block-title/index.js
+++ b/src/modules/block-title/index.js
@@ -20,7 +20,7 @@ import {
 } from '@stackable/util'
 import deepmerge from 'deepmerge'
 import { Fragment } from '@wordpress/element'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const addInspectorPanel = ( output, props ) => {
 	// console.log('HAHAHA')
diff --git a/src/modules/content-align/index.js b/src/modules/content-align/index.js
index b42804ecc..fffa0ebb3 100644
--- a/src/modules/content-align/index.js
+++ b/src/modules/content-align/index.js
@@ -1,5 +1,5 @@
 import { addFilter, doAction } from '@wordpress/hooks'
-import { AlignmentToolbar, BlockControls } from '@wordpress/editor'
+import { AlignmentToolbar, BlockControls } from '@wordpress/block-editor'
 import { createAllCombinationAttributes } from '@stackable/util'
 import deepmerge from 'deepmerge'
 import { Fragment } from '@wordpress/element'
diff --git a/src/test/helpers.js b/src/test/helpers.js
index 565df993a..f4b19bbf0 100644
--- a/src/test/helpers.js
+++ b/src/test/helpers.js
@@ -6,7 +6,7 @@ import {
 	registerBlockType,
 	unregisterBlockType,
 } from '@wordpress/blocks'
-import { BlockEdit } from '@wordpress/editor'
+import { BlockEdit } from '@wordpress/block-editor'
 import { noop } from 'lodash'
 import registerStackableBlock from '@stackable/register-block'
 import { render } from 'enzyme'