diff --git a/components/code-editor/README.md b/components/code-editor/README.md
deleted file mode 100644
index c48c0545aa0b43..00000000000000
--- a/components/code-editor/README.md
+++ /dev/null
@@ -1,88 +0,0 @@
-CodeEditor
-=======
-
-CodeEditor is a React component that provides the user with a code editor
-that has syntax highlighting and linting.
-
-The components acts as a drop-in replacement for a <textarea>, and uses the
-CodeMirror library that is provided as part of WordPress Core.
-
-## Usage
-
-```jsx
-import { CodeEditor } from '@wordpress/components';
-
-function editCode() {
-	return (
-		<CodeEditor
-			value={ '<p>This is some <b>HTML</b> code that will have syntax highlighting!</p>' }
-			onChange={ value => console.log( value ) }
-		/>
-	);
-}
-```
-
-## Props
-
-The component accepts the following props:
-
-### value
-
-The source code to load into the code editor.
-
-- Type: `string`
-- Required: Yes
-
-### focus
-
-Whether or not the code editor should be focused.
-
-- Type: `boolean`
-- Required: No
-
-### onFocus
-
-The function called when the editor is focused.
-
-- Type: `Function`
-- Required: No
-
-### onChange
-
-The function called when the user has modified the source code via the
-editor. It is passed the new value as an argument.
-
-- Type: `Function`
-- Required: No
-
-### settings
-
-The settings object used to initialize the WordPress code editor. The object contains all of the settings for the editor, including specific settings for CodeMirror. This object is passed into `wp.codeEditor.initialize()`. If you do not specify a settings object, `window._wpGutenbergCodeEditorSettings` will be used instead.
-
-If you are extending `window._wpGutenbergCodeEditorSettings` make sure to clone the object using `Object.assign` or something similar instead of modifying it directly so the default settings remain the same.
-
-```
-const settings = Object.assign(  {
-	codemirror: {
-		mode: css,
-		lint: false,
-	} },
-	window._wpGutenbergCodeEditorSetting
-);
-```
-
-- Type: `Object`
-- Required: No
-
-### editorRef
-
-A reference to the instance of CodeMirror initialized when the editor is loaded so that it can be dynamically updated from a parent component.
-
-`editorRef={ ( ref ) => this.editorInstance = ref }`
-
-`this.editorInstance` will contain a full instance of `CodeMirror` which can then be modified or updated from the component it is being reference from using the [CodeMirror API](https://codemirror.net/doc/manual.html#api). For example, to dynamically change the language mode of CodeMirror to CSS you can call:
-
-`this.editorInstance.setOption( 'mode', 'css' );`
-
-- Type `Function`
-- Required: No
diff --git a/components/code-editor/editor.js b/components/code-editor/editor.js
deleted file mode 100644
index 6d0f52b6427f2e..00000000000000
--- a/components/code-editor/editor.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Component } from '@wordpress/element';
-import { UP, DOWN } from '@wordpress/keycodes';
-
-class CodeEditor extends Component {
-	constructor() {
-		super( ...arguments );
-
-		this.onFocus = this.onFocus.bind( this );
-		this.onBlur = this.onBlur.bind( this );
-		this.onCursorActivity = this.onCursorActivity.bind( this );
-		this.onKeyHandled = this.onKeyHandled.bind( this );
-	}
-
-	componentDidMount() {
-		const settings = this.props.settings || window._wpGutenbergCodeEditorSettings;
-		const instance = wp.codeEditor.initialize( this.textarea, settings );
-		this.editor = instance.codemirror;
-
-		this.editor.on( 'focus', this.onFocus );
-		this.editor.on( 'blur', this.onBlur );
-		this.editor.on( 'cursorActivity', this.onCursorActivity );
-		this.editor.on( 'keyHandled', this.onKeyHandled );
-
-		// Pass a reference to the editor back up.
-		if ( this.props.editorRef ) {
-			this.props.editorRef( this.editor );
-		}
-
-		this.updateFocus();
-	}
-
-	componentDidUpdate( prevProps ) {
-		if ( this.props.value !== prevProps.value && this.editor.getValue() !== this.props.value ) {
-			this.editor.setValue( this.props.value );
-		}
-
-		if ( this.props.focus !== prevProps.focus ) {
-			this.updateFocus();
-		}
-	}
-
-	componentWillUnmount() {
-		this.editor.on( 'focus', this.onFocus );
-		this.editor.off( 'blur', this.onBlur );
-		this.editor.off( 'cursorActivity', this.onCursorActivity );
-		this.editor.off( 'keyHandled', this.onKeyHandled );
-
-		this.editor.toTextArea();
-		this.editor = null;
-	}
-
-	onFocus() {
-		if ( this.props.onFocus ) {
-			this.props.onFocus();
-		}
-	}
-
-	onBlur( editor ) {
-		if ( this.props.onChange ) {
-			this.props.onChange( editor.getValue() );
-		}
-	}
-
-	onCursorActivity( editor ) {
-		this.lastCursor = editor.getCursor();
-	}
-
-	onKeyHandled( editor, name, event ) {
-		/*
-		 * Pressing UP/DOWN should only move focus to another block if the cursor is
-		 * at the start or end of the editor.
-		 *
-		 * We do this by stopping UP/DOWN from propagating if:
-		 *  - We know what the cursor was before this event; AND
-		 *  - This event caused the cursor to move
-		 */
-		if ( event.keyCode === UP || event.keyCode === DOWN ) {
-			const areCursorsEqual = ( a, b ) => a.line === b.line && a.ch === b.ch;
-			if ( this.lastCursor && ! areCursorsEqual( editor.getCursor(), this.lastCursor ) ) {
-				event.stopImmediatePropagation();
-			}
-		}
-	}
-
-	updateFocus() {
-		if ( this.props.focus && ! this.editor.hasFocus() ) {
-			// Need to wait for the next frame to be painted before we can focus the editor
-			window.requestAnimationFrame( () => {
-				this.editor.focus();
-			} );
-		}
-
-		if ( ! this.props.focus && this.editor.hasFocus() ) {
-			document.activeElement.blur();
-		}
-	}
-
-	render() {
-		return <textarea ref={ ( ref ) => ( this.textarea = ref ) } defaultValue={ this.props.value } />;
-	}
-}
-
-export default CodeEditor;
diff --git a/components/code-editor/index.js b/components/code-editor/index.js
deleted file mode 100644
index e70243b7e4e084..00000000000000
--- a/components/code-editor/index.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Component } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
-import CodeEditor from './editor';
-import Placeholder from '../../packages/components/src/placeholder';
-import Spinner from '../../packages/components/src/spinner';
-
-/**
- * @var {string?} siteURL WordPress Site URL
- */
-let siteURL;
-
-/**
- * Configure the site's URL to lazy load scripts and styles.
- *
- * @param {string} url Site url.
- */
-export function unstable__setSiteURL( url ) { // eslint-disable-line camelcase
-	siteURL = url;
-}
-
-function loadScript() {
-	return new Promise( ( resolve, reject ) => {
-		const handles = [ 'wp-codemirror', 'code-editor', 'htmlhint', 'csslint', 'jshint' ];
-
-		// Don't load htmlhint-kses unless we need it
-		if ( window._wpGutenbergCodeEditorSettings.htmlhint.kses ) {
-			handles.push( 'htmlhint-kses' );
-		}
-
-		const script = document.createElement( 'script' );
-		script.src = `${ siteURL }/wp-admin/load-scripts.php?load=${ handles.join( ',' ) }`;
-		script.onload = resolve;
-		script.onerror = reject;
-
-		document.head.appendChild( script );
-	} );
-}
-
-function loadStyle() {
-	return new Promise( ( resolve, reject ) => {
-		const handles = [ 'wp-codemirror', 'code-editor' ];
-
-		const style = document.createElement( 'link' );
-		style.rel = 'stylesheet';
-		style.href = `${ siteURL }/wp-admin/load-styles.php?load=${ handles.join( ',' ) }`;
-		style.onload = resolve;
-		style.onerror = reject;
-
-		document.head.appendChild( style );
-	} );
-}
-
-let hasAlreadyLoadedAssets = false;
-
-function loadAssets() {
-	if ( hasAlreadyLoadedAssets ) {
-		return Promise.resolve();
-	}
-
-	return Promise.all( [ loadScript(), loadStyle() ] ).then( () => {
-		hasAlreadyLoadedAssets = true;
-	} );
-}
-
-class LazyCodeEditor extends Component {
-	constructor() {
-		super( ...arguments );
-
-		this.state = {
-			status: 'pending',
-		};
-
-		deprecated( 'wp.components.CodeEditor', {
-			version: '4.2',
-			alternative: 'wp.codeEditor directly or any alternative React component for syntax highlighting',
-		} );
-	}
-
-	componentDidMount() {
-		loadAssets().then(
-			() => {
-				this.setState( { status: 'success' } );
-			},
-			() => {
-				this.setState( { status: 'error' } );
-			}
-		);
-	}
-
-	render() {
-		if ( this.state.status === 'pending' ) {
-			return (
-				<Placeholder>
-					<Spinner />
-				</Placeholder>
-			);
-		}
-
-		if ( this.state.status === 'error' ) {
-			return <Placeholder>{ __( 'An unknown error occurred.' ) }</Placeholder>;
-		}
-
-		return <CodeEditor { ...this.props } />;
-	}
-}
-
-export default LazyCodeEditor;
diff --git a/components/code-editor/test/__snapshots__/editor.js.snap b/components/code-editor/test/__snapshots__/editor.js.snap
deleted file mode 100644
index b3c6e6136803d0..00000000000000
--- a/components/code-editor/test/__snapshots__/editor.js.snap
+++ /dev/null
@@ -1,7 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`CodeEditor should render without an error 1`] = `
-<textarea
-  defaultValue="<b>wowee</b>"
-/>
-`;
diff --git a/components/code-editor/test/editor.js b/components/code-editor/test/editor.js
deleted file mode 100644
index 623fff8da0b51f..00000000000000
--- a/components/code-editor/test/editor.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * External dependencies
- */
-import { shallow } from 'enzyme';
-import { set, noop } from 'lodash';
-
-/**
- * Internal dependencies
- */
-import CodeEditor from '../editor';
-
-describe( 'CodeEditor', () => {
-	it( 'should render without an error', () => {
-		set( global, [ 'wp', 'codeEditor', 'initialize' ], () => ( {
-			codemirror: {
-				on: noop,
-				hasFocus: () => false,
-			},
-		} ) );
-
-		const wrapper = shallow( <CodeEditor value={ '<b>wowee</b>' } /> );
-		expect( wrapper ).toMatchSnapshot();
-	} );
-} );
diff --git a/components/index.js b/components/index.js
deleted file mode 100644
index 8e723cfc5bfd5f..00000000000000
--- a/components/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Components
-export { default as CodeEditor, unstable__setSiteURL } from './code-editor'; // eslint-disable-line camelcase
-export * from '../packages/components/src';
-
-import '../packages/components/src/style.scss';
diff --git a/docs/data/data-core-blocks.md b/docs/data/data-core-blocks.md
index 5f10809be4c644..9a2524905fa40f 100644
--- a/docs/data/data-core-blocks.md
+++ b/docs/data/data-core-blocks.md
@@ -47,18 +47,6 @@ Returns the name of the default block name.
 
 Default block name.
 
-### getFallbackBlockName
-
-Returns the name of the fallback block name.
-
-*Parameters*
-
- * state: Data state.
-
-*Returns*
-
-Fallback block name.
-
 ### getFreeformFallbackBlockName
 
 Returns the name of the block for handling non-block content.
@@ -177,15 +165,6 @@ Returns an action object used to remove a registered block type.
 
 Returns an action object used to set the default block name.
 
-*Parameters*
-
- * name: Block name.
-
-### setFallbackBlockName
-
-Returns an action object used to set the name of the block used as a fallback
-for non-block content.
-
 *Parameters*
 
  * name: Block name.
diff --git a/docs/data/data-core-edit-post.md b/docs/data/data-core-edit-post.md
index 87ff8d8bb05a93..47a0c449eec903 100644
--- a/docs/data/data-core-edit-post.md
+++ b/docs/data/data-core-edit-post.md
@@ -171,18 +171,6 @@ When the value is not set it defaults to true.
 
 Whether the plugin item is pinned.
 
-### getMetaBoxes
-
-Returns the state of legacy meta boxes.
-
-*Parameters*
-
- * state: Global application state.
-
-*Returns*
-
-State of meta boxes.
-
 ### getActiveMetaBoxLocations
 
 Returns an array of active meta box locations.
@@ -247,19 +235,6 @@ Returns the list of all the available meta boxes.
 
 List of meta boxes.
 
-### getMetaBox
-
-Returns the state of legacy meta boxes.
-
-*Parameters*
-
- * state: Global application state.
- * location: Location of the meta box.
-
-*Returns*
-
-State of meta box at specified location.
-
 ### hasMetaBoxes
 
 Returns true if the post is using Meta Boxes
@@ -379,13 +354,4 @@ Returns an action object used to request meta box update.
 
 ### metaBoxUpdatesSuccess
 
-Returns an action object used signal a successful meta box update.
-
-### setMetaBoxSavedData
-
-Returns an action object used to set the saved meta boxes data.
-This is used to check if the meta boxes have been touched when leaving the editor.
-
-*Parameters*
-
- * dataPerLocation: Meta Boxes Data per location.
\ No newline at end of file
+Returns an action object used signal a successful meta box update.
\ No newline at end of file
diff --git a/docs/data/data-core-editor.md b/docs/data/data-core-editor.md
index fd3e2fb5e376d8..735d4428aa88f2 100644
--- a/docs/data/data-core-editor.md
+++ b/docs/data/data-core-editor.md
@@ -1299,6 +1299,18 @@ Returns whether the post is locked.
 
 Is locked.
 
+### isPostSavingLocked
+
+Returns whether post saving is locked.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Is locked.
+
 ### isPostLockTakeover
 
 Returns whether the edition of the post has been taken over.
@@ -1752,4 +1764,20 @@ Returns an action object used in signalling that the user has enabled the publis
 
 ### disablePublishSidebar
 
-Returns an action object used in signalling that the user has disabled the publish sidebar.
\ No newline at end of file
+Returns an action object used in signalling that the user has disabled the publish sidebar.
+
+### lockPostSaving
+
+Returns an action object used to signal that post saving is locked.
+
+*Parameters*
+
+ * lockName: The lock name.
+
+### unlockPostSaving
+
+Returns an action object used to signal that post saving is unlocked.
+
+*Parameters*
+
+ * lockName: The lock name.
\ No newline at end of file
diff --git a/docs/manifest.json b/docs/manifest.json
index 7c2ca6b45ee091..13c0c5adb08693 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -401,6 +401,12 @@
 		"markdown_source": "https://raw.githubusercontent.com/WordPress/gutenberg/master/packages/escape-html/README.md",
 		"parent": "packages"
 	},
+	{
+		"title": "@wordpress/format-library",
+		"slug": "packages-format-library",
+		"markdown_source": "https://raw.githubusercontent.com/WordPress/gutenberg/master/packages/format-library/README.md",
+		"parent": "packages"
+	},
 	{
 		"title": "@wordpress/hooks",
 		"slug": "packages-hooks",
diff --git a/docs/reference/deprecated.md b/docs/reference/deprecated.md
index 8b064f1a5a2ce0..8839fb112d2306 100644
--- a/docs/reference/deprecated.md
+++ b/docs/reference/deprecated.md
@@ -1,5 +1,8 @@
 Gutenberg's deprecation policy is intended to support backwards-compatibility for releases, when possible. The current deprecations are listed below and are grouped by _the version at which they will be removed completely_. If your plugin depends on these behaviors, you must update to the recommended alternative before the noted version.
 
+# 4.4.0
+ - `wp.date.getSettings` has been removed. Please use `wp.date.__experimentalGetSettings` instead.
+
 # 4.3.0
 
 - `isEditorSidebarPanelOpened` selector (`core/edit-post`) has been removed. Please use `isEditorPanelEnabled` instead.
diff --git a/gutenberg.php b/gutenberg.php
index 578c1332f5ce79..1d123094d09330 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -3,7 +3,7 @@
  * Plugin Name: Gutenberg
  * Plugin URI: https://github.com/WordPress/gutenberg
  * Description: Printing since 1440. This is the development plugin for the new block editor in core.
- * Version: 4.1.0
+ * Version: 4.1.1
  * Author: Gutenberg Team
  *
  * @package gutenberg
diff --git a/lib/blocks.php b/lib/blocks.php
index 095ae61e9dddd6..6ef34c4176eefb 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -232,7 +232,7 @@ function do_blocks( $content ) {
 			$inner_content = '';
 
 			if ( ! $is_self_closing ) {
-				$end_tag_pattern = '/<!--\s+\/wp:' . str_replace( '/', '\/', preg_quote( $block_name ) ) . '\s+-->/';
+				$end_tag_pattern = '/<!--\s+\/wp:' . preg_quote( $block_name, '/' ) . '\s+-->/';
 				if ( ! preg_match( $end_tag_pattern, $content, $block_match_end, PREG_OFFSET_CAPTURE ) ) {
 					// If no closing tag is found, abort all matching, and continue
 					// to append remainder of content to rendered output.
@@ -262,6 +262,7 @@ function do_blocks( $content ) {
 
 		return $rendered_content;
 	}
+
 	add_filter( 'the_content', 'do_blocks', 7 ); // BEFORE do_shortcode() and oembed.
 }
 
@@ -292,7 +293,7 @@ function strip_dynamic_blocks( $content ) {
 	 * @return string
 	 */
 	function strip_dynamic_blocks_add_filter( $text ) {
-		add_filter( 'the_content', 'strip_dynamic_blocks', 6 ); // Before do_blocks().
+		add_filter( 'the_content', 'strip_dynamic_blocks', 6 );
 
 		return $text;
 	}
@@ -312,7 +313,7 @@ function strip_dynamic_blocks_add_filter( $text ) {
 	 * @return string
 	 */
 	function strip_dynamic_blocks_remove_filter( $text ) {
-		remove_filter( 'the_content', 'strip_dynamic_blocks', 8 );
+		remove_filter( 'the_content', 'strip_dynamic_blocks', 6 );
 
 		return $text;
 	}
diff --git a/lib/client-assets.php b/lib/client-assets.php
index b9b2f10037262c..96f83331d341d3 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -293,7 +293,6 @@ function gutenberg_register_scripts_and_styles() {
 		array(
 			'lodash',
 			'wp-compose',
-			'wp-deprecated',
 			'wp-element',
 			'wp-is-shallow-equal',
 			'wp-polyfill',
@@ -312,7 +311,6 @@ function gutenberg_register_scripts_and_styles() {
 				'	var storageKey = "WP_DATA_USER_" + userId;',
 				'	wp.data',
 				'		.use( wp.data.plugins.persistence, { storageKey: storageKey } )',
-				'		.use( wp.data.plugins.asyncGenerator )',
 				'		.use( wp.data.plugins.controls );',
 				'} )()',
 			)
@@ -420,7 +418,12 @@ function gutenberg_register_scripts_and_styles() {
 	gutenberg_override_script(
 		'wp-rich-text',
 		gutenberg_url( 'build/rich-text/index.js' ),
-		array( 'wp-polyfill', 'wp-escape-html', 'lodash' ),
+		array(
+			'lodash',
+			'wp-polyfill',
+			'wp-data',
+			'wp-escape-html',
+		),
 		filemtime( gutenberg_dir_path() . 'build/rich-text/index.js' ),
 		true
 	);
@@ -448,10 +451,6 @@ function gutenberg_register_scripts_and_styles() {
 		filemtime( gutenberg_dir_path() . 'build/components/index.js' ),
 		true
 	);
-	wp_add_inline_script(
-		'wp-components',
-		sprintf( 'wp.components.unstable__setSiteURL(%s);', json_encode( site_url() ) )
-	);
 	gutenberg_override_script(
 		'wp-blocks',
 		gutenberg_url( 'build/blocks/index.js' ),
@@ -460,7 +459,6 @@ function gutenberg_register_scripts_and_styles() {
 			'wp-blob',
 			'wp-block-serialization-default-parser',
 			'wp-data',
-			'wp-deprecated',
 			'wp-dom',
 			'wp-element',
 			'wp-hooks',
@@ -509,6 +507,23 @@ function gutenberg_register_scripts_and_styles() {
 		filemtime( gutenberg_dir_path() . 'build/block-library/index.js' ),
 		true
 	);
+	gutenberg_override_script(
+		'wp-format-library',
+		gutenberg_url( 'build/format-library/index.js' ),
+		array(
+			'wp-components',
+			'wp-dom',
+			'wp-editor',
+			'wp-element',
+			'wp-i18n',
+			'wp-keycodes',
+			'wp-polyfill',
+			'wp-rich-text',
+			'wp-url',
+		),
+		filemtime( gutenberg_dir_path() . 'build/format-library/index.js' ),
+		true
+	);
 	gutenberg_override_script(
 		'wp-nux',
 		gutenberg_url( 'build/nux/index.js' ),
@@ -778,6 +793,14 @@ function gutenberg_register_scripts_and_styles() {
 	);
 	wp_style_add_data( 'wp-block-library', 'rtl', 'replace' );
 
+	gutenberg_override_style(
+		'wp-format-library',
+		gutenberg_url( 'build/format-library/style.css' ),
+		array(),
+		filemtime( gutenberg_dir_path() . 'build/format-library/style.css' )
+	);
+	wp_style_add_data( 'wp-format-library', 'rtl', 'replace' );
+
 	gutenberg_override_style(
 		'wp-edit-blocks',
 		gutenberg_url( 'build/block-library/editor.css' ),
@@ -863,11 +886,7 @@ function gutenberg_preload_api_request( $memo, $path ) {
 	if ( 200 === $response->status ) {
 		$server = rest_get_server();
 		$data   = (array) $response->get_data();
-		if ( method_exists( $server, 'get_compact_response_links' ) ) {
-			$links = call_user_func( array( $server, 'get_compact_response_links' ), $response );
-		} else {
-			$links = call_user_func( array( $server, 'get_response_links' ), $response );
-		}
+		$links  = $server->get_compact_response_links( $response );
 		if ( ! empty( $links ) ) {
 			$data['_links'] = $links;
 		}
@@ -1334,6 +1353,8 @@ function gutenberg_editor_scripts_and_styles( $hook ) {
 	add_filter( 'user_can_richedit', '__return_true' );
 
 	wp_enqueue_script( 'wp-edit-post' );
+	wp_enqueue_script( 'wp-format-library' );
+	wp_enqueue_style( 'wp-format-library' );
 
 	global $post;
 
diff --git a/lib/compat.php b/lib/compat.php
index f60df05a275337..d4d223c42b7605 100644
--- a/lib/compat.php
+++ b/lib/compat.php
@@ -114,7 +114,7 @@ function gutenberg_wpautop( $content ) {
 	return wpautop( $content );
 }
 remove_filter( 'the_content', 'wpautop' );
-add_filter( 'the_content', 'gutenberg_wpautop', 8 );
+add_filter( 'the_content', 'gutenberg_wpautop', 6 );
 
 
 /**
diff --git a/package-lock.json b/package-lock.json
index a2ea686c9ea2ab..736ffb3f79c7f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "4.1.0",
+	"version": "4.1.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -2098,7 +2098,6 @@
 				"@wordpress/block-serialization-default-parser": "file:packages/block-serialization-default-parser",
 				"@wordpress/block-serialization-spec-parser": "file:packages/block-serialization-spec-parser",
 				"@wordpress/data": "file:packages/data",
-				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/dom": "file:packages/dom",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/hooks": "file:packages/hooks",
@@ -2183,7 +2182,6 @@
 			"requires": {
 				"@babel/runtime": "^7.0.0",
 				"@wordpress/compose": "file:packages/compose",
-				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/redux-routine": "file:packages/redux-routine",
@@ -2236,6 +2234,7 @@
 				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/editor": "file:packages/editor",
 				"@wordpress/element": "file:packages/element",
+				"@wordpress/format-library": "file:packages/format-library",
 				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/keycodes": "file:packages/keycodes",
@@ -2307,6 +2306,20 @@
 				"@babel/runtime": "^7.0.0"
 			}
 		},
+		"@wordpress/format-library": {
+			"version": "file:packages/format-library",
+			"requires": {
+				"@babel/runtime": "^7.0.0",
+				"@wordpress/components": "file:packages/components",
+				"@wordpress/dom": "file:packages/dom",
+				"@wordpress/editor": "file:packages/editor",
+				"@wordpress/element": "file:packages/element",
+				"@wordpress/i18n": "file:packages/i18n",
+				"@wordpress/keycodes": "file:packages/keycodes",
+				"@wordpress/rich-text": "file:packages/rich-text",
+				"@wordpress/url": "file:packages/url"
+			}
+		},
 		"@wordpress/hooks": {
 			"version": "file:packages/hooks",
 			"requires": {
@@ -2418,8 +2431,10 @@
 			"version": "file:packages/rich-text",
 			"requires": {
 				"@babel/runtime": "^7.0.0",
+				"@wordpress/data": "file:packages/data",
 				"@wordpress/escape-html": "file:packages/escape-html",
-				"lodash": "^4.17.10"
+				"lodash": "^4.17.10",
+				"rememo": "^3.0.0"
 			}
 		},
 		"@wordpress/scripts": {
@@ -7853,18 +7868,6 @@
 				}
 			}
 		},
-		"extract-text-webpack-plugin": {
-			"version": "4.0.0-beta.0",
-			"resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz",
-			"integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
-			"dev": true,
-			"requires": {
-				"async": "^2.4.1",
-				"loader-utils": "^1.1.0",
-				"schema-utils": "^0.4.5",
-				"webpack-sources": "^1.1.0"
-			}
-		},
 		"extract-zip": {
 			"version": "1.6.7",
 			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
@@ -15864,119 +15867,6 @@
 				}
 			}
 		},
-		"postcss-load-config": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
-			"integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
-			"dev": true,
-			"requires": {
-				"cosmiconfig": "^2.1.0",
-				"object-assign": "^4.1.0",
-				"postcss-load-options": "^1.2.0",
-				"postcss-load-plugins": "^2.3.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-					"integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-					"dev": true,
-					"requires": {
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.4.3",
-						"minimist": "^1.2.0",
-						"object-assign": "^4.1.0",
-						"os-homedir": "^1.0.1",
-						"parse-json": "^2.2.0",
-						"require-from-string": "^1.1.0"
-					}
-				},
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				}
-			}
-		},
-		"postcss-load-options": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
-			"integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
-			"dev": true,
-			"requires": {
-				"cosmiconfig": "^2.1.0",
-				"object-assign": "^4.1.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-					"integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-					"dev": true,
-					"requires": {
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.4.3",
-						"minimist": "^1.2.0",
-						"object-assign": "^4.1.0",
-						"os-homedir": "^1.0.1",
-						"parse-json": "^2.2.0",
-						"require-from-string": "^1.1.0"
-					}
-				},
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				}
-			}
-		},
-		"postcss-load-plugins": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
-			"integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
-			"dev": true,
-			"requires": {
-				"cosmiconfig": "^2.1.1",
-				"object-assign": "^4.1.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-					"integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-					"dev": true,
-					"requires": {
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.4.3",
-						"minimist": "^1.2.0",
-						"object-assign": "^4.1.0",
-						"os-homedir": "^1.0.1",
-						"parse-json": "^2.2.0",
-						"require-from-string": "^1.1.0"
-					}
-				},
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				}
-			}
-		},
-		"postcss-loader": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.3.tgz",
-			"integrity": "sha512-RuBcNE8rjCkIB0IsbmkGFRmQJTeQJfCI88E0VTarPNTvaNSv9OFv1DvTwgtAN/qlzyiELsmmmtX/tEzKp/cdug==",
-			"dev": true,
-			"requires": {
-				"loader-utils": "^1.1.0",
-				"postcss": "^6.0.0",
-				"postcss-load-config": "^1.2.0",
-				"schema-utils": "^0.4.0"
-			}
-		},
 		"postcss-markdown": {
 			"version": "0.33.0",
 			"resolved": "https://registry.npmjs.org/postcss-markdown/-/postcss-markdown-0.33.0.tgz",
@@ -17024,12 +16914,6 @@
 				}
 			}
 		},
-		"raw-loader": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
-			"integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
-			"dev": true
-		},
 		"rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -17857,12 +17741,6 @@
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
 			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
 		},
-		"require-from-string": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
-			"integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
-			"dev": true
-		},
 		"require-main-filename": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
@@ -19167,16 +19045,6 @@
 				}
 			}
 		},
-		"style-loader": {
-			"version": "0.20.3",
-			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.3.tgz",
-			"integrity": "sha512-2I7AVP73MvK33U7B9TKlYZAqdROyMXDYSMvHLX43qy3GCOaJNiV6i0v/sv9idWIaQ42Yn2dNv79Q5mKXbKhAZg==",
-			"dev": true,
-			"requires": {
-				"loader-utils": "^1.1.0",
-				"schema-utils": "^0.4.5"
-			}
-		},
 		"style-search": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
diff --git a/package.json b/package.json
index fee8ce05c09dfd..b19fb2ed1784cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "4.1.0",
+	"version": "4.1.1",
 	"private": true,
 	"description": "A new WordPress editor experience",
 	"repository": "git+https://github.com/WordPress/gutenberg.git",
@@ -35,6 +35,7 @@
 		"@wordpress/editor": "file:packages/editor",
 		"@wordpress/element": "file:packages/element",
 		"@wordpress/escape-html": "file:packages/escape-html",
+		"@wordpress/format-library": "file:packages/format-library",
 		"@wordpress/hooks": "file:packages/hooks",
 		"@wordpress/html-entities": "file:packages/html-entities",
 		"@wordpress/i18n": "file:packages/i18n",
@@ -83,7 +84,6 @@
 		"eslint-plugin-react": "7.7.0",
 		"eslint-plugin-wordpress": "git://github.com/WordPress-Coding-Standards/eslint-plugin-wordpress.git#1774343f6226052a46b081e01db3fca8793cc9f1",
 		"espree": "3.5.4",
-		"extract-text-webpack-plugin": "4.0.0-beta.0",
 		"glob": "7.1.2",
 		"husky": "0.14.3",
 		"jest-puppeteer": "3.2.1",
@@ -96,16 +96,13 @@
 		"pegjs": "0.10.0",
 		"phpegjs": "1.0.0-beta7",
 		"postcss-color-function": "4.0.1",
-		"postcss-loader": "2.1.3",
 		"puppeteer": "1.6.1",
-		"raw-loader": "0.5.1",
 		"react-test-renderer": "16.4.1",
 		"rimraf": "2.6.2",
 		"rtlcss": "2.4.0",
 		"sass-loader": "6.0.7",
 		"source-map-loader": "0.2.3",
 		"sprintf-js": "1.1.1",
-		"style-loader": "0.20.3",
 		"stylelint": "9.5.0",
 		"stylelint-config-wordpress": "13.1.0",
 		"symlink-or-copy": "1.2.0",
diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index dc2b2213722b22..a43d08046bb5e4 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -133,8 +133,6 @@
 	}
 
 	// Apply max-width to floated items that have no intrinsic width.
-	[data-align="left"] &,
-	[data-align="right"] &,
 	&.alignleft,
 	&.alignright {
 		max-width: $content-width / 2;
@@ -148,4 +146,11 @@
 	&.alignright {
 		display: flex;
 	}
+
+	// If the gallery is centered, center the content inside as well.
+	&.aligncenter {
+		.blocks-gallery-item figure {
+			justify-content: center;
+		}
+	}
 }
diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
index 97cafce3c1492d..1ff353c1ada4d6 100644
--- a/packages/block-library/src/image/edit.js
+++ b/packages/block-library/src/image/edit.js
@@ -351,7 +351,7 @@ class ImageEdit extends Component {
 						label={ __( 'Alt Text (Alternative Text)' ) }
 						value={ alt }
 						onChange={ this.updateAlt }
-						help={ __( 'Describe the purpose of the image. Leave empty if the image is not a key part of the content.' ) }
+						help={ __( 'Alternative text describes your image to people who can’t see it. Add a short description with its key details.' ) }
 					/>
 					{ ! isEmpty( availableSizes ) && (
 						<SelectControl
diff --git a/packages/block-library/src/latest-posts/edit.js b/packages/block-library/src/latest-posts/edit.js
index 9ee78e568adf19..77f9d3eecac24b 100644
--- a/packages/block-library/src/latest-posts/edit.js
+++ b/packages/block-library/src/latest-posts/edit.js
@@ -18,7 +18,7 @@ import {
 	Toolbar,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { dateI18n, format, getSettings } from '@wordpress/date';
+import { dateI18n, format, __experimentalGetSettings } from '@wordpress/date';
 import { decodeEntities } from '@wordpress/html-entities';
 import {
 	InspectorControls,
@@ -116,7 +116,7 @@ class LatestPostsEdit extends Component {
 			},
 		];
 
-		const dateFormat = getSettings().formats.date;
+		const dateFormat = __experimentalGetSettings().formats.date;
 
 		return (
 			<Fragment>
diff --git a/packages/block-library/src/media-text/editor.scss b/packages/block-library/src/media-text/editor.scss
index 41c38c97758daf..a703667375135c 100644
--- a/packages/block-library/src/media-text/editor.scss
+++ b/packages/block-library/src/media-text/editor.scss
@@ -43,7 +43,7 @@ figure.block-library-media-text__media-container {
 
 .wp-block-media-text .block-library-media-text__media-container img,
 .wp-block-media-text .block-library-media-text__media-container video {
-	margin-bottom: -8px;
+	vertical-align: middle;
 	width: 100%;
 }
 
diff --git a/packages/block-library/src/media-text/style.scss b/packages/block-library/src/media-text/style.scss
index 86e64b4bd27b1d..01e788315e8be9 100644
--- a/packages/block-library/src/media-text/style.scss
+++ b/packages/block-library/src/media-text/style.scss
@@ -31,5 +31,5 @@
 .wp-block-media-text > figure > video {
 	max-width: unset;
 	width: 100%;
-	margin-bottom: -6px;
+	vertical-align: middle;
 }
diff --git a/packages/blocks/CHANGELOG.md b/packages/blocks/CHANGELOG.md
index 08b2e25271ecde..a8febb1a17be3d 100644
--- a/packages/blocks/CHANGELOG.md
+++ b/packages/blocks/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.0.0 (Unreleased)
+
+### Breaking Changes
+
+- Attribute type coercion has been removed. Omit the source to preserve type via serialized comment demarcation.
+- `setUnknownTypeHandlerName` has been removed. Please use `setFreeformContentHandlerName` and `setUnregisteredTypeHandlerName` instead.
+- `getUnknownTypeHandlerName` has been removed. Please use `getFreeformContentHandlerName` and `getUnregisteredTypeHandlerName` instead.
+
 ## 4.0.4 (2018-10-19)
 
 ## 4.0.3 (2018-10-18)
diff --git a/packages/blocks/package.json b/packages/blocks/package.json
index 8ca13799999aec..d028e4e0449ac4 100644
--- a/packages/blocks/package.json
+++ b/packages/blocks/package.json
@@ -26,7 +26,6 @@
 		"@wordpress/block-serialization-default-parser": "file:../block-serialization-default-parser",
 		"@wordpress/block-serialization-spec-parser": "file:../block-serialization-spec-parser",
 		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/dom": "file:../dom",
 		"@wordpress/element": "file:../element",
 		"@wordpress/hooks": "file:../hooks",
diff --git a/packages/blocks/src/api/index.js b/packages/blocks/src/api/index.js
index 53425eadfa92f8..9df9acf536f6ba 100644
--- a/packages/blocks/src/api/index.js
+++ b/packages/blocks/src/api/index.js
@@ -28,8 +28,6 @@ export {
 export {
 	registerBlockType,
 	unregisterBlockType,
-	setUnknownTypeHandlerName,
-	getUnknownTypeHandlerName,
 	setFreeformContentHandlerName,
 	getFreeformContentHandlerName,
 	setUnregisteredTypeHandlerName,
diff --git a/packages/blocks/src/api/index.native.js b/packages/blocks/src/api/index.native.js
index d1baeb2ff2a336..c83db0ad39e2c5 100644
--- a/packages/blocks/src/api/index.native.js
+++ b/packages/blocks/src/api/index.native.js
@@ -13,8 +13,6 @@ export {
 } from './serializer';
 export {
 	registerBlockType,
-	setUnknownTypeHandlerName,
-	getUnknownTypeHandlerName,
 	setUnregisteredTypeHandlerName,
 	getUnregisteredTypeHandlerName,
 	getBlockType,
diff --git a/packages/blocks/src/api/parser.js b/packages/blocks/src/api/parser.js
index 0ff1bff1ca9db8..920468b0917b16 100644
--- a/packages/blocks/src/api/parser.js
+++ b/packages/blocks/src/api/parser.js
@@ -10,7 +10,6 @@ import { flow, castArray, mapValues, omit, stubFalse } from 'lodash';
 import { autop } from '@wordpress/autop';
 import { applyFilters } from '@wordpress/hooks';
 import { parse as defaultParse } from '@wordpress/block-serialization-default-parser';
-import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -262,25 +261,10 @@ export function getBlockAttribute( attributeKey, attributeSchema, innerHTML, com
 			break;
 	}
 
-	if ( value !== undefined ) {
-		if ( isAmbiguousStringSource( attributeSchema ) ) {
-			if ( ! isOfTypes( value, castArray( type ) ) ) {
-				deprecated( 'Attribute type coercion', {
-					plugin: 'Gutenberg',
-					version: '4.2',
-					hint: (
-						'Omit the source to preserve type via serialized ' +
-						'comment demarcation.'
-					),
-				} );
-
-				value = asType( value, type );
-			}
-		} else if ( type !== undefined && ! isOfTypes( value, castArray( type ) ) ) {
-			// Reject the value if it is not valid of type. Reverting to the
-			// undefined value ensures the default is restored, if applicable.
-			value = undefined;
-		}
+	if ( type !== undefined && ! isOfTypes( value, castArray( type ) ) ) {
+		// Reject the value if it is not valid of type. Reverting to the
+		// undefined value ensures the default is restored, if applicable.
+		value = undefined;
 	}
 
 	if ( value === undefined ) {
diff --git a/packages/blocks/src/api/registration.js b/packages/blocks/src/api/registration.js
index 13e62a425fc0f9..1dcaad85828cb9 100644
--- a/packages/blocks/src/api/registration.js
+++ b/packages/blocks/src/api/registration.js
@@ -10,7 +10,6 @@ import { get, isFunction, some } from 'lodash';
  */
 import { applyFilters, addFilter } from '@wordpress/hooks';
 import { select, dispatch } from '@wordpress/data';
-import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -172,35 +171,6 @@ export function unregisterBlockType( name ) {
 	return oldBlock;
 }
 
-/**
- * Assigns name of block handling unknown block types.
- *
- * @param {string} name Block name.
- */
-export function setUnknownTypeHandlerName( name ) {
-	deprecated( 'setUnknownTypeHandlerName', {
-		plugin: 'Gutenberg',
-		version: '4.2',
-		alternative: 'setFreeformContentHandlerName and setUnregisteredTypeHandlerName',
-	} );
-	setFreeformContentHandlerName( name );
-}
-
-/**
- * Retrieves name of block handling unknown block types, or undefined if no
- * handler has been defined.
- *
- * @return {?string} Blog name.
- */
-export function getUnknownTypeHandlerName() {
-	deprecated( 'getUnknownTypeHandlerName', {
-		plugin: 'Gutenberg',
-		version: '4.2',
-		alternative: 'getFreeformContentHandlerName and getUnregisteredTypeHandlerName',
-	} );
-	return getFreeformContentHandlerName();
-}
-
 /**
  * Assigns name of block for handling non-block content.
  *
diff --git a/packages/blocks/src/api/test/parser.js b/packages/blocks/src/api/test/parser.js
index a23e2f995f7d02..e55a2546a9bca5 100644
--- a/packages/blocks/src/api/test/parser.js
+++ b/packages/blocks/src/api/test/parser.js
@@ -4,11 +4,6 @@
 import { attr } from 'hpq';
 import deepFreeze from 'deep-freeze';
 
-/**
- * WordPress dependencies
- */
-import deprecated from '@wordpress/deprecated';
-
 /**
  * Internal dependencies
  */
@@ -34,8 +29,6 @@ import {
 import { createBlock } from '../factory';
 import serialize from '../serializer';
 
-jest.mock( '@wordpress/deprecated', () => jest.fn() );
-
 describe( 'block parser', () => {
 	const defaultBlockSettings = {
 		attributes: {
@@ -297,10 +290,7 @@ describe( 'block parser', () => {
 	} );
 
 	describe( 'getBlockAttributes()', () => {
-		it( 'should parse as coerced value (deprecated)', () => {
-			// TODO: When removing this deprecation, ensure to complement with
-			// enhancement to the intended rejection of a numeric type on an
-			// ambiguous string source.
+		it( 'should reject the value with a wrong type', () => {
 			const blockType = {
 				attributes: {
 					number: {
@@ -315,9 +305,8 @@ describe( 'block parser', () => {
 			const innerHTML = '<div data-number="10">Ribs</div>';
 
 			expect( getBlockAttributes( blockType, innerHTML, {} ) ).toEqual( {
-				number: 10,
+				number: undefined,
 			} );
-			expect( deprecated ).toHaveBeenCalled();
 		} );
 
 		it( 'should merge attributes with the parsed and default attributes', () => {
diff --git a/packages/blocks/src/api/test/registration.js b/packages/blocks/src/api/test/registration.js
index f2dbf534c98f11..6e99dd9e760c6f 100644
--- a/packages/blocks/src/api/test/registration.js
+++ b/packages/blocks/src/api/test/registration.js
@@ -16,8 +16,6 @@ import { addFilter, removeFilter } from '@wordpress/hooks';
 import {
 	registerBlockType,
 	unregisterBlockType,
-	setUnknownTypeHandlerName,
-	getUnknownTypeHandlerName,
 	setFreeformContentHandlerName,
 	getFreeformContentHandlerName,
 	setUnregisteredTypeHandlerName,
@@ -371,29 +369,6 @@ describe( 'blocks', () => {
 		} );
 	} );
 
-	describe( 'setUnknownTypeHandlerName()', () => {
-		it( 'assigns unknown type handler', () => {
-			try {
-				setUnknownTypeHandlerName( 'core/test-block' );
-
-				expect( getUnknownTypeHandlerName() ).toBe( 'core/test-block' );
-				expect( console ).toHaveWarned();
-			} finally {
-				// Restore undefined handler here rather than in `afterEach` because:
-				// - This call generates a deprecation warning.
-				// - Deprecation warnings become test errors unless we assert `toHaveWarned`.
-				// - This is too broad of an assertion to apply for all tests in the suite.
-				setUnknownTypeHandlerName( undefined );
-			}
-		} );
-	} );
-
-	describe( 'getUnknownTypeHandlerName()', () => {
-		it( 'defaults to undefined', () => {
-			expect( getUnknownTypeHandlerName() ).toBeNull();
-		} );
-	} );
-
 	describe( 'setFreeformContentHandlerName()', () => {
 		it( 'assigns unknown type handler', () => {
 			setFreeformContentHandlerName( 'core/test-block' );
diff --git a/packages/blocks/src/store/actions.js b/packages/blocks/src/store/actions.js
index 4ca964e4304786..c2da126f4458d8 100644
--- a/packages/blocks/src/store/actions.js
+++ b/packages/blocks/src/store/actions.js
@@ -3,11 +3,6 @@
  */
 import { castArray } from 'lodash';
 
-/**
- * WordPress dependencies
- */
-import deprecated from '@wordpress/deprecated';
-
 /**
  * Returns an action object used in signalling that block types have been added.
  *
@@ -50,23 +45,6 @@ export function setDefaultBlockName( name ) {
 	};
 }
 
-/**
- * Returns an action object used to set the name of the block used as a fallback
- * for non-block content.
- *
- * @param {string} name Block name.
- *
- * @return {Object} Action object.
- */
-export function setFallbackBlockName( name ) {
-	deprecated( 'setFallbackBlockName', {
-		plugin: 'Gutenberg',
-		version: '4.2',
-		alternative: 'setFreeformFallbackBlockName and setUnregisteredFallbackBlockName',
-	} );
-	return setFreeformFallbackBlockName( name );
-}
-
 /**
  * Returns an action object used to set the name of the block used as a fallback
  * for non-block content.
diff --git a/packages/blocks/src/store/selectors.js b/packages/blocks/src/store/selectors.js
index ee8005fd9be6ea..6f36f8fed29925 100644
--- a/packages/blocks/src/store/selectors.js
+++ b/packages/blocks/src/store/selectors.js
@@ -4,11 +4,6 @@
 import createSelector from 'rememo';
 import { filter, get, includes, map, some } from 'lodash';
 
-/**
- * WordPress dependencies
- */
-import deprecated from '@wordpress/deprecated';
-
 /**
  * Returns all the available block types.
  *
@@ -57,22 +52,6 @@ export function getDefaultBlockName( state ) {
 	return state.defaultBlockName;
 }
 
-/**
- * Returns the name of the fallback block name.
- *
- * @param {Object} state Data state.
- *
- * @return {string?} Fallback block name.
- */
-export function getFallbackBlockName( state ) {
-	deprecated( 'getFallbackBlockName', {
-		plugin: 'Gutenberg',
-		version: '4.2',
-		alternative: 'getFreeformFallbackBlockName and getUnregisteredFallbackBlockName',
-	} );
-	return getFreeformFallbackBlockName( state );
-}
-
 /**
  * Returns the name of the block for handling non-block content.
  *
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 1eef1646bf3a0b..9dae018a3b7493 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.0.0 (Unreleased)
+
+### Breaking Changes
+
+- `AccessibleSVG` component has been removed. Please use `SVG` instead.
+
 ## 4.2.1 (2018-10-22)
 
 ### Bug Fix
diff --git a/packages/components/src/date-time/README.md b/packages/components/src/date-time/README.md
index d5a2f26246e43a..dc23cc9cd097f2 100644
--- a/packages/components/src/date-time/README.md
+++ b/packages/components/src/date-time/README.md
@@ -8,13 +8,13 @@ Render a DateTimePicker.
 
 ```jsx
 import { DateTimePicker } from '@wordpress/components';
-import { getSettings } from '@wordpress/date';
+import { __experimentalGetSettings } from '@wordpress/date';
 import { withState } from '@wordpress/compose';
 
 const MyDateTimePicker = withState( {
 	date: new Date(),
 } )( ( { date, setState } ) => {
-	const settings = getSettings();
+	const settings = __experimentalGetSettings();
 
 	// To know if the current timezone is a 12 hour time with look for an "a" in the time format.
 	// We also make sure this a is not escaped by a "/".
diff --git a/packages/components/src/index.js b/packages/components/src/index.js
index fcaf2b981c9219..a1a36393346d40 100644
--- a/packages/components/src/index.js
+++ b/packages/components/src/index.js
@@ -55,6 +55,7 @@ export { default as TextControl } from './text-control';
 export { default as TextareaControl } from './textarea-control';
 export { default as ToggleControl } from './toggle-control';
 export { default as Toolbar } from './toolbar';
+export { default as ToolbarButton } from './toolbar-button';
 export { default as Tooltip } from './tooltip';
 export { default as TreeSelect } from './tree-select';
 export { createSlotFill, Slot, Fill, Provider as SlotFillProvider } from './slot-fill';
diff --git a/packages/components/src/primitives/svg/index.js b/packages/components/src/primitives/svg/index.js
index 96c1a81e5fbb7e..8b54a777f053bf 100644
--- a/packages/components/src/primitives/svg/index.js
+++ b/packages/components/src/primitives/svg/index.js
@@ -3,11 +3,6 @@
  */
 import { createElement } from '@wordpress/element';
 
-/**
- * WordPress dependencies
- */
-import deprecated from '@wordpress/deprecated';
-
 export const Circle = ( props ) => createElement( 'circle', props );
 export const G = ( props ) => createElement( 'g', props );
 export const Path = ( props ) => createElement( 'path', props );
@@ -26,13 +21,3 @@ export const SVG = ( props ) => {
 	// eslint-disable-next-line react/forbid-elements
 	return <svg { ...appliedProps } />;
 };
-
-// deprecations
-export const AccessibleSVG = ( props ) => {
-	deprecated( 'wp.components.AccessibleSVG', {
-		version: '4.2',
-		alternative: 'wp.components.SVG',
-		plugin: 'Gutenberg',
-	} );
-	return <SVG { ...props } />;
-};
diff --git a/packages/components/src/style.scss b/packages/components/src/style.scss
index 751eae5aaa3c1d..c3e8b38e7a7efd 100644
--- a/packages/components/src/style.scss
+++ b/packages/components/src/style.scss
@@ -38,4 +38,5 @@
 @import "./textarea-control/style.scss";
 @import "./toggle-control/style.scss";
 @import "./toolbar/style.scss";
+@import "./toolbar-button/style.scss";
 @import "./tooltip/style.scss";
diff --git a/packages/components/src/tab-panel/index.js b/packages/components/src/tab-panel/index.js
index 08964868845218..2e94bd2b05e14d 100644
--- a/packages/components/src/tab-panel/index.js
+++ b/packages/components/src/tab-panel/index.js
@@ -8,7 +8,6 @@ import { partial, noop, find } from 'lodash';
  */
 import { Component } from '@wordpress/element';
 import { withInstanceId } from '@wordpress/compose';
-import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -65,13 +64,6 @@ class TabPanel extends Component {
 		const selectedTab = find( tabs, { name: selected } );
 		const selectedId = instanceId + '-' + selectedTab.name;
 
-		deprecated( 'Tab Panel child function argument used as string', {
-			alternative: 'Argument is now an object, access the name property directly.',
-			version: '4.2.0',
-			plugin: 'Gutenberg',
-			hint: 'This is a global warning, shown regardless of whether the component is used.',
-		} );
-
 		return (
 			<div className={ className }>
 				<NavigableMenu
@@ -99,7 +91,7 @@ class TabPanel extends Component {
 						className="components-tab-panel__tab-content"
 						tabIndex="0"
 					>
-						{ this.props.children( Object.assign( new String( selectedTab.name ), selectedTab ) ) }
+						{ this.props.children( selectedTab ) }
 					</div>
 				) }
 			</div>
diff --git a/packages/components/src/toolbar-button/index.js b/packages/components/src/toolbar-button/index.js
new file mode 100644
index 00000000000000..8c2374b0284d1d
--- /dev/null
+++ b/packages/components/src/toolbar-button/index.js
@@ -0,0 +1,50 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
+/**
+ * Internal dependencies
+ */
+import IconButton from '../icon-button';
+import ToolbarButtonContainer from './toolbar-button-container';
+
+function ToolbarButton( {
+	containerClassName,
+	icon,
+	title,
+	shortcut,
+	subscript,
+	onClick,
+	className,
+	isActive,
+	isDisabled,
+	extraProps,
+	children,
+} ) {
+	return (
+		<ToolbarButtonContainer className={ containerClassName }>
+			<IconButton
+				icon={ icon }
+				label={ title }
+				shortcut={ shortcut }
+				data-subscript={ subscript }
+				onClick={ ( event ) => {
+					event.stopPropagation();
+					onClick();
+				} }
+				className={ classnames(
+					'components-toolbar__control',
+					className,
+					{ 'is-active': isActive }
+				) }
+				aria-pressed={ isActive }
+				disabled={ isDisabled }
+				{ ...extraProps }
+			/>
+			{ children }
+		</ToolbarButtonContainer>
+	);
+}
+
+export default ToolbarButton;
diff --git a/packages/components/src/toolbar-button/style.scss b/packages/components/src/toolbar-button/style.scss
new file mode 100644
index 00000000000000..65f3c0e56c11a5
--- /dev/null
+++ b/packages/components/src/toolbar-button/style.scss
@@ -0,0 +1,77 @@
+.components-toolbar__control.components-button {
+	display: inline-flex;
+	align-items: flex-end;
+	margin: 0;
+	padding: 3px;
+	outline: none;
+	cursor: pointer;
+	position: relative;
+	width: $icon-button-size;
+	height: $icon-button-size;
+
+	// Unset icon button styles
+	&:active,
+	&:not([aria-disabled="true"]):hover,
+	&:not([aria-disabled="true"]):focus {
+		outline: none;
+		box-shadow: none;
+		background: none;
+		border: none;
+	}
+
+	// Disabled
+	&:disabled {
+		cursor: default;
+	}
+
+	& > svg {
+		padding: 5px;
+		border-radius: $radius-round-rectangle;
+		height: 30px;
+		width: 30px;
+	}
+
+	// Subscript for numbered icon buttons, like headings
+	&[data-subscript] svg {
+		padding: 5px 10px 5px 0;
+	}
+
+	&[data-subscript]::after {
+		content: attr(data-subscript);
+		font-family: $default-font;
+		font-size: $default-font-size;
+		font-weight: 600;
+		line-height: 12px;
+		position: absolute;
+		right: 8px;
+		bottom: 10px;
+	}
+
+	// Assign hover style to child element, not the button itself
+	&:not(:disabled):not([aria-disabled="true"]):hover {
+		box-shadow: none;
+	}
+
+	&:not(:disabled).is-active > svg,
+	&:not(:disabled):hover > svg {
+		@include formatting-button-style__hover;
+	}
+
+	// Active & toggled style
+	&:not(:disabled).is-active > svg {
+		@include formatting-button-style__active;
+	}
+
+	&:not(:disabled).is-active[data-subscript]::after {
+		color: $white;
+	}
+
+	// Focus style
+	&:not(:disabled):focus > svg {
+		@include formatting-button-style__focus;
+	}
+}
+
+.components-toolbar__control .dashicon {
+	display: block;
+}
diff --git a/packages/components/src/toolbar/toolbar-button-container.js b/packages/components/src/toolbar-button/toolbar-button-container.js
similarity index 100%
rename from packages/components/src/toolbar/toolbar-button-container.js
rename to packages/components/src/toolbar-button/toolbar-button-container.js
diff --git a/packages/components/src/toolbar/toolbar-button-container.native.js b/packages/components/src/toolbar-button/toolbar-button-container.native.js
similarity index 100%
rename from packages/components/src/toolbar/toolbar-button-container.native.js
rename to packages/components/src/toolbar-button/toolbar-button-container.native.js
diff --git a/packages/components/src/toolbar/index.js b/packages/components/src/toolbar/index.js
index 548c5fb4affffc..15fc1972b44979 100644
--- a/packages/components/src/toolbar/index.js
+++ b/packages/components/src/toolbar/index.js
@@ -7,10 +7,9 @@ import { flatMap } from 'lodash';
 /**
  * Internal dependencies
  */
-import IconButton from '../icon-button';
+import ToolbarButton from '../toolbar-button';
 import DropdownMenu from '../dropdown-menu';
 import ToolbarContainer from './toolbar-container';
-import ToolbarButtonContainer from './toolbar-button-container';
 
 /**
  * Renders a toolbar with controls.
@@ -71,28 +70,11 @@ function Toolbar( { controls = [], children, className, isCollapsed, icon, label
 		<ToolbarContainer className={ classnames( 'components-toolbar', className ) }>
 			{ flatMap( controlSets, ( controlSet, indexOfSet ) => (
 				controlSet.map( ( control, indexOfControl ) => (
-					<ToolbarButtonContainer
+					<ToolbarButton
 						key={ [ indexOfSet, indexOfControl ].join() }
-						className={ indexOfSet > 0 && indexOfControl === 0 ? 'has-left-divider' : null }
-					>
-						<IconButton
-							icon={ control.icon }
-							label={ control.title }
-							shortcut={ control.shortcut }
-							data-subscript={ control.subscript }
-							onClick={ ( event ) => {
-								event.stopPropagation();
-								control.onClick();
-							} }
-							className={ classnames( 'components-toolbar__control', control.className, {
-								'is-active': control.isActive,
-							} ) }
-							aria-pressed={ control.isActive }
-							disabled={ control.isDisabled }
-							{ ...control.extraProps }
-						/>
-						{ control.children }
-					</ToolbarButtonContainer>
+						containerClassName={ indexOfSet > 0 && indexOfControl === 0 ? 'has-left-divider' : null }
+						{ ...control }
+					/>
 				) )
 			) ) }
 			{ children }
diff --git a/packages/components/src/toolbar/style.scss b/packages/components/src/toolbar/style.scss
index 13d609e3d65584..1356b9d83d4afd 100644
--- a/packages/components/src/toolbar/style.scss
+++ b/packages/components/src/toolbar/style.scss
@@ -39,81 +39,3 @@ div.components-toolbar {
 		}
 	}
 }
-
-.components-toolbar__control.components-button {
-	display: inline-flex;
-	align-items: flex-end;
-	margin: 0;
-	padding: 3px;
-	outline: none;
-	cursor: pointer;
-	position: relative;
-	width: $icon-button-size;
-	height: $icon-button-size;
-
-	// Unset icon button styles
-	&:active,
-	&:not([aria-disabled="true"]):hover,
-	&:not([aria-disabled="true"]):focus {
-		outline: none;
-		box-shadow: none;
-		background: none;
-		border: none;
-	}
-
-	// Disabled
-	&:disabled {
-		cursor: default;
-	}
-
-	& > svg {
-		padding: 5px;
-		border-radius: $radius-round-rectangle;
-		height: 30px;
-		width: 30px;
-	}
-
-	// Subscript for numbered icon buttons, like headings
-	&[data-subscript] svg {
-		padding: 5px 10px 5px 0;
-	}
-
-	&[data-subscript]::after {
-		content: attr(data-subscript);
-		font-family: $default-font;
-		font-size: $default-font-size;
-		font-weight: 600;
-		line-height: 12px;
-		position: absolute;
-		right: 8px;
-		bottom: 10px;
-	}
-
-	// Assign hover style to child element, not the button itself
-	&:not(:disabled):not([aria-disabled="true"]):hover {
-		box-shadow: none;
-	}
-
-	&:not(:disabled).is-active > svg,
-	&:not(:disabled):hover > svg {
-		@include formatting-button-style__hover;
-	}
-
-	// Active & toggled style
-	&:not(:disabled).is-active > svg {
-		@include formatting-button-style__active;
-	}
-
-	&:not(:disabled).is-active[data-subscript]::after {
-		color: $white;
-	}
-
-	// Focus style
-	&:not(:disabled):focus > svg {
-		@include formatting-button-style__focus;
-	}
-}
-
-.components-toolbar__control .dashicon {
-	display: block;
-}
diff --git a/packages/components/src/toolbar/test/index.js b/packages/components/src/toolbar/test/index.js
index 08a9def41e5d50..6abcad9c843440 100644
--- a/packages/components/src/toolbar/test/index.js
+++ b/packages/components/src/toolbar/test/index.js
@@ -20,7 +20,7 @@ describe( 'Toolbar', () => {
 			expect( toolbar.type() ).toBeNull();
 		} );
 
-		it( 'should render a list of controls with IconButtons', () => {
+		it( 'should render a list of controls with ToolbarButtons', () => {
 			const clickHandler = ( event ) => event;
 			const controls = [
 				{
@@ -32,17 +32,18 @@ describe( 'Toolbar', () => {
 				},
 			];
 			const toolbar = shallow( <Toolbar controls={ controls } /> );
-			const listItem = toolbar.find( 'IconButton' );
+			const listItem = toolbar.find( 'ToolbarButton' );
 			expect( listItem.props() ).toMatchObject( {
+				containerClassName: null,
 				icon: 'wordpress',
-				label: 'WordPress',
-				'data-subscript': 'wp',
-				'aria-pressed': false,
-				className: 'components-toolbar__control',
+				title: 'WordPress',
+				subscript: 'wp',
+				onClick: clickHandler,
+				isActive: false,
 			} );
 		} );
 
-		it( 'should render a list of controls with IconButtons and active control', () => {
+		it( 'should render a list of controls with ToolbarButtons and active control', () => {
 			const clickHandler = ( event ) => event;
 			const controls = [
 				{
@@ -54,10 +55,14 @@ describe( 'Toolbar', () => {
 				},
 			];
 			const toolbar = shallow( <Toolbar controls={ controls } /> );
-			const listItem = toolbar.find( 'IconButton' );
+			const listItem = toolbar.find( 'ToolbarButton' );
 			expect( listItem.props() ).toMatchObject( {
-				'aria-pressed': true,
-				className: 'components-toolbar__control is-active',
+				containerClassName: null,
+				icon: 'wordpress',
+				title: 'WordPress',
+				subscript: 'wp',
+				onClick: clickHandler,
+				isActive: true,
 			} );
 		} );
 
@@ -79,8 +84,8 @@ describe( 'Toolbar', () => {
 
 			const toolbar = shallow( <Toolbar controls={ controls } /> );
 			expect( toolbar.children() ).toHaveLength( 2 );
-			expect( toolbar.childAt( 0 ).hasClass( 'has-left-divider' ) ).toBe( false );
-			expect( toolbar.childAt( 1 ).hasClass( 'has-left-divider' ) ).toBe( true );
+			expect( toolbar.childAt( 0 ).prop( 'containerClassName' ) ).toBeNull();
+			expect( toolbar.childAt( 1 ).prop( 'containerClassName' ) ).toBe( 'has-left-divider' );
 		} );
 
 		it( 'should call the clickHandler on click.', () => {
@@ -96,10 +101,10 @@ describe( 'Toolbar', () => {
 				},
 			];
 			const toolbar = shallow( <Toolbar controls={ controls } /> );
-			const listItem = toolbar.find( 'IconButton' );
+			const listItem = toolbar.find( 'ToolbarButton' );
 			listItem.simulate( 'click', event );
 			expect( clickHandler ).toHaveBeenCalledTimes( 1 );
-			expect( clickHandler ).toHaveBeenCalledWith();
+			expect( clickHandler ).toHaveBeenCalledWith( event );
 		} );
 	} );
 } );
diff --git a/packages/data/CHANGELOG.md b/packages/data/CHANGELOG.md
index 5bb376f526d342..be148de7044963 100644
--- a/packages/data/CHANGELOG.md
+++ b/packages/data/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.0.0 (Unreleased)
+
+### Breaking Changes
+
+- Writing resolvers as async generators has been removed. Use the controls plugin instead.
+
 ## 2.1.4 (2018-10-19)
 
 ## 2.1.3 (2018-10-18)
diff --git a/packages/data/package.json b/packages/data/package.json
index df149b29db0fa3..f4ebe59ba50d02 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -23,7 +23,6 @@
 	"dependencies": {
 		"@babel/runtime": "^7.0.0",
 		"@wordpress/compose": "file:../compose",
-		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/element": "file:../element",
 		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
 		"@wordpress/redux-routine": "file:../redux-routine",
diff --git a/packages/data/src/plugins/async-generator/index.js b/packages/data/src/plugins/async-generator/index.js
deleted file mode 100644
index f6081753af9efb..00000000000000
--- a/packages/data/src/plugins/async-generator/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * External dependencies
- */
-import { applyMiddleware } from 'redux';
-import { get } from 'lodash';
-
-/**
- * Internal dependencies
- */
-import asyncGeneratorMiddleware, { toAsyncIterable } from './middleware';
-
-export default function( registry ) {
-	return {
-		registerStore( reducerKey, options ) {
-			const store = registry.registerStore( reducerKey, options );
-			const enhancer = applyMiddleware( asyncGeneratorMiddleware );
-			const createStore = () => store;
-			Object.assign(
-				store,
-				enhancer( createStore )( options.reducer )
-			);
-			return store;
-		},
-
-		async __experimentalFulfill( reducerKey, selectorName, ...args ) {
-			const resolver = get( registry.namespaces, [ reducerKey, 'resolvers', selectorName ] );
-			if ( ! resolver ) {
-				return;
-			}
-			const store = registry.namespaces[ reducerKey ].store;
-			const state = store.getState();
-			const action = resolver.fulfill( state, ...args );
-			if ( action ) {
-				await store.dispatch( toAsyncIterable( action ) );
-			}
-		},
-	};
-}
diff --git a/packages/data/src/plugins/async-generator/middleware.js b/packages/data/src/plugins/async-generator/middleware.js
deleted file mode 100644
index 14b9c2a083c66b..00000000000000
--- a/packages/data/src/plugins/async-generator/middleware.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * WordPress dependencies
- */
-import deprecated from '@wordpress/deprecated';
-
-/**
- * Returns true if the given argument appears to be a dispatchable action.
- *
- * @param {*} action Object to test.
- *
- * @return {boolean} Whether object is action-like.
- */
-function isActionLike( action ) {
-	return (
-		!! action &&
-		typeof action.type === 'string'
-	);
-}
-
-/**
- * Returns true if the given object is an async iterable, or false otherwise.
- *
- * @param {*} object Object to test.
- *
- * @return {boolean} Whether object is an async iterable.
- */
-function isAsyncIterable( object ) {
-	return (
-		!! object &&
-		typeof object[ Symbol.asyncIterator ] === 'function'
-	);
-}
-
-/**
- * Returns true if the given object is iterable, or false otherwise.
- *
- * @param {*} object Object to test.
- *
- * @return {boolean} Whether object is iterable.
- */
-function isIterable( object ) {
-	return (
-		!! object &&
-		typeof object[ Symbol.iterator ] === 'function'
-	);
-}
-
-/**
- * Normalizes the given object argument to an async iterable, asynchronously
- * yielding on a singular or array of generator yields or promise resolution.
- *
- * @param {*} object Object to normalize.
- *
- * @return {AsyncGenerator} Async iterable actions.
- */
-export function toAsyncIterable( object ) {
-	if ( isAsyncIterable( object ) ) {
-		deprecated( 'Writing Resolvers as async generators', {
-			alternative: 'resolvers as generators with controls',
-			plugin: 'Gutenberg',
-			version: 4.2,
-		} );
-		return object;
-	}
-
-	return ( async function* () {
-		// Normalize as iterable...
-		if ( ! isIterable( object ) ) {
-			object = [ object ];
-		}
-
-		for ( const maybeAction of object ) {
-			yield maybeAction;
-		}
-	}() );
-}
-
-/**
- * Simplest possible promise redux middleware.
- *
- * @param {Object} store Redux store.
- *
- * @return {function} middleware.
- */
-const asyncGeneratorMiddleware = ( store ) => ( next ) => ( action ) => {
-	if ( ! isAsyncIterable( action ) ) {
-		return next( action );
-	}
-
-	const runtime = async ( fulfillment ) => {
-		for await ( const maybeAction of fulfillment ) {
-		// Dispatch if it quacks like an action.
-			if ( isActionLike( maybeAction ) ) {
-				store.dispatch( maybeAction );
-			}
-		}
-	};
-
-	return runtime( action );
-};
-
-export default asyncGeneratorMiddleware;
diff --git a/packages/data/src/plugins/controls/index.js b/packages/data/src/plugins/controls/index.js
index f4c59ea35239df..bc19c9cfad897f 100644
--- a/packages/data/src/plugins/controls/index.js
+++ b/packages/data/src/plugins/controls/index.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { applyMiddleware } from 'redux';
-import { get } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -29,18 +28,5 @@ export default function( registry ) {
 
 			return store;
 		},
-
-		async __experimentalFulfill( reducerKey, selectorName, ...args ) {
-			if ( ! registry.namespaces[ reducerKey ].supportControls ) {
-				await registry.__experimentalFulfill( reducerKey, selectorName, ...args );
-				return;
-			}
-
-			const resolver = get( registry.namespaces, [ reducerKey, 'resolvers', selectorName ] );
-			if ( ! resolver ) {
-				return;
-			}
-			await registry.namespaces[ reducerKey ].store.dispatch( resolver.fulfill( ...args ) );
-		},
 	};
 }
diff --git a/packages/data/src/plugins/index.js b/packages/data/src/plugins/index.js
index 4d9f0ea4ba166c..587768f415911a 100644
--- a/packages/data/src/plugins/index.js
+++ b/packages/data/src/plugins/index.js
@@ -1,3 +1,2 @@
 export { default as controls } from './controls';
 export { default as persistence } from './persistence';
-export { default as asyncGenerator } from './async-generator';
diff --git a/packages/data/src/registry.js b/packages/data/src/registry.js
index 64202afe088e9a..2ed7217021563d 100644
--- a/packages/data/src/registry.js
+++ b/packages/data/src/registry.js
@@ -144,7 +144,7 @@ export function createRegistry( storeConfigs = {} ) {
 					}
 
 					startResolution( reducerKey, selectorName, args );
-					await registry.__experimentalFulfill( reducerKey, selectorName, ...args );
+					await fulfill( reducerKey, selectorName, ...args );
 					finishResolution( reducerKey, selectorName, args );
 				}
 
@@ -288,7 +288,6 @@ export function createRegistry( storeConfigs = {} ) {
 		select,
 		dispatch,
 		use,
-		__experimentalFulfill: fulfill,
 	};
 
 	/**
diff --git a/packages/data/src/test/registry.js b/packages/data/src/test/registry.js
index ce95db092d865f..2484bae4bd0b1e 100644
--- a/packages/data/src/test/registry.js
+++ b/packages/data/src/test/registry.js
@@ -7,7 +7,6 @@ import { castArray, mapValues } from 'lodash';
  * Internal dependencies
  */
 import { createRegistry } from '../registry';
-import { asyncGenerator } from '../plugins';
 
 describe( 'createRegistry', () => {
 	let registry;
@@ -278,94 +277,6 @@ describe( 'createRegistry', () => {
 		} );
 	} );
 
-	describe( 'async generators', () => {
-		it( 'should resolve mixed type action array to dispatch', () => {
-			registry.use( asyncGenerator );
-			const reducer = ( state = 0, action ) => {
-				return action.type === 'INCREMENT' ? state + 1 : state;
-			};
-			const selectors = {
-				getCount: ( state ) => state,
-			};
-			const resolvers = {
-				getCount: () => [
-					{ type: 'INCREMENT' },
-					Promise.resolve( { type: 'INCREMENT' } ),
-				],
-			};
-			registry.registerStore( 'counter', {
-				reducer,
-				selectors,
-				resolvers,
-			} );
-
-			const promise = subscribeUntil( [
-				() => registry.select( 'counter' ).getCount() === 2,
-				() => registry.select( 'core/data' ).hasFinishedResolution( 'counter', 'getCount' ),
-			] );
-
-			registry.select( 'counter' ).getCount();
-
-			return promise;
-		} );
-
-		it( 'should resolve generator action to dispatch', () => {
-			registry.use( asyncGenerator );
-			const reducer = ( state = 'NOTOK', action ) => {
-				return action.type === 'SET_OK' ? 'OK' : state;
-			};
-			const selectors = {
-				getValue: ( state ) => state,
-			};
-			const resolvers = {
-				* getValue() {
-					yield { type: 'SET_OK' };
-				},
-			};
-			registry.registerStore( 'demo', {
-				reducer,
-				selectors,
-				resolvers,
-			} );
-			const promise = subscribeUntil( [
-				() => registry.select( 'demo' ).getValue() === 'OK',
-				() => registry.select( 'core/data' ).hasFinishedResolution( 'demo', 'getValue' ),
-			] );
-
-			registry.select( 'demo' ).getValue();
-
-			return promise;
-		} );
-
-		it( 'should resolve async iterator action to dispatch', () => {
-			registry.use( asyncGenerator );
-			const reducer = ( state = 0, action ) => {
-				return action.type === 'INCREMENT' ? state + 1 : state;
-			};
-			const selectors = {
-				getCount: ( state ) => state,
-			};
-			const resolvers = {
-				getCount: async function* () {
-					yield { type: 'INCREMENT' };
-					yield await Promise.resolve( { type: 'INCREMENT' } );
-				},
-			};
-			registry.registerStore( 'counter', { reducer, selectors, resolvers } );
-
-			const promise = subscribeUntil( [
-				() => registry.select( 'counter' ).getCount() === 2,
-				() => registry.select( 'core/data' ).hasFinishedResolution( 'counter', 'getCount' ),
-			] );
-
-			registry.select( 'counter' ).getCount();
-
-			expect( console ).toHaveWarned();
-
-			return promise;
-		} );
-	} );
-
 	describe( 'select', () => {
 		it( 'registers multiple selectors to the public API', () => {
 			const store = registry.registerReducer( 'reducer1', () => 'state1' );
diff --git a/packages/date/CHANGELOG.md b/packages/date/CHANGELOG.md
index 28d8eb0727af4d..8f4fd9c895930c 100644
--- a/packages/date/CHANGELOG.md
+++ b/packages/date/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.2.0 (unreleased)
+
+### Breaking Change
+
+- Marked getSettings as experimental 
+
 ## 2.1.0 (2018-09-26)
 
 ### New Features
diff --git a/packages/date/src/index.js b/packages/date/src/index.js
index 96512152dbbf6d..124f7238d4608f 100644
--- a/packages/date/src/index.js
+++ b/packages/date/src/index.js
@@ -5,6 +5,11 @@ import momentLib from 'moment';
 import 'moment-timezone';
 import 'moment-timezone/moment-timezone-utils';
 
+/**
+ * WordPress dependencies
+ */
+import deprecated from '@wordpress/deprecated';
+
 // Changes made here will likely need to be made in `lib/client-assets.php` as
 // well because it uses the `setSettings()` function to change these settings.
 let settings = {
@@ -85,7 +90,18 @@ export function setSettings( dateSettings ) {
  *
  * @return {Object} Settings, including locale data.
  */
+export function __experimentalGetSettings() {
+	return settings;
+}
+
+// deprecations
 export function getSettings() {
+	deprecated( 'wp.date.getSettings', {
+		version: '4.4',
+		alternative: 'wp.date.__experimentalGetSettings',
+		plugin: 'Gutenberg',
+		hint: 'Unstable APIs are strongly discouraged to be used, and are subject to removal without notice.',
+	} );
 	return settings;
 }
 
diff --git a/packages/edit-post/CHANGELOG.md b/packages/edit-post/CHANGELOG.md
index 7a387817035b4b..a8e53349590dc7 100644
--- a/packages/edit-post/CHANGELOG.md
+++ b/packages/edit-post/CHANGELOG.md
@@ -1,4 +1,13 @@
-## 1.0.5 (Unreleased)
+## 2.0.0 (Unreleased)
+
+### Breaking Changes
+
+- `setActiveMetaBoxLocations` action (`core/edit-post`) has been removed.
+- `initializeMetaBoxState` action (`core/edit-post`) has been removed.
+- `initializeEditor` no longer returns an object. Use the `setActiveMetaBoxLocations` action (`core/edit-post`) in place of the existing object's `initializeMetaBoxes` function.
+- `setMetaBoxSavedData` action (`core/edit-post`) has been removed.
+- `getMetaBoxes` selector (`core/edit-post`) has been removed. Use `getActiveMetaBoxLocations` selector (`core/edit-post`) instead.
+- `getMetaBox` selector (`core/edit-post`) has been removed. Use `isMetaBoxLocationActive` selector (`core/edit-post`) instead.
 
 ### Bug Fixes
 
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index 0b5bd5d6d68f89..583cb9e0ce5271 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -31,6 +31,7 @@
 		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/editor": "file:../editor",
 		"@wordpress/element": "file:../element",
+		"@wordpress/format-library": "file:../format-library",
 		"@wordpress/hooks": "file:../hooks",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/keycodes": "file:../keycodes",
diff --git a/packages/edit-post/src/hooks/components/media-upload/index.js b/packages/edit-post/src/hooks/components/media-upload/index.js
index f950d34d628eee..b2eaa4d86fef5c 100644
--- a/packages/edit-post/src/hooks/components/media-upload/index.js
+++ b/packages/edit-post/src/hooks/components/media-upload/index.js
@@ -8,7 +8,6 @@ import { castArray, pick } from 'lodash';
  */
 import { Component } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import deprecated from '@wordpress/deprecated';
 
 // Getter for the sake of unit tests.
 const getGalleryDetailsMediaFrame = () => {
@@ -77,7 +76,6 @@ const getAttachmentsCollection = ( ids ) => {
 class MediaUpload extends Component {
 	constructor( {
 		allowedTypes,
-		type: deprecatedType,
 		multiple = false,
 		gallery = false,
 		title = __( 'Select or Upload Media' ),
@@ -91,19 +89,6 @@ class MediaUpload extends Component {
 		this.onUpdate = this.onUpdate.bind( this );
 		this.onClose = this.onClose.bind( this );
 
-		let allowedTypesToUse = allowedTypes;
-		if ( ! allowedTypes && deprecatedType ) {
-			deprecated( 'type property of wp.editor.MediaUpload', {
-				version: '4.2',
-				alternative: 'allowedTypes property containing an array with the allowedTypes or do not pass any property if all types are allowed',
-			} );
-			if ( deprecatedType === '*' ) {
-				allowedTypesToUse = undefined;
-			} else {
-				allowedTypesToUse = [ deprecatedType ];
-			}
-		}
-
 		if ( gallery ) {
 			const currentState = value ? 'gallery-edit' : 'gallery';
 			const GalleryDetailsMediaFrame = getGalleryDetailsMediaFrame();
@@ -113,7 +98,7 @@ class MediaUpload extends Component {
 				multiple,
 			} );
 			this.frame = new GalleryDetailsMediaFrame( {
-				mimeType: allowedTypesToUse,
+				mimeType: allowedTypes,
 				state: currentState,
 				multiple,
 				selection,
@@ -128,8 +113,8 @@ class MediaUpload extends Component {
 				},
 				multiple,
 			};
-			if ( !! allowedTypesToUse ) {
-				frameConfig.library = { type: allowedTypesToUse };
+			if ( !! allowedTypes ) {
+				frameConfig.library = { type: allowedTypes };
 			}
 
 			this.frame = wp.media( frameConfig );
diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
index 9797f877b6c8fa..70c8cf4d38fece 100644
--- a/packages/edit-post/src/index.js
+++ b/packages/edit-post/src/index.js
@@ -8,15 +8,13 @@ import '@wordpress/viewport';
 import { registerCoreBlocks } from '@wordpress/block-library';
 import { render, unmountComponentAtNode } from '@wordpress/element';
 import { dispatch } from '@wordpress/data';
-import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
 import './hooks';
 import './plugins';
-import store from './store';
-import { initializeMetaBoxState } from './store/actions';
+import './store';
 import Editor from './editor';
 
 /**
@@ -51,8 +49,6 @@ export function reinitializeEditor( postType, postId, target, settings, override
  * @param {Object}  postId        ID of the post to edit.
  * @param {?Object} settings      Editor settings object.
  * @param {Object}  overridePost  Post properties to override.
- *
- * @return {Object} Editor interface.
  */
 export function initializeEditor( id, postType, postId, settings, overridePost ) {
 	const target = document.getElementById( id );
@@ -71,18 +67,6 @@ export function initializeEditor( id, postType, postId, settings, overridePost )
 		<Editor settings={ settings } onError={ reboot } postId={ postId } postType={ postType } overridePost={ overridePost } />,
 		target
 	);
-
-	return {
-		initializeMetaBoxes( metaBoxes ) {
-			deprecated( 'editor.initializeMetaBoxes', {
-				alternative: 'setActiveMetaBoxLocations action (`core/edit-post`)',
-				plugin: 'Gutenberg',
-				version: '4.2',
-			} );
-
-			store.dispatch( initializeMetaBoxState( metaBoxes ) );
-		},
-	};
 }
 
 export { default as PluginBlockSettingsMenuItem } from './components/block-settings-menu/plugin-block-settings-menu-item';
diff --git a/packages/edit-post/src/store/actions.js b/packages/edit-post/src/store/actions.js
index 12bfb1b8aa6a91..6f52941d91748d 100644
--- a/packages/edit-post/src/store/actions.js
+++ b/packages/edit-post/src/store/actions.js
@@ -167,26 +167,6 @@ export function togglePinnedPluginItem( pluginName ) {
 	};
 }
 
-export function initializeMetaBoxState() {
-	deprecated( 'initializeMetaBoxState action (`core/edit-post`)', {
-		plugin: 'Gutenberg',
-		version: '4.2',
-	} );
-	return {
-		type: 'DO_NOTHING',
-	};
-}
-
-export function setActiveMetaBoxLocations() {
-	deprecated( 'setActiveMetaBoxLocations action (`core/edit-post`)', {
-		plugin: 'Gutenberg',
-		version: '4.2',
-	} );
-	return {
-		type: 'DO_NOTHING',
-	};
-}
-
 /**
  * Returns an action object used in signaling
  * what Meta boxes are available in which location.
@@ -224,22 +204,3 @@ export function metaBoxUpdatesSuccess() {
 	};
 }
 
-/**
- * Returns an action object used to set the saved meta boxes data.
- * This is used to check if the meta boxes have been touched when leaving the editor.
- *
- * @param   {Object} dataPerLocation Meta Boxes Data per location.
- *
- * @return {Object} Action object.
- */
-export function setMetaBoxSavedData( dataPerLocation ) {
-	deprecated( 'setMetaBoxSavedData action (`core/edit-post`)', {
-		plugin: 'Gutenberg',
-		version: '4.2',
-	} );
-
-	return {
-		type: 'META_BOX_SET_SAVED_DATA',
-		dataPerLocation,
-	};
-}
diff --git a/packages/edit-post/src/store/selectors.js b/packages/edit-post/src/store/selectors.js
index 0008d6a70990c0..8d7d41b76abae5 100644
--- a/packages/edit-post/src/store/selectors.js
+++ b/packages/edit-post/src/store/selectors.js
@@ -189,33 +189,6 @@ export function isPluginItemPinned( state, pluginName ) {
 	return get( pinnedPluginItems, [ pluginName ], true );
 }
 
-/**
- * Returns the state of legacy meta boxes.
- *
- * @param {Object} state Global application state.
- *
- * @return {Object} State of meta boxes.
- */
-export function getMetaBoxes( state ) {
-	deprecated( 'getMetaBox selector (`core/edit-post`)', {
-		alternative: 'getActiveMetaBoxLocations selector',
-		plugin: 'Gutenberg',
-		version: '4.2',
-	} );
-
-	return [
-		'normal',
-		'side',
-		'advanced',
-	].reduce( ( result, location ) => {
-		result[ location ] = {
-			isActive: isMetaBoxLocationActive( state, location ),
-		};
-
-		return result;
-	}, {} );
-}
-
 /**
  * Returns an array of active meta box locations.
  *
@@ -292,24 +265,6 @@ export const getAllMetaBoxes = createSelector(
 	]
 );
 
-/**
- * Returns the state of legacy meta boxes.
- *
- * @param {Object} state    Global application state.
- * @param {string} location Location of the meta box.
- *
- * @return {Object} State of meta box at specified location.
- */
-export function getMetaBox( state, location ) {
-	deprecated( 'getMetaBox selector (`core/edit-post`)', {
-		alternative: 'isMetaBoxLocationActive selector',
-		plugin: 'Gutenberg',
-		version: '4.2',
-	} );
-
-	return getMetaBoxes( state )[ location ];
-}
-
 /**
  * Returns true if the post is using Meta Boxes
  *
diff --git a/packages/edit-post/src/store/test/selectors.js b/packages/edit-post/src/store/test/selectors.js
index cd70c00d02f326..32dbce728572f9 100644
--- a/packages/edit-post/src/store/test/selectors.js
+++ b/packages/edit-post/src/store/test/selectors.js
@@ -16,10 +16,8 @@ import {
 	isPluginSidebarOpened,
 	getActiveGeneralSidebarName,
 	isPluginItemPinned,
-	getMetaBoxes,
 	hasMetaBoxes,
 	isSavingMetaBoxes,
-	getMetaBox,
 	getActiveMetaBoxLocations,
 	isMetaBoxLocationActive,
 	isEditorPanelEnabled,
@@ -414,52 +412,6 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( 'getMetaBoxes', () => {
-		it( 'should return the state of all meta boxes', () => {
-			const state = {
-				metaBoxes: {
-					locations: {
-						normal: [ 'postcustom' ],
-					},
-				},
-			};
-
-			const result = getMetaBoxes( state );
-
-			expect( deprecated ).toHaveBeenCalled();
-			expect( result ).toEqual( {
-				normal: {
-					isActive: true,
-				},
-				advanced: {
-					isActive: false,
-				},
-				side: {
-					isActive: false,
-				},
-			} );
-		} );
-	} );
-
-	describe( 'getMetaBox', () => {
-		it( 'should return the state of selected meta box', () => {
-			const state = {
-				metaBoxes: {
-					locations: {
-						side: [ 'postcustom' ],
-					},
-				},
-			};
-
-			const result = getMetaBox( state, 'side' );
-
-			expect( deprecated ).toHaveBeenCalled();
-			expect( result ).toEqual( {
-				isActive: true,
-			} );
-		} );
-	} );
-
 	describe( 'getActiveMetaBoxLocations', () => {
 		it( 'should return the active meta boxes', () => {
 			const state = {
diff --git a/packages/editor/CHANGELOG.md b/packages/editor/CHANGELOG.md
index 7af47476b5b705..b5f6e16bbe8e43 100644
--- a/packages/editor/CHANGELOG.md
+++ b/packages/editor/CHANGELOG.md
@@ -3,6 +3,8 @@
 ### Breaking Changes
 
 - The `labels.name` property has been removed from `MediaPlaceholder` in favor of the new `labels.instructions` prop.
+- The `UnsavedChangesWarning` component no longer accepts a `forceIsDirty` prop.
+- `mediaDetails` in object passed to `onFileChange` callback of `mediaUpload`. Please use `media_details` property instead.
 
 ### New Features
 
diff --git a/packages/editor/src/components/block-types-list/index.js b/packages/editor/src/components/block-types-list/index.js
index d27d0d96ea61ac..16ec272453a940 100644
--- a/packages/editor/src/components/block-types-list/index.js
+++ b/packages/editor/src/components/block-types-list/index.js
@@ -1,86 +1,45 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-import { noop } from 'lodash';
-
 /**
  * WordPress dependencies
  */
-import { Component } from '@wordpress/element';
 import { getBlockMenuDefaultClassName } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import BlockIcon from '../block-icon';
-
-class BlockTypesList extends Component {
-	render() {
-		const { items, onSelect, onHover = noop } = this.props;
-
-		return (
-			/*
-			 * Disable reason: The `list` ARIA role is redundant but
-			 * Safari+VoiceOver won't announce the list otherwise.
-			 */
-			/* eslint-disable jsx-a11y/no-redundant-roles */
-			<ul role="list" className="editor-block-types-list">
-				{ items.map( ( item ) => {
-					const itemIconStyle = item.icon ? {
-						backgroundColor: item.icon.background,
-						color: item.icon.foreground,
-					} : {};
-					const itemIconStackStyle = item.icon && item.icon.shadowColor ? {
-						backgroundColor: item.icon.shadowColor,
-					} : {};
-					return (
-						<li className="editor-block-types-list__list-item" key={ item.id }>
-							<button
-								className={
-									classnames(
-										'editor-block-types-list__item',
-										getBlockMenuDefaultClassName( item.id ),
-										{
-											'editor-block-types-list__item-has-children': item.hasChildBlocksWithInserterSupport,
-										}
-									)
-								}
-								onClick={ () => {
-									onSelect( item );
-									onHover( null );
-								} }
-								disabled={ item.isDisabled }
-								onMouseEnter={ () => onHover( item ) }
-								onMouseLeave={ () => onHover( null ) }
-								onFocus={ () => onHover( item ) }
-								onBlur={ () => onHover( null ) }
-								aria-label={ item.title } // Fix for IE11 and JAWS 2018.
-							>
-								<span
-									className="editor-block-types-list__item-icon"
-									style={ itemIconStyle }
-								>
-									<BlockIcon icon={ item.icon && item.icon.src } showColors />
-									{ item.hasChildBlocksWithInserterSupport &&
-									<span
-										className="editor-block-types-list__item-icon-stack"
-										style={ itemIconStackStyle }
-									/>
-									}
-								</span>
+import InserterListItem from '../inserter-list-item';
 
-								<span className="editor-block-types-list__item-title">
-									{ item.title }
-								</span>
-							</button>
-						</li>
-					);
-				} ) }
-			</ul>
-			/* eslint-enable jsx-a11y/no-redundant-roles */
-		);
-	}
+function BlockTypesList( { items, onSelect, onHover = () => {}, children } ) {
+	return (
+		/*
+		 * Disable reason: The `list` ARIA role is redundant but
+		 * Safari+VoiceOver won't announce the list otherwise.
+		 */
+		/* eslint-disable jsx-a11y/no-redundant-roles */
+		<ul role="list" className="editor-block-types-list">
+			{ items && items.map( ( item ) =>
+				<InserterListItem
+					key={ item.id }
+					className={ getBlockMenuDefaultClassName( item.id ) }
+					icon={ item.icon }
+					hasChildBlocksWithInserterSupport={
+						item.hasChildBlocksWithInserterSupport
+					}
+					onClick={ () => {
+						onSelect( item );
+						onHover( null );
+					} }
+					onFocus={ () => onHover( item ) }
+					onMouseEnter={ () => onHover( item ) }
+					onMouseLeave={ () => onHover( null ) }
+					onBlur={ () => onHover( null ) }
+					isDisabled={ item.isDisabled }
+					title={ item.title }
+				/>
+			) }
+			{ children }
+		</ul>
+		/* eslint-enable jsx-a11y/no-redundant-roles */
+	);
 }
 
 export default BlockTypesList;
diff --git a/packages/editor/src/components/block-types-list/style.scss b/packages/editor/src/components/block-types-list/style.scss
index f0ca494b7f8a34..b6ab6afd92516a 100644
--- a/packages/editor/src/components/block-types-list/style.scss
+++ b/packages/editor/src/components/block-types-list/style.scss
@@ -5,118 +5,3 @@
 	display: flex;
 	flex-wrap: wrap;
 }
-
-.editor-block-types-list__list-item {
-	display: block;
-	width: 33.33%;
-	padding: 0 4px;
-	margin: 0 0 12px;
-}
-
-.editor-block-types-list__item {
-	display: flex;
-	flex-direction: column;
-	width: 100%;
-	font-size: $default-font-size;
-	color: $dark-gray-700;
-	padding: 0;
-	align-items: stretch;
-	justify-content: center;
-	cursor: pointer;
-	background: transparent;
-	word-break: break-word;
-	border-radius: $radius-round-rectangle;
-	border: $border-width solid transparent;
-	transition: all 0.05s ease-in-out;
-	position: relative;
-
-	&:disabled {
-		@include block-style__disabled();
-	}
-
-	&:not(:disabled) {
-
-		// Show the hover background in a pseudo selector so it can be below "stacked" icons, like Columns.
-		&:hover::before {
-			content: "";
-			display: block;
-			@include block-style__hover();
-			position: absolute;
-			z-index: -1;
-			border-radius: $radius-round-rectangle;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			left: 0;
-		}
-
-		&:hover {
-			.editor-block-types-list__item-icon,
-			.editor-block-types-list__item-title {
-				color: currentColor;
-			}
-		}
-
-		&:active,
-		&.is-active,
-		&:focus {
-			position: relative;
-
-			// Show the focus style in the icon inside instead.
-			outline: none;
-			@include block-style__focus-active();
-
-			.editor-block-types-list__item-icon,
-			.editor-block-types-list__item-title {
-				color: currentColor;
-			}
-		}
-	}
-}
-
-.editor-block-types-list__item-icon {
-	padding: 12px 20px;
-	border-radius: $radius-round-rectangle;
-	color: $dark-gray-500;
-	transition: all 0.05s ease-in-out;
-
-	.editor-block-icon {
-		margin-left: auto;
-		margin-right: auto;
-	}
-
-	svg {
-		transition: all 0.15s ease-out;
-	}
-}
-
-.editor-block-types-list__item-title {
-	padding: 4px 2px 8px;
-}
-
-.editor-block-types-list__item-has-children {
-	.editor-block-types-list__item-icon {
-		background: $white;
-		margin-right: 3px;
-		margin-bottom: 6px;
-		padding: 9px 20px 9px;
-		position: relative;
-		top: -2px;
-		left: -2px;
-		box-shadow: 0 0 0 1px $light-gray-500;
-	}
-
-	// Show a "stacked card" below an item that has children.
-	.editor-block-types-list__item-icon-stack {
-		display: block;
-		background: $white;
-		box-shadow: 0 0 0 1px $light-gray-500;
-		width: 100%;
-		height: 100%;
-		position: absolute;
-		z-index: -1; // Show below the card as a shadow
-		bottom: -6px;
-		right: -6px;
-		border-radius: 4px;
-	}
-}
diff --git a/packages/editor/src/components/inserter-list-item/index.js b/packages/editor/src/components/inserter-list-item/index.js
new file mode 100644
index 00000000000000..b5b3a508ff3765
--- /dev/null
+++ b/packages/editor/src/components/inserter-list-item/index.js
@@ -0,0 +1,76 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
+/**
+ * WordPress dependencies
+ */
+import { normalizeIconObject } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import BlockIcon from '../block-icon';
+
+function InserterListItem( {
+	icon,
+	hasChildBlocksWithInserterSupport,
+	onClick,
+	isDisabled,
+	title,
+	className,
+	...props
+} ) {
+	icon = normalizeIconObject( icon );
+
+	const itemIconStyle = icon ? {
+		backgroundColor: icon.background,
+		color: icon.foreground,
+	} : {};
+	const itemIconStackStyle = icon && icon.shadowColor ? {
+		backgroundColor: icon.shadowColor,
+	} : {};
+
+	return (
+		<li className="editor-block-types-list__list-item">
+			<button
+				className={
+					classnames(
+						'editor-block-types-list__item',
+						className,
+						{
+							'editor-block-types-list__item-has-children':
+								hasChildBlocksWithInserterSupport,
+						}
+					)
+				}
+				onClick={ ( event ) => {
+					event.preventDefault();
+					onClick();
+				} }
+				disabled={ isDisabled }
+				aria-label={ title } // Fix for IE11 and JAWS 2018.
+				{ ...props }
+			>
+				<span
+					className="editor-block-types-list__item-icon"
+					style={ itemIconStyle }
+				>
+					<BlockIcon icon={ icon && icon.src } showColors />
+					{ hasChildBlocksWithInserterSupport &&
+						<span
+							className="editor-block-types-list__item-icon-stack"
+							style={ itemIconStackStyle }
+						/>
+					}
+				</span>
+				<span className="editor-block-types-list__item-title">
+					{ title }
+				</span>
+			</button>
+		</li>
+	);
+}
+
+export default InserterListItem;
diff --git a/packages/editor/src/components/inserter-list-item/style.scss b/packages/editor/src/components/inserter-list-item/style.scss
new file mode 100644
index 00000000000000..7a3b97c05c9c9c
--- /dev/null
+++ b/packages/editor/src/components/inserter-list-item/style.scss
@@ -0,0 +1,114 @@
+.editor-block-types-list__list-item {
+	display: block;
+	width: 33.33%;
+	padding: 0 4px;
+	margin: 0 0 12px;
+}
+
+.editor-block-types-list__item {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+	font-size: $default-font-size;
+	color: $dark-gray-700;
+	padding: 0;
+	align-items: stretch;
+	justify-content: center;
+	cursor: pointer;
+	background: transparent;
+	word-break: break-word;
+	border-radius: $radius-round-rectangle;
+	border: $border-width solid transparent;
+	transition: all 0.05s ease-in-out;
+	position: relative;
+
+	&:disabled {
+		@include block-style__disabled();
+	}
+
+	&:not(:disabled) {
+
+		// Show the hover background in a pseudo selector so it can be below "stacked" icons, like Columns.
+		&:hover::before {
+			content: "";
+			display: block;
+			@include block-style__hover();
+			position: absolute;
+			z-index: -1;
+			border-radius: $radius-round-rectangle;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+		}
+
+		&:hover {
+			.editor-block-types-list__item-icon,
+			.editor-block-types-list__item-title {
+				color: currentColor;
+			}
+		}
+
+		&:active,
+		&.is-active,
+		&:focus {
+			position: relative;
+
+			// Show the focus style in the icon inside instead.
+			outline: none;
+			@include block-style__focus-active();
+
+			.editor-block-types-list__item-icon,
+			.editor-block-types-list__item-title {
+				color: currentColor;
+			}
+		}
+	}
+}
+
+.editor-block-types-list__item-icon {
+	padding: 12px 20px;
+	border-radius: $radius-round-rectangle;
+	color: $dark-gray-500;
+	transition: all 0.05s ease-in-out;
+
+	.editor-block-icon {
+		margin-left: auto;
+		margin-right: auto;
+	}
+
+	svg {
+		transition: all 0.15s ease-out;
+	}
+}
+
+.editor-block-types-list__item-title {
+	padding: 4px 2px 8px;
+}
+
+.editor-block-types-list__item-has-children {
+	.editor-block-types-list__item-icon {
+		background: $white;
+		margin-right: 3px;
+		margin-bottom: 6px;
+		padding: 9px 20px 9px;
+		position: relative;
+		top: -2px;
+		left: -2px;
+		box-shadow: 0 0 0 1px $light-gray-500;
+	}
+
+	// Show a "stacked card" below an item that has children.
+	.editor-block-types-list__item-icon-stack {
+		display: block;
+		background: $white;
+		box-shadow: 0 0 0 1px $light-gray-500;
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		z-index: -1; // Show below the card as a shadow
+		bottom: -6px;
+		right: -6px;
+		border-radius: 4px;
+	}
+}
diff --git a/packages/editor/src/components/inserter/index.js b/packages/editor/src/components/inserter/index.js
index 73a971a7de5c73..720198626a85c9 100644
--- a/packages/editor/src/components/inserter/index.js
+++ b/packages/editor/src/components/inserter/index.js
@@ -13,8 +13,6 @@ import { compose } from '@wordpress/compose';
  */
 import InserterMenu from './menu';
 
-export { default as InserterResultsPortal } from './results-portal';
-
 const defaultRenderToggle = ( { onToggle, disabled, isOpen } ) => (
 	<IconButton
 		icon="insert"
diff --git a/packages/editor/src/components/inserter/inline-elements.js b/packages/editor/src/components/inserter/inline-elements.js
new file mode 100644
index 00000000000000..ee45d0ea3536d4
--- /dev/null
+++ b/packages/editor/src/components/inserter/inline-elements.js
@@ -0,0 +1,35 @@
+/**
+ * External dependencies
+ */
+import { isEmpty } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { PanelBody, Slot } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import BlockTypesList from '../block-types-list';
+
+const InserterInlineElements = ( { filterValue } ) => {
+	return (
+		<Slot name="Inserter.InlineElements" fillProps={ { filterValue } }>
+			{ ( fills ) => ! isEmpty( fills ) && (
+				<PanelBody
+					title={ __( 'Inline Elements' ) }
+					initialOpen={ false }
+					className="editor-inserter__inline-elements"
+				>
+					<BlockTypesList>
+						{ fills }
+					</BlockTypesList>
+				</PanelBody>
+			) }
+		</Slot>
+	);
+};
+
+export default InserterInlineElements;
diff --git a/packages/editor/src/components/inserter/menu.js b/packages/editor/src/components/inserter/menu.js
index 95ba3e12494e5f..1a30907b755391 100644
--- a/packages/editor/src/components/inserter/menu.js
+++ b/packages/editor/src/components/inserter/menu.js
@@ -33,7 +33,7 @@ import { withInstanceId, compose, withSafeTimeout } from '@wordpress/compose';
 import BlockPreview from '../block-preview';
 import BlockTypesList from '../block-types-list';
 import ChildBlocks from './child-blocks';
-import InserterResultsPortal from './results-portal';
+import InserterInlineElements from './inline-elements';
 
 const MAX_SUGGESTED_ITEMS = 9;
 
@@ -269,7 +269,7 @@ export class InserterMenu extends Component {
 						</PanelBody>
 					}
 
-					<InserterResultsPortal.Slot fillProps={ { filterValue } } />
+					<InserterInlineElements filterValue={ filterValue } />
 
 					{ map( getCategories(), ( category ) => {
 						const categoryItems = itemsPerCategory[ category.slug ];
diff --git a/packages/editor/src/components/inserter/results-portal.js b/packages/editor/src/components/inserter/results-portal.js
deleted file mode 100644
index 075bd2109aacf1..00000000000000
--- a/packages/editor/src/components/inserter/results-portal.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createSlotFill, PanelBody } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import BlockTypesList from '../block-types-list';
-import { searchItems } from './menu';
-
-const { Fill, Slot } = createSlotFill( 'InserterResultsPortal' );
-
-const InserterResultsPortal = ( { items, title, onSelect, onHover, ...props } ) => {
-	return (
-		<Fill>
-			{ ( { filterValue } ) => {
-				const filteredItems = searchItems( items, filterValue );
-
-				if ( ! filteredItems.length ) {
-					return null;
-				}
-
-				return (
-					<PanelBody
-						title={ title }
-						{ ...props }
-						className="editor-inserter__results-portal"
-					>
-						<BlockTypesList items={ filteredItems } onSelect={ onSelect } onHover={ onHover } />
-					</PanelBody>
-				);
-			} }
-		</Fill>
-	);
-};
-
-InserterResultsPortal.Slot = Slot;
-
-export default InserterResultsPortal;
diff --git a/packages/editor/src/components/inserter/style.scss b/packages/editor/src/components/inserter/style.scss
index ed8bff278e5b48..5423cae2cc32cd 100644
--- a/packages/editor/src/components/inserter/style.scss
+++ b/packages/editor/src/components/inserter/style.scss
@@ -56,7 +56,7 @@ $block-inserter-search-height: 38px;
 	}
 }
 
-.editor-inserter__results-portal {
+.editor-inserter__inline-elements {
 	margin-top: -1px;
 }
 
diff --git a/packages/editor/src/components/media-placeholder/index.js b/packages/editor/src/components/media-placeholder/index.js
index adcd565acc1afa..c4d4feab34d5a0 100644
--- a/packages/editor/src/components/media-placeholder/index.js
+++ b/packages/editor/src/components/media-placeholder/index.js
@@ -16,7 +16,6 @@ import {
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
-import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -64,25 +63,8 @@ class MediaPlaceholder extends Component {
 		this.closeURLInput = this.closeURLInput.bind( this );
 	}
 
-	getAllowedTypes() {
-		const { allowedTypes, type: deprecatedType } = this.props;
-		let allowedTypesToUse = allowedTypes;
-		if ( ! allowedTypes && deprecatedType ) {
-			deprecated( 'type property of wp.editor.MediaPlaceholder', {
-				version: '4.2',
-				alternative: 'allowedTypes property containing an array with the allowedTypes or do not pass any property if all types are allowed',
-			} );
-			if ( deprecatedType === '*' ) {
-				allowedTypesToUse = undefined;
-			} else {
-				allowedTypesToUse = [ deprecatedType ];
-			}
-		}
-		return allowedTypesToUse;
-	}
-
 	onlyAllowsImages() {
-		const allowedTypes = this.getAllowedTypes();
+		const { allowedTypes } = this.props;
 		if ( ! allowedTypes ) {
 			return false;
 		}
@@ -118,8 +100,7 @@ class MediaPlaceholder extends Component {
 	}
 
 	onFilesUpload( files ) {
-		const { onSelect, multiple, onError } = this.props;
-		const allowedTypes = this.getAllowedTypes();
+		const { onSelect, multiple, onError, allowedTypes } = this.props;
 		const setMedia = multiple ? onSelect : ( [ media ] ) => onSelect( media );
 		mediaUpload( {
 			allowedTypes,
@@ -149,6 +130,7 @@ class MediaPlaceholder extends Component {
 			onHTMLDrop = noop,
 			multiple = false,
 			notices,
+			allowedTypes,
 		} = this.props;
 
 		const {
@@ -156,8 +138,6 @@ class MediaPlaceholder extends Component {
 			src,
 		} = this.state;
 
-		const allowedTypes = this.getAllowedTypes();
-
 		let instructions = labels.instructions || '';
 		let title = labels.title || '';
 		if ( ! instructions || ! title ) {
diff --git a/packages/editor/src/components/post-publish-button/index.js b/packages/editor/src/components/post-publish-button/index.js
index 3cd74e24e9f13d..842f04554c10d2 100644
--- a/packages/editor/src/components/post-publish-button/index.js
+++ b/packages/editor/src/components/post-publish-button/index.js
@@ -82,6 +82,7 @@ export default compose( [
 			getEditedPostVisibility,
 			isEditedPostSaveable,
 			isEditedPostPublishable,
+			isPostSavingLocked,
 			getCurrentPost,
 			getCurrentPostType,
 		} = select( 'core/editor' );
@@ -89,7 +90,7 @@ export default compose( [
 			isSaving: forceIsSaving || isSavingPost(),
 			isBeingScheduled: isEditedPostBeingScheduled(),
 			visibility: getEditedPostVisibility(),
-			isSaveable: isEditedPostSaveable(),
+			isSaveable: isEditedPostSaveable() && ! isPostSavingLocked(),
 			isPublishable: forceIsDirty || isEditedPostPublishable(),
 			hasPublishAction: get( getCurrentPost(), [ '_links', 'wp:action-publish' ], false ),
 			postType: getCurrentPostType(),
diff --git a/packages/editor/src/components/post-publish-panel/index.js b/packages/editor/src/components/post-publish-panel/index.js
index df40d1f98d5add..179792024788ef 100644
--- a/packages/editor/src/components/post-publish-panel/index.js
+++ b/packages/editor/src/components/post-publish-panel/index.js
@@ -56,7 +56,7 @@ export class PostPublishPanel extends Component {
 			...additionalProps
 		} = this.props;
 		const isPublishedOrScheduled = isPublished || ( isScheduled && isBeingScheduled );
-		const propsForPanel = omit( additionalProps, [ 'hasPublishAction' ] );
+		const propsForPanel = omit( additionalProps, [ 'hasPublishAction', 'isDirty' ] );
 		return (
 			<div className="editor-post-publish-panel" { ...propsForPanel }>
 				<div className="editor-post-publish-panel__header">
diff --git a/packages/editor/src/components/post-schedule/index.js b/packages/editor/src/components/post-schedule/index.js
index 9c4a02230f93b3..daf37674780abf 100644
--- a/packages/editor/src/components/post-schedule/index.js
+++ b/packages/editor/src/components/post-schedule/index.js
@@ -1,13 +1,13 @@
 /**
  * WordPress dependencies
  */
-import { getSettings } from '@wordpress/date';
+import { __experimentalGetSettings } from '@wordpress/date';
 import { withSelect, withDispatch } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 import { DateTimePicker } from '@wordpress/components';
 
 export function PostSchedule( { date, onUpdateDate } ) {
-	const settings = getSettings();
+	const settings = __experimentalGetSettings();
 	// To know if the current timezone is a 12 hour time with look for "a" in the time format
 	// We also make sure this a is not escaped by a "/"
 	const is12HourTime = /a(?!\\)/i.test(
diff --git a/packages/editor/src/components/post-schedule/label.js b/packages/editor/src/components/post-schedule/label.js
index 584324e55249ad..4a479246cc700b 100644
--- a/packages/editor/src/components/post-schedule/label.js
+++ b/packages/editor/src/components/post-schedule/label.js
@@ -2,11 +2,11 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { dateI18n, getSettings } from '@wordpress/date';
+import { dateI18n, __experimentalGetSettings } from '@wordpress/date';
 import { withSelect } from '@wordpress/data';
 
 export function PostScheduleLabel( { date, isFloating } ) {
-	const settings = getSettings();
+	const settings = __experimentalGetSettings();
 
 	return date && ! isFloating ?
 		dateI18n( settings.formats.datetimeAbbreviated, date ) :
diff --git a/packages/editor/src/components/rich-text/core-tokens/image/index.js b/packages/editor/src/components/rich-text/core-tokens/image/index.js
deleted file mode 100644
index 01e73d8847138f..00000000000000
--- a/packages/editor/src/components/rich-text/core-tokens/image/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { SVG, Path } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import MediaUpload from '../../../media-upload';
-
-export const name = 'core/image';
-
-const ALLOWED_MEDIA_TYPES = [ 'image' ];
-
-export const settings = {
-	id: 'image',
-
-	title: __( 'Inline Image' ),
-
-	type: 'image',
-
-	icon: <SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><Path d="M4 16h10c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2H4c-1.1 0-2 .9-2 2v9c0 1.1.9 2 2 2zM4 5h10v9H4V5zm14 9v2h4v-2h-4zM2 20h20v-2H2v2zm6.4-8.8L7 9.4 5 12h8l-2.6-3.4-2 2.6z" /></SVG>,
-
-	edit( { onSave } ) {
-		return (
-			<MediaUpload
-				allowedTypes={ ALLOWED_MEDIA_TYPES }
-				onSelect={ ( media ) => onSave( media ) }
-				onClose={ () => onSave( null ) }
-				render={ ( { open } ) => {
-					open();
-					return null;
-				} }
-			/>
-		);
-	},
-
-	save( { id, url, alt, width } ) {
-		return (
-			<img
-				className={ `wp-image-${ id }` }
-				// set width in style attribute to prevent Block CSS from overriding it
-				style={ { width: `${ Math.min( width, 150 ) }px` } }
-				src={ url }
-				alt={ alt }
-			/>
-		);
-	},
-};
diff --git a/packages/editor/src/components/rich-text/core-tokens/image/style.scss b/packages/editor/src/components/rich-text/core-tokens/image/style.scss
deleted file mode 100644
index 0d5a879e52ce2f..00000000000000
--- a/packages/editor/src/components/rich-text/core-tokens/image/style.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.mce-content-body div.mce-resizehandle {
-	border-radius: 50%;
-	border: 2px solid $white;
-	width: 15px !important;
-	height: 15px !important;
-	position: absolute;
-	background: theme(primary);
-	padding: 0 3px 3px 0;
-	box-sizing: border-box;
-	cursor: se-resize;
-}
diff --git a/packages/editor/src/components/rich-text/core-tokens/index.js b/packages/editor/src/components/rich-text/core-tokens/index.js
deleted file mode 100644
index ecb16927589f6d..00000000000000
--- a/packages/editor/src/components/rich-text/core-tokens/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Internal dependencies
- */
-import * as image from './image';
-
-export { image };
diff --git a/packages/editor/src/components/rich-text/format-edit.js b/packages/editor/src/components/rich-text/format-edit.js
new file mode 100644
index 00000000000000..20d3c9258025fc
--- /dev/null
+++ b/packages/editor/src/components/rich-text/format-edit.js
@@ -0,0 +1,103 @@
+/**
+ * WordPress dependencies
+ */
+import { Component, Fragment } from '@wordpress/element';
+import { getActiveFormat, getFormatTypes } from '@wordpress/rich-text';
+import { Fill, KeyboardShortcuts, ToolbarButton } from '@wordpress/components';
+import { rawShortcut } from '@wordpress/keycodes';
+
+/**
+ * Internal dependencies
+ */
+import InserterListItem from '../inserter-list-item';
+import { normalizeTerm } from '../inserter/menu';
+
+function isResult( { title, keywords = [] }, filterValue ) {
+	const normalizedSearchTerm = normalizeTerm( filterValue );
+	const matchSearch = ( string ) => normalizeTerm( string ).indexOf( normalizedSearchTerm ) !== -1;
+	return matchSearch( title ) || keywords.some( matchSearch );
+}
+
+function FillToolbarButton( { name, ...props } ) {
+	return (
+		<Fill name={ `RichText.ToolbarControls.${ name }` }>
+			<ToolbarButton { ...props } />
+		</Fill>
+	);
+}
+
+function FillInserterListItem( props ) {
+	return (
+		<Fill name="Inserter.InlineElements">
+			{ ( { filterValue } ) => {
+				if ( filterValue && ! isResult( props, filterValue ) ) {
+					return null;
+				}
+
+				return <InserterListItem { ...props } />;
+			} }
+		</Fill>
+	);
+}
+
+class Shortcut extends Component {
+	constructor() {
+		super( ...arguments );
+
+		this.onUse = this.onUse.bind( this );
+	}
+
+	onUse() {
+		this.props.onUse();
+		return false;
+	}
+
+	render() {
+		const { character, type } = this.props;
+
+		return (
+			<KeyboardShortcuts
+				bindGlobal
+				shortcuts={ {
+					[ rawShortcut[ type ]( character ) ]: this.onUse,
+				} }
+			/>
+		);
+	}
+}
+
+const FormatEdit = ( { onChange, value } ) => {
+	return (
+		<Fragment>
+			{ getFormatTypes().map( ( { name, edit: Edit, keywords } ) => {
+				if ( ! Edit ) {
+					return null;
+				}
+
+				const activeFormat = getActiveFormat( value, name );
+				const isActive = activeFormat !== undefined;
+				const activeAttributes = isActive ? activeFormat.attributes || {} : {};
+
+				return (
+					<Edit
+						key={ name }
+						isActive={ isActive }
+						activeAttributes={ activeAttributes }
+						value={ value }
+						onChange={ onChange }
+						ToolbarButton={ FillToolbarButton }
+						InserterListItem={ ( props ) =>
+							<FillInserterListItem
+								keywords={ keywords }
+								{ ...props }
+							/>
+						}
+						Shortcut={ Shortcut }
+					/>
+				);
+			} ) }
+		</Fragment>
+	);
+};
+
+export default FormatEdit;
diff --git a/packages/editor/src/components/rich-text/format-toolbar/index.js b/packages/editor/src/components/rich-text/format-toolbar/index.js
index a4a4f4f1ed4b68..5eda88f589edf3 100644
--- a/packages/editor/src/components/rich-text/format-toolbar/index.js
+++ b/packages/editor/src/components/rich-text/format-toolbar/index.js
@@ -1,162 +1,19 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
-import {
-	Toolbar,
-	withSpokenMessages,
-} from '@wordpress/components';
-import { rawShortcut } from '@wordpress/keycodes';
-import { Component } from '@wordpress/element';
-import {
-	applyFormat,
-	removeFormat,
-	getActiveFormat,
-	getTextContent,
-	slice,
-} from '@wordpress/rich-text';
-import { isURL } from '@wordpress/url';
 
-/**
- * Internal dependencies
- */
-import { FORMATTING_CONTROLS } from '../formatting-controls';
-import LinkContainer from './link-container';
-import ToolbarContainer from './toolbar-container';
-
-class FormatToolbar extends Component {
-	constructor( { editor } ) {
-		super( ...arguments );
-
-		this.removeLink = this.removeLink.bind( this );
-		this.addLink = this.addLink.bind( this );
-		this.stopAddingLink = this.stopAddingLink.bind( this );
-		this.applyFormat = this.applyFormat.bind( this );
-		this.removeFormat = this.removeFormat.bind( this );
-		this.getActiveFormat = this.getActiveFormat.bind( this );
-		this.toggleFormat = this.toggleFormat.bind( this );
-
-		this.state = {
-			addingLink: false,
-		};
-
-		if ( editor ) {
-			editor.shortcuts.add( rawShortcut.primary( 'k' ), '', this.addLink );
-			editor.shortcuts.add( rawShortcut.access( 'a' ), '', this.addLink );
-			editor.shortcuts.add( rawShortcut.access( 's' ), '', this.removeLink );
-			editor.shortcuts.add( rawShortcut.access( 'd' ), '', () => this.toggleFormat( { type: 'del' } ) );
-			editor.shortcuts.add( rawShortcut.access( 'x' ), '', () => this.toggleFormat( { type: 'code' } ) );
-		}
-	}
-
-	removeLink() {
-		this.removeFormat( 'a' );
-		this.props.speak( __( 'Link removed.' ), 'assertive' );
-	}
-
-	addLink() {
-		const text = getTextContent( slice( this.props.record ) );
-
-		if ( text && isURL( text ) ) {
-			this.applyFormat( {
-				type: 'a',
-				attributes: {
-					href: text,
-				},
-			} );
-		} else {
-			this.setState( { addingLink: true } );
-		}
-	}
-
-	stopAddingLink() {
-		this.setState( { addingLink: false } );
-	}
-
-	/**
-	 * Apply a format with the current value and selection.
-	 *
-	 * @param {Object} format The format to apply.
-	 */
-	applyFormat( format ) {
-		this.props.onChange( applyFormat( this.props.record, format ) );
-	}
-
-	/**
-	 * Remove a format from the current value with the current selection.
-	 *
-	 * @param {string} formatType The type of format to remove.
-	 */
-	removeFormat( formatType ) {
-		this.props.onChange( removeFormat( this.props.record, formatType ) );
-	}
-
-	/**
-	 * Get the current format based on the selection
-	 *
-	 * @param {string} formatType The type of format to check.
-	 *
-	 * @return {boolean} Whether the format is active or not.
-	 */
-	getActiveFormat( formatType ) {
-		return getActiveFormat( this.props.record, formatType );
-	}
-
-	/**
-	 * Toggle a format based on the selection.
-	 *
-	 * @param {Object} format The format to toggle.
-	 */
-	toggleFormat( format ) {
-		if ( this.getActiveFormat( format.type ) ) {
-			this.removeFormat( format.type );
-		} else {
-			this.applyFormat( format );
-		}
-	}
-
-	render() {
-		const link = this.getActiveFormat( 'a' );
-		const toolbarControls = FORMATTING_CONTROLS
-			.filter( ( control ) => this.props.enabledControls.indexOf( control.format ) !== -1 )
-			.map( ( control ) => {
-				if ( control.format === 'link' ) {
-					const linkIsActive = link !== undefined;
-
-					return {
-						...control,
-						shortcut: linkIsActive ? control.activeShortcut : control.shortcut,
-						icon: linkIsActive ? 'editor-unlink' : 'admin-links', // TODO: Need proper unlink icon
-						title: linkIsActive ? __( 'Unlink' ) : __( 'Link' ),
-						onClick: linkIsActive ? this.removeLink : this.addLink,
-						isActive: !! linkIsActive,
-					};
-				}
-
-				return {
-					...control,
-					onClick: () => this.toggleFormat( { type: control.selector } ),
-					isActive: this.getActiveFormat( control.selector ) !== undefined,
-				};
-			} );
-
-		return (
-			<ToolbarContainer>
-				<Toolbar controls={ toolbarControls } />
-				<LinkContainer
-					link={ link }
-					record={ this.props.record }
-					onChange={ this.props.onChange }
-					applyFormat={ this.applyFormat }
-					removeFormat={ this.removeFormat }
-					getActiveFormat={ this.getActiveFormat }
-					toggleFormat={ this.toggleFormat }
-					addingLink={ this.state.addingLink }
-					stopAddingLink={ this.stopAddingLink }
-				/>
-			</ToolbarContainer>
-		);
-	}
-}
-
-export default withSpokenMessages( FormatToolbar );
+import { Toolbar, Slot } from '@wordpress/components';
+
+const FormatToolbar = ( { controls } ) => {
+	return (
+		<div className="editor-format-toolbar">
+			<Toolbar>
+				{ controls.map( ( format ) =>
+					<Slot name={ `RichText.ToolbarControls.${ format }` } key={ format } />
+				) }
+			</Toolbar>
+		</div>
+	);
+};
+
+export default FormatToolbar;
diff --git a/packages/editor/src/components/rich-text/format-toolbar/style.scss b/packages/editor/src/components/rich-text/format-toolbar/style.scss
index 5ae6291e3262f6..2b6fa1e5c07b5d 100644
--- a/packages/editor/src/components/rich-text/format-toolbar/style.scss
+++ b/packages/editor/src/components/rich-text/format-toolbar/style.scss
@@ -7,18 +7,3 @@
 	position: absolute;
 	transform: translateX(-50%);
 }
-
-.editor-format-toolbar__link-container-content {
-	display: flex;
-}
-
-.editor-format-toolbar__link-container-value {
-	margin: $grid-size - $border-width;
-	flex-grow: 1;
-	flex-shrink: 1;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	min-width: 150px;
-	max-width: 500px;
-}
diff --git a/packages/editor/src/components/rich-text/format-toolbar/toolbar-container.js b/packages/editor/src/components/rich-text/format-toolbar/toolbar-container.js
deleted file mode 100644
index effed4d9271811..00000000000000
--- a/packages/editor/src/components/rich-text/format-toolbar/toolbar-container.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const ToolbarContainer = ( props ) => (
-	<div
-		className="editor-format-toolbar"
-	>
-		{ props.children }
-	</div>
-);
-export default ToolbarContainer;
diff --git a/packages/editor/src/components/rich-text/formatting-controls.js b/packages/editor/src/components/rich-text/formatting-controls.js
deleted file mode 100644
index 2699a17fbbe7ca..00000000000000
--- a/packages/editor/src/components/rich-text/formatting-controls.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { displayShortcut } from '@wordpress/keycodes';
-
-export const FORMATTING_CONTROLS = [
-	{
-		icon: 'editor-bold',
-		title: __( 'Bold' ),
-		shortcut: displayShortcut.primary( 'b' ),
-		format: 'bold',
-		selector: 'strong',
-	},
-	{
-		icon: 'editor-italic',
-		title: __( 'Italic' ),
-		shortcut: displayShortcut.primary( 'i' ),
-		format: 'italic',
-		selector: 'em',
-	},
-	{
-		icon: 'admin-links',
-		title: __( 'Link' ),
-		shortcut: displayShortcut.primary( 'k' ),
-		activeShortcut: displayShortcut.access( 's' ),
-		format: 'link',
-		selector: 'a',
-	},
-	{
-		icon: 'editor-strikethrough',
-		title: __( 'Strikethrough' ),
-		shortcut: displayShortcut.access( 'd' ),
-		format: 'strikethrough',
-		selector: 'del',
-	},
-];
diff --git a/packages/editor/src/components/rich-text/index.js b/packages/editor/src/components/rich-text/index.js
index 582c75c0a1e415..20cf3555bb8bda 100644
--- a/packages/editor/src/components/rich-text/index.js
+++ b/packages/editor/src/components/rich-text/index.js
@@ -23,7 +23,6 @@ import {
 } from '@wordpress/dom';
 import { createBlobURL } from '@wordpress/blob';
 import { BACKSPACE, DELETE, ENTER, LEFT, RIGHT, rawShortcut } from '@wordpress/keycodes';
-import { Slot } from '@wordpress/components';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { rawHandler, children, getBlockTransforms, findTransform } from '@wordpress/blocks';
 import { withInstanceId, withSafeTimeout, compose } from '@wordpress/compose';
@@ -47,13 +46,12 @@ import { decodeEntities } from '@wordpress/html-entities';
  */
 import Autocomplete from '../autocomplete';
 import BlockFormatControls from '../block-format-controls';
-import { FORMATTING_CONTROLS } from './formatting-controls';
+import FormatEdit from './format-edit';
 import FormatToolbar from './format-toolbar';
 import TinyMCE from './tinymce';
 import { pickAriaProps } from './aria';
 import { getPatterns } from './patterns';
 import { withBlockEditContext } from '../block-edit/context';
-import TokenUI from './tokens/ui';
 
 /**
  * Browser dependencies
@@ -864,15 +862,6 @@ export class RichText extends Component {
 		const classes = classnames( wrapperClassName, 'editor-rich-text' );
 		const record = this.getRecord();
 
-		const formatToolbar = this.editor && (
-			<FormatToolbar
-				record={ record }
-				onChange={ this.onChange }
-				enabledControls={ formattingControls }
-				editor={ this.editor }
-			/>
-		);
-
 		return (
 			<div className={ classes }
 				ref={ this.containerRef }
@@ -880,21 +869,14 @@ export class RichText extends Component {
 			>
 				{ isSelected && ! inlineToolbar && (
 					<BlockFormatControls>
-						{ formatToolbar }
+						<FormatToolbar controls={ formattingControls } />
 					</BlockFormatControls>
 				) }
 				{ isSelected && inlineToolbar && (
 					<div className="editor-rich-text__inline-toolbar">
-						{ formatToolbar }
+						<FormatToolbar controls={ formattingControls } />
 					</div>
 				) }
-				{ isSelected &&
-					<TokenUI
-						editor={ this.editor }
-						containerRef={ this.containerRef }
-					/>
-				}
-
 				<Autocomplete
 					onReplace={ this.props.onReplace }
 					completers={ autocompleters }
@@ -931,7 +913,7 @@ export class RichText extends Component {
 									{ MultilineTag ? <MultilineTag>{ placeholder }</MultilineTag> : placeholder }
 								</Tagname>
 							}
-							{ isSelected && <Slot name="RichText.Siblings" /> }
+							{ isSelected && <FormatEdit value={ record } onChange={ this.onChange } /> }
 						</Fragment>
 					) }
 				</Autocomplete>
@@ -941,7 +923,7 @@ export class RichText extends Component {
 }
 
 RichText.defaultProps = {
-	formattingControls: FORMATTING_CONTROLS.map( ( { format } ) => format ),
+	formattingControls: [ 'bold', 'italic', 'link', 'strikethrough' ],
 	format: 'string',
 	value: '',
 };
diff --git a/packages/editor/src/components/rich-text/index.native.js b/packages/editor/src/components/rich-text/index.native.js
index e3d42da518d867..3514a85436ae39 100644
--- a/packages/editor/src/components/rich-text/index.native.js
+++ b/packages/editor/src/components/rich-text/index.native.js
@@ -22,10 +22,34 @@ import {
 } from '@wordpress/rich-text';
 import { BACKSPACE } from '@wordpress/keycodes';
 import { children } from '@wordpress/blocks';
+import { __ } from '@wordpress/i18n';
+
 /**
  * Internal dependencies
  */
-import { FORMATTING_CONTROLS } from './formatting-controls';
+
+const FORMATTING_CONTROLS = [
+	{
+		icon: 'editor-bold',
+		title: __( 'Bold' ),
+		format: 'bold',
+	},
+	{
+		icon: 'editor-italic',
+		title: __( 'Italic' ),
+		format: 'italic',
+	},
+	{
+		icon: 'admin-links',
+		title: __( 'Link' ),
+		format: 'link',
+	},
+	{
+		icon: 'editor-strikethrough',
+		title: __( 'Strikethrough' ),
+		format: 'strikethrough',
+	},
+];
 
 const isRichTextValueEmpty = ( value ) => {
 	return ! value || ! value.length;
diff --git a/packages/editor/src/components/rich-text/tinymce.js b/packages/editor/src/components/rich-text/tinymce.js
index 217f40eaa024bc..c1d752a1d3c7ad 100644
--- a/packages/editor/src/components/rich-text/tinymce.js
+++ b/packages/editor/src/components/rich-text/tinymce.js
@@ -168,6 +168,16 @@ export default class TinyMCE extends Component {
 			setup: ( editor ) => {
 				this.editor = editor;
 				this.props.onSetup( editor );
+
+				editor.on( 'init', () => {
+					// See https://github.com/tinymce/tinymce/blob/master/src/core/main/ts/keyboard/FormatShortcuts.ts
+					[ 'b', 'i', 'u' ].forEach( ( character ) => {
+						editor.shortcuts.remove( `meta+${ character }` );
+					} );
+					[ 1, 2, 3, 4, 5, 6, 7, 8, 9 ].forEach( ( number ) => {
+						editor.shortcuts.remove( `access+${ number }` );
+					} );
+				} );
 			},
 		} );
 	}
diff --git a/packages/editor/src/components/rich-text/tokens/index.js b/packages/editor/src/components/rich-text/tokens/index.js
deleted file mode 100644
index d74c50b425fc7f..00000000000000
--- a/packages/editor/src/components/rich-text/tokens/index.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * External dependencies
- */
-import { has, isFunction } from 'lodash';
-
-/**
- * WordPress dependencies
- */
-import { isValidIcon, normalizeIconObject } from '@wordpress/blocks';
-import { applyFilters } from '@wordpress/hooks';
-
-/**
- * Browser dependencies
- */
-const { error } = window.console;
-
-/**
- * Validates the token settings object.
- *
- * @param {string} name     Token name.
- * @param {Object} settings Token settings.
- * @param {Object} state    core/editor state.
- *
- * @return {Object} Validated token settings.
- */
-export function validateTokenSettings( name, settings, state ) {
-	if ( typeof name !== 'string' ) {
-		error(
-			'Token names must be strings.'
-		);
-		return;
-	}
-
-	if ( ! /^[a-z][a-z0-9-]*\/[a-z][a-z0-9-]*$/.test( name ) ) {
-		error(
-			'Token names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-token'
-		);
-		return;
-	}
-
-	if ( has( state, [ name ] ) ) {
-		error(
-			'Token "' + name + '" is already registered.'
-		);
-		return;
-	}
-
-	settings = applyFilters( 'editor.registerToken', settings, name );
-
-	if ( ! settings || ! isFunction( settings.save ) ) {
-		error(
-			'The "save" property must be specified and must be a valid function.'
-		);
-		return;
-	}
-
-	if ( has( settings, [ 'edit' ] ) && ! isFunction( settings.edit ) ) {
-		error(
-			'The "edit" property must be a valid function.'
-		);
-		return;
-	}
-
-	if ( has( settings, [ 'keywords' ] ) && settings.keywords.length > 3 ) {
-		error(
-			'The token "' + name + '" can have a maximum of 3 keywords.'
-		);
-		return;
-	}
-
-	if ( ! has( settings, [ 'title' ] ) || settings.title === '' ) {
-		error(
-			'The token "' + name + '" must have a title.'
-		);
-		return;
-	}
-
-	if ( typeof settings.title !== 'string' ) {
-		error(
-			'Token titles must be strings.'
-		);
-		return;
-	}
-
-	settings.icon = normalizeIconObject( settings.icon );
-
-	if ( ! isValidIcon( settings.icon.src ) ) {
-		error(
-			'The icon passed is invalid. ' +
-			'The icon should be a string, an element, a function, or an object following the specifications documented in https://wordpress.org/gutenberg/handbook/block-api/#icon-optional'
-		);
-		return;
-	}
-
-	return settings;
-}
diff --git a/packages/editor/src/components/rich-text/tokens/ui/index.js b/packages/editor/src/components/rich-text/tokens/ui/index.js
deleted file mode 100644
index 9671551e2541b7..00000000000000
--- a/packages/editor/src/components/rich-text/tokens/ui/index.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Component, Fragment, renderToString } from '@wordpress/element';
-import { getRectangleFromRange } from '@wordpress/dom';
-import { __ } from '@wordpress/i18n';
-import { withSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { InserterResultsPortal } from '../../../inserter';
-
-class TokenUI extends Component {
-	constructor() {
-		super( ...arguments );
-
-		this.onHover = this.onHover.bind( this );
-		this.onSelect = this.onSelect.bind( this );
-		this.onSave = this.onSave.bind( this );
-
-		this.state = {
-			selected: null,
-			hovered: null,
-		};
-	}
-
-	getInsertPosition() {
-		const { containerRef, editor } = this.props;
-
-		// The container is relatively positioned.
-		const containerPosition = containerRef.current.getBoundingClientRect();
-		const rect = getRectangleFromRange( editor.selection.getRng() );
-
-		return {
-			top: rect.top - containerPosition.top,
-			left: rect.right - containerPosition.left,
-			height: rect.height,
-		};
-	}
-
-	onSave( { save } ) {
-		return ( attributes ) => {
-			const { editor } = this.props;
-
-			if ( attributes ) {
-				editor.insertContent( renderToString( save( attributes ) ) );
-			}
-
-			this.setState( { selected: null } );
-		};
-	}
-
-	onHover( settings ) {
-		this.setState( { hovered: !! settings } );
-	}
-
-	onSelect( settings ) {
-		this.setState( { selected: settings } );
-	}
-
-	render() {
-		const { hovered, selected } = this.state;
-
-		return (
-			<Fragment>
-				<InserterResultsPortal
-					title={ __( 'Inline Elements' ) }
-					items={ this.props.items }
-					onSelect={ this.onSelect }
-					onHover={ this.onHover }
-					initialOpen={ false }
-				/>
-				{ hovered &&
-					<div
-						style={ { position: 'absolute', ...this.getInsertPosition() } }
-						className="blocks-inline-insertion-point"
-					/>
-				}
-				{ selected &&
-					<selected.edit onSave={ this.onSave( selected ) } />
-				}
-			</Fragment>
-		);
-	}
-}
-
-export default withSelect( ( select ) => {
-	const { getTokenSettings } = select( 'core/editor' );
-
-	return {
-		items: Object.values( getTokenSettings() ),
-	};
-} )( TokenUI );
diff --git a/packages/editor/src/components/rich-text/tokens/ui/style.scss b/packages/editor/src/components/rich-text/tokens/ui/style.scss
deleted file mode 100644
index cbc38140121aaf..00000000000000
--- a/packages/editor/src/components/rich-text/tokens/ui/style.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.blocks-inline-insertion-point {
-	display: block;
-	z-index: 1;
-	width: 4px;
-	margin-left: -2px;
-	background: theme(primary);
-}
diff --git a/packages/editor/src/components/unsaved-changes-warning/index.js b/packages/editor/src/components/unsaved-changes-warning/index.js
index fae27c0848956a..24599cc107104e 100644
--- a/packages/editor/src/components/unsaved-changes-warning/index.js
+++ b/packages/editor/src/components/unsaved-changes-warning/index.js
@@ -1,15 +1,9 @@
-/**
- * External dependencies
- */
-import { stubFalse } from 'lodash';
-
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
 import { withSelect } from '@wordpress/data';
-import deprecated from '@wordpress/deprecated';
 
 class UnsavedChangesWarning extends Component {
 	constructor() {
@@ -33,18 +27,9 @@ class UnsavedChangesWarning extends Component {
 	 * @return {?string} Warning prompt message, if unsaved changes exist.
 	 */
 	warnIfUnsavedChanges( event ) {
-		const { isDirty, forceIsDirty = stubFalse } = this.props;
-
-		// For deprecation, infer explicitly provided if not assigned to
-		// fallback value.
-		if ( forceIsDirty !== stubFalse ) {
-			deprecated( 'UnsavedChangesWarning forceIsDirty prop', {
-				plugin: 'Gutenberg',
-				version: '4.2',
-			} );
-		}
+		const { isDirty } = this.props;
 
-		if ( isDirty || forceIsDirty() ) {
+		if ( isDirty ) {
 			event.returnValue = __( 'You have unsaved changes. If you proceed, they will be lost.' );
 			return event.returnValue;
 		}
diff --git a/packages/editor/src/store/actions.js b/packages/editor/src/store/actions.js
index 2c36c35871b569..349cecd08dcfd8 100644
--- a/packages/editor/src/store/actions.js
+++ b/packages/editor/src/store/actions.js
@@ -752,39 +752,53 @@ export function updateEditorSettings( settings ) {
 	};
 }
 
-export function registerToken( name, settings ) {
+/**
+ * Returns an action object used in signalling that the user has enabled the publish sidebar.
+ *
+ * @return {Object} Action object
+ */
+export function enablePublishSidebar() {
 	return {
-		type: 'REGISTER_TOKEN',
-		name,
-		settings,
+		type: 'ENABLE_PUBLISH_SIDEBAR',
 	};
 }
 
-export function unregisterToken( name ) {
+/**
+ * Returns an action object used in signalling that the user has disabled the publish sidebar.
+ *
+ * @return {Object} Action object
+ */
+export function disablePublishSidebar() {
 	return {
-		type: 'UNREGISTER_TOKEN',
-		name,
+		type: 'DISABLE_PUBLISH_SIDEBAR',
 	};
 }
 
 /**
- * Returns an action object used in signalling that the user has enabled the publish sidebar.
+ * Returns an action object used to signal that post saving is locked.
+ *
+ * @param  {string} lockName The lock name.
  *
  * @return {Object} Action object
  */
-export function enablePublishSidebar() {
+export function lockPostSaving( lockName ) {
 	return {
-		type: 'ENABLE_PUBLISH_SIDEBAR',
+		type: 'LOCK_POST_SAVING',
+		lockName,
 	};
 }
 
 /**
- * Returns an action object used in signalling that the user has disabled the publish sidebar.
+ * Returns an action object used to signal that post saving is unlocked.
+ *
+ * @param  {string} lockName The lock name.
  *
  * @return {Object} Action object
  */
-export function disablePublishSidebar() {
+export function unlockPostSaving( lockName ) {
 	return {
-		type: 'DISABLE_PUBLISH_SIDEBAR',
+		type: 'UNLOCK_POST_SAVING',
+		lockName,
 	};
 }
+
diff --git a/packages/editor/src/store/index.js b/packages/editor/src/store/index.js
index 542ab0a908b56d..fb8f9fe11d5cc6 100644
--- a/packages/editor/src/store/index.js
+++ b/packages/editor/src/store/index.js
@@ -1,8 +1,3 @@
-/**
- * External Dependencies
- */
-import { forOwn } from 'lodash';
-
 /**
  * WordPress Dependencies
  */
@@ -15,8 +10,6 @@ import reducer from './reducer';
 import applyMiddlewares from './middlewares';
 import * as selectors from './selectors';
 import * as actions from './actions';
-import * as tokens from '../components/rich-text/core-tokens';
-import { validateTokenSettings } from '../components/rich-text/tokens';
 
 /**
  * Module Constants
@@ -31,12 +24,4 @@ const store = registerStore( MODULE_KEY, {
 } );
 applyMiddlewares( store );
 
-forOwn( tokens, ( { name, settings } ) => {
-	settings = validateTokenSettings( name, settings, store.getState() );
-
-	if ( settings ) {
-		store.dispatch( actions.registerToken( name, settings ) );
-	}
-} );
-
 export default store;
diff --git a/packages/editor/src/store/reducer.js b/packages/editor/src/store/reducer.js
index 1bcfae88dab7bf..fc6168b73e9906 100644
--- a/packages/editor/src/store/reducer.js
+++ b/packages/editor/src/store/reducer.js
@@ -913,6 +913,27 @@ export function postLock( state = { isLocked: false }, action ) {
 	return state;
 }
 
+/**
+ * Post saving lock.
+ *
+ * When post saving is locked, the post cannot be published or updated.
+ *
+ * @param {PostSavingLockState} state  Current state.
+ * @param {Object}              action Dispatched action.
+ *
+ * @return {PostLockState} Updated state.
+ */
+export function postSavingLock( state = {}, action ) {
+	switch ( action.type ) {
+		case 'LOCK_POST_SAVING':
+			return { ...state, [ action.lockName ]: true };
+
+		case 'UNLOCK_POST_SAVING':
+			return omit( state, action.lockName );
+	}
+	return state;
+}
+
 export const reusableBlocks = combineReducers( {
 	data( state = {}, action ) {
 		switch ( action.type ) {
@@ -1094,28 +1115,6 @@ export function autosave( state = null, action ) {
 	return state;
 }
 
-/**
- * Reducer managing the block types
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- *
- * @return {Object} Updated state.
- */
-export function tokens( state = {}, action ) {
-	switch ( action.type ) {
-		case 'REGISTER_TOKEN':
-			return {
-				...state,
-				[ action.name ]: action.settings,
-			};
-		case 'UNREGISTER_TOKEN':
-			return omit( state, action.name );
-	}
-
-	return state;
-}
-
 export default optimist( combineReducers( {
 	editor,
 	currentPost,
@@ -1132,5 +1131,5 @@ export default optimist( combineReducers( {
 	template,
 	autosave,
 	settings,
-	tokens,
+	postSavingLock,
 } ) );
diff --git a/packages/editor/src/store/selectors.js b/packages/editor/src/store/selectors.js
index 84762a70c62f38..93b89572dab0c8 100644
--- a/packages/editor/src/store/selectors.js
+++ b/packages/editor/src/store/selectors.js
@@ -1995,6 +1995,17 @@ export function isPostLocked( state ) {
 	return state.postLock.isLocked;
 }
 
+/**
+ * Returns whether post saving is locked.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Is locked.
+ */
+export function isPostSavingLocked( state ) {
+	return state.postSavingLock.length > 0;
+}
+
 /**
  * Returns whether the edition of the post has been taken over.
  *
diff --git a/packages/editor/src/store/test/reducer.js b/packages/editor/src/store/test/reducer.js
index 9913daf213ec2d..a1ee2508ca2e03 100644
--- a/packages/editor/src/store/test/reducer.js
+++ b/packages/editor/src/store/test/reducer.js
@@ -35,6 +35,7 @@ import {
 	template,
 	blockListSettings,
 	autosave,
+	postSavingLock,
 } from '../reducer';
 
 describe( 'state', () => {
@@ -2263,4 +2264,49 @@ describe( 'state', () => {
 			} );
 		} );
 	} );
+
+	describe( 'postSavingLock', () => {
+		it( 'returns empty object by default', () => {
+			const state = postSavingLock( undefined, {} );
+
+			expect( state ).toEqual( {} );
+		} );
+
+		it( 'returns correct post locks when locks added and removed', () => {
+			let state = postSavingLock( undefined, {
+				type: 'LOCK_POST_SAVING',
+				lockName: 'test-lock',
+			} );
+
+			expect( state ).toEqual( {
+				'test-lock': true,
+			} );
+
+			state = postSavingLock( deepFreeze( state ), {
+				type: 'LOCK_POST_SAVING',
+				lockName: 'test-lock-2',
+			} );
+
+			expect( state ).toEqual( {
+				'test-lock': true,
+				'test-lock-2': true,
+			} );
+
+			state = postSavingLock( deepFreeze( state ), {
+				type: 'UNLOCK_POST_SAVING',
+				lockName: 'test-lock',
+			} );
+
+			expect( state ).toEqual( {
+				'test-lock-2': true,
+			} );
+
+			state = postSavingLock( deepFreeze( state ), {
+				type: 'UNLOCK_POST_SAVING',
+				lockName: 'test-lock-2',
+			} );
+
+			expect( state ).toEqual( {} );
+		} );
+	} );
 } );
diff --git a/packages/editor/src/store/test/selectors.js b/packages/editor/src/store/test/selectors.js
index e7e6294b64fe08..6742a02aca7e92 100644
--- a/packages/editor/src/store/test/selectors.js
+++ b/packages/editor/src/store/test/selectors.js
@@ -111,6 +111,7 @@ const {
 	INSERTER_UTILITY_HIGH,
 	INSERTER_UTILITY_MEDIUM,
 	INSERTER_UTILITY_LOW,
+	isPostSavingLocked,
 } = selectors;
 
 describe( 'selectors', () => {
@@ -891,6 +892,28 @@ describe( 'selectors', () => {
 		} );
 	} );
 
+	describe( 'isPostSavingLocked', () => {
+		it( 'should return true if the post has postSavingLocks', () => {
+			const state = {
+				postSavingLock: [ { 1: true } ],
+				currentPost: {},
+				saving: {},
+			};
+
+			expect( isPostSavingLocked( state ) ).toBe( true );
+		} );
+
+		it( 'should return false if the post has no postSavingLocks', () => {
+			const state = {
+				postSavingLock: [],
+				currentPost: {},
+				saving: {},
+			};
+
+			expect( isPostSavingLocked( state ) ).toBe( false );
+		} );
+	} );
+
 	describe( 'isEditedPostSaveable', () => {
 		it( 'should return false if the post has no title, excerpt, content', () => {
 			const state = {
diff --git a/packages/editor/src/style.scss b/packages/editor/src/style.scss
index b1afcd28b8bee8..972322a31a8b6c 100644
--- a/packages/editor/src/style.scss
+++ b/packages/editor/src/style.scss
@@ -21,6 +21,7 @@
 @import "./components/inner-blocks/style.scss";
 @import "./components/inserter-with-shortcuts/style.scss";
 @import "./components/inserter/style.scss";
+@import "./components/inserter-list-item/style.scss";
 @import "./components/media-placeholder/style.scss";
 @import "./components/page-attributes/style.scss";
 @import "./components/panel-color-settings/style.scss";
@@ -38,10 +39,8 @@
 @import "./components/post-visibility/style.scss";
 @import "./components/post-title/style.scss";
 @import "./components/post-trash/style.scss";
-@import "./components/rich-text/core-tokens/image/style.scss";
 @import "./components/rich-text/format-toolbar/style.scss";
 @import "./components/rich-text/style.scss";
-@import "./components/rich-text/tokens/ui/style.scss";
 @import "./components/skip-to-selected-block/style.scss";
 @import "./components/table-of-contents/style.scss";
 @import "./components/template-validation-notice/style.scss";
diff --git a/packages/editor/src/utils/media-upload/index.js b/packages/editor/src/utils/media-upload/index.js
index bb0a1e0b0dcfbb..8693cede6f590a 100644
--- a/packages/editor/src/utils/media-upload/index.js
+++ b/packages/editor/src/utils/media-upload/index.js
@@ -7,7 +7,6 @@ import { noop } from 'lodash';
  * WordPress dependencies
  */
 import { select } from '@wordpress/data';
-import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -31,13 +30,7 @@ export default function( {
 	maxUploadFileSize,
 	onError = noop,
 	onFileChange,
-	allowedType,
 } ) {
-	deprecated( 'mediaDetails in object passed to onFileChange callback of wp.editor.mediaUpload', {
-		version: '4.2',
-		alternative: 'media_details property containing exactly the property as returned by the rest api',
-	} );
-
 	const {
 		getCurrentPostId,
 		getEditorSettings,
@@ -45,20 +38,8 @@ export default function( {
 	const wpAllowedMimeTypes = getEditorSettings().allowedMimeTypes;
 	maxUploadFileSize = maxUploadFileSize || getEditorSettings().maxUploadFileSize;
 
-	let allowedTypesToUse = allowedTypes;
-	if ( ! allowedTypes && allowedType ) {
-		deprecated( 'allowedType parameter property of wp.editor.mediaUpload', {
-			version: '4.2',
-			alternative: 'allowedTypes property containing an array with the allowedTypes or do not pass any property if all types are allowed',
-		} );
-		if ( allowedType === '*' ) {
-			allowedTypesToUse = undefined;
-		} else {
-			allowedTypesToUse = [ allowedType ];
-		}
-	}
 	mediaUpload( {
-		allowedTypes: allowedTypesToUse,
+		allowedTypes,
 		filesList,
 		onFileChange,
 		additionalData: {
diff --git a/packages/editor/src/utils/media-upload/media-upload.js b/packages/editor/src/utils/media-upload/media-upload.js
index b7158e7d2227fb..8ef98130190d74 100644
--- a/packages/editor/src/utils/media-upload/media-upload.js
+++ b/packages/editor/src/utils/media-upload/media-upload.js
@@ -169,11 +169,7 @@ export function mediaUpload( {
 					caption: get( savedMedia, [ 'caption', 'raw' ], '' ),
 					title: savedMedia.title.raw,
 					url: savedMedia.source_url,
-					mediaDetails: {},
 				};
-				if ( has( savedMedia, [ 'media_details', 'sizes' ] ) ) {
-					mediaObject.mediaDetails.sizes = get( savedMedia, [ 'media_details', 'sizes' ], {} );
-				}
 				setAndUpdateFiles( idx, mediaObject );
 			} )
 			.catch( ( error ) => {
diff --git a/packages/editor/src/utils/test/url.js b/packages/editor/src/utils/test/url.js
deleted file mode 100644
index 66ce212bf564dc..00000000000000
--- a/packages/editor/src/utils/test/url.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Internal dependencies
- */
-import { filterURLForDisplay } from '../url';
-
-describe( 'filterURLForDisplay', () => {
-	it( 'should remove protocol', () => {
-		let url = filterURLForDisplay( 'http://wordpress.org' );
-		expect( url ).toBe( 'wordpress.org' );
-		url = filterURLForDisplay( 'https://wordpress.org' );
-		expect( url ).toBe( 'wordpress.org' );
-	} );
-	it( 'should remove www subdomain', () => {
-		const url = filterURLForDisplay( 'http://www.wordpress.org' );
-		expect( url ).toBe( 'wordpress.org' );
-	} );
-	it( 'should remove single trailing slash', () => {
-		const url = filterURLForDisplay( 'http://www.wordpress.org/' );
-		expect( url ).toBe( 'wordpress.org' );
-	} );
-	it( 'should preserve slashes where the url has multiple in the path', () => {
-		const url = filterURLForDisplay( 'http://www.wordpress.org/something/' );
-		expect( url ).toBe( 'wordpress.org/something/' );
-	} );
-	it( 'should preserve slash where the url has path after the initial slash', () => {
-		const url = filterURLForDisplay( 'http://www.wordpress.org/something' );
-		expect( url ).toBe( 'wordpress.org/something' );
-	} );
-} );
diff --git a/packages/editor/src/utils/url.js b/packages/editor/src/utils/url.js
index 54d3ce6a4bbd0b..566775289f9777 100644
--- a/packages/editor/src/utils/url.js
+++ b/packages/editor/src/utils/url.js
@@ -16,22 +16,3 @@ import { addQueryArgs } from '@wordpress/url';
 export function getWPAdminURL( page, query ) {
 	return addQueryArgs( page, query );
 }
-
-/**
- * Returns a URL for display.
- *
- * @param {string} url Original URL.
- *
- * @return {string} Displayed URL.
- */
-export function filterURLForDisplay( url ) {
-	// remove protocol and www prefixes
-	const filteredURL = url.replace( new RegExp( '^https?://(www\.)?' ), '' );
-
-	// ends with / and only has that single slash, strip it
-	if ( filteredURL.match( '^[^/]+/$' ) ) {
-		return filteredURL.replace( '/', '' );
-	}
-
-	return filteredURL;
-}
diff --git a/packages/format-library/.npmrc b/packages/format-library/.npmrc
new file mode 100644
index 00000000000000..43c97e719a5a82
--- /dev/null
+++ b/packages/format-library/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/packages/format-library/README.md b/packages/format-library/README.md
new file mode 100644
index 00000000000000..69d6f157279d07
--- /dev/null
+++ b/packages/format-library/README.md
@@ -0,0 +1,15 @@
+# Format library
+
+Format library for the WordPress editor.
+
+## Installation
+
+Install the module
+
+```bash
+npm install @wordpress/format-library --save
+```
+
+_This package assumes that your code will run in an **ES2015+** environment. If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods. Learn more about it in [Babel docs](https://babeljs.io/docs/en/next/caveats)._
+
+<br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
new file mode 100644
index 00000000000000..9a68655a3e459d
--- /dev/null
+++ b/packages/format-library/package.json
@@ -0,0 +1,36 @@
+{
+	"name": "@wordpress/format-library",
+	"version": "1.0.0-alpha.0",
+	"description": "Format library for the WordPress editor.",
+	"author": "The WordPress Contributors",
+	"license": "GPL-2.0-or-later",
+	"keywords": [
+		"wordpress",
+		"formats"
+	],
+	"homepage": "https://github.com/WordPress/gutenberg/tree/master/packages/format-library/README.md",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/WordPress/gutenberg.git"
+	},
+	"bugs": {
+		"url": "https://github.com/WordPress/gutenberg/issues"
+	},
+	"main": "build/index.js",
+	"module": "build-module/index.js",
+	"react-native": "src/index",
+	"dependencies": {
+		"@babel/runtime": "^7.0.0",
+		"@wordpress/components": "file:../components",
+		"@wordpress/dom": "file:../dom",
+		"@wordpress/editor": "file:../editor",
+		"@wordpress/element": "file:../element",
+		"@wordpress/i18n": "file:../i18n",
+		"@wordpress/keycodes": "file:../keycodes",
+		"@wordpress/rich-text": "file:../rich-text",
+		"@wordpress/url": "file:../url"
+	},
+	"publishConfig": {
+		"access": "public"
+	}
+}
diff --git a/packages/format-library/src/bold/index.js b/packages/format-library/src/bold/index.js
new file mode 100644
index 00000000000000..fa2b241ae5d7c9
--- /dev/null
+++ b/packages/format-library/src/bold/index.js
@@ -0,0 +1,36 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Fragment } from '@wordpress/element';
+import { toggleFormat } from '@wordpress/rich-text';
+
+const name = 'core/bold';
+
+export const bold = {
+	name,
+	title: __( 'Bold' ),
+	match: {
+		tagName: 'strong',
+	},
+	edit( { isActive, value, onChange, ToolbarButton, Shortcut } ) {
+		const onToggle = () => onChange( toggleFormat( value, { type: name } ) );
+
+		return (
+			<Fragment>
+				<Shortcut
+					type="primary"
+					character="b"
+					onUse={ onToggle }
+				/>
+				<ToolbarButton
+					name="bold"
+					icon="editor-bold"
+					title={ __( 'Bold' ) }
+					onClick={ onToggle }
+					isActive={ isActive }
+				/>
+			</Fragment>
+		);
+	},
+};
diff --git a/packages/format-library/src/code/index.js b/packages/format-library/src/code/index.js
new file mode 100644
index 00000000000000..9ac6d1fc3bfaa7
--- /dev/null
+++ b/packages/format-library/src/code/index.js
@@ -0,0 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Fragment } from '@wordpress/element';
+import { toggleFormat } from '@wordpress/rich-text';
+
+const name = 'core/code';
+
+export const code = {
+	name,
+	title: __( 'Code' ),
+	match: {
+		tagName: 'code',
+	},
+	edit( { value, onChange, Shortcut } ) {
+		const onToggle = () => onChange( toggleFormat( value, { type: name } ) );
+
+		return (
+			<Fragment>
+				<Shortcut
+					type="access"
+					character="x"
+					onUse={ onToggle }
+				/>
+			</Fragment>
+		);
+	},
+};
diff --git a/packages/format-library/src/image/index.js b/packages/format-library/src/image/index.js
new file mode 100644
index 00000000000000..aad07328b5c2cf
--- /dev/null
+++ b/packages/format-library/src/image/index.js
@@ -0,0 +1,80 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { Fragment, Component } from '@wordpress/element';
+import { insertObject } from '@wordpress/rich-text';
+import { MediaUpload } from '@wordpress/editor';
+
+const ALLOWED_MEDIA_TYPES = [ 'image' ];
+
+const name = 'core/image';
+
+export const image = {
+	name,
+	title: __( 'Image' ),
+	keywords: [ __( 'photo' ), __( 'media' ) ],
+	object: true,
+	match: {
+		tagName: 'img',
+	},
+	attributes: {
+		className: 'class',
+		style: 'style',
+		url: 'src',
+		alt: 'alt',
+	},
+	edit: class ImageEdit extends Component {
+		constructor() {
+			super( ...arguments );
+			this.openModal = this.openModal.bind( this );
+			this.closeModal = this.closeModal.bind( this );
+			this.state = {
+				modal: false,
+			};
+		}
+
+		openModal() {
+			this.setState( { modal: true } );
+		}
+
+		closeModal() {
+			this.setState( { modal: false } );
+		}
+
+		render() {
+			const { value, onChange, InserterListItem } = this.props;
+
+			return (
+				<Fragment>
+					<InserterListItem
+						icon={ <SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><Path d="M4 16h10c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2H4c-1.1 0-2 .9-2 2v9c0 1.1.9 2 2 2zM4 5h10v9H4V5zm14 9v2h4v-2h-4zM2 20h20v-2H2v2zm6.4-8.8L7 9.4 5 12h8l-2.6-3.4-2 2.6z" /></SVG> }
+						title={ __( 'Inline Image' ) }
+						onClick={ this.openModal }
+					/>
+					{ this.state.modal && <MediaUpload
+						allowedTypes={ ALLOWED_MEDIA_TYPES }
+						onSelect={ ( { id, url, alt, width } ) => {
+							this.closeModal();
+							onChange( insertObject( value, {
+								type: name,
+								attributes: {
+									className: `wp-image-${ id }`,
+									style: `width: ${ Math.min( width, 150 ) }px;`,
+									url,
+									alt,
+								},
+							} ) );
+						} }
+						onClose={ this.closeModal }
+						render={ ( { open } ) => {
+							open();
+							return null;
+						} }
+					/> }
+				</Fragment>
+			);
+		}
+	},
+};
diff --git a/packages/format-library/src/index.js b/packages/format-library/src/index.js
new file mode 100644
index 00000000000000..36012be4f1b5b1
--- /dev/null
+++ b/packages/format-library/src/index.js
@@ -0,0 +1,25 @@
+/**
+ * Internal dependencies
+ */
+import { bold } from './bold';
+import { code } from './code';
+import { image } from './image';
+import { italic } from './italic';
+import { link } from './link';
+import { strikethrough } from './strikethrough';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	registerFormatType,
+} from '@wordpress/rich-text';
+
+[
+	bold,
+	code,
+	image,
+	italic,
+	link,
+	strikethrough,
+].forEach( registerFormatType );
diff --git a/packages/format-library/src/italic/index.js b/packages/format-library/src/italic/index.js
new file mode 100644
index 00000000000000..6a3728a70940e0
--- /dev/null
+++ b/packages/format-library/src/italic/index.js
@@ -0,0 +1,36 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Fragment } from '@wordpress/element';
+import { toggleFormat } from '@wordpress/rich-text';
+
+const name = 'core/italic';
+
+export const italic = {
+	name,
+	title: __( 'Italic' ),
+	match: {
+		tagName: 'em',
+	},
+	edit( { isActive, value, onChange, ToolbarButton, Shortcut } ) {
+		const onToggle = () => onChange( toggleFormat( value, { type: name } ) );
+
+		return (
+			<Fragment>
+				<Shortcut
+					type="primary"
+					character="i"
+					onUse={ onToggle }
+				/>
+				<ToolbarButton
+					name="italic"
+					icon="editor-italic"
+					title={ __( 'Italic' ) }
+					onClick={ onToggle }
+					isActive={ isActive }
+				/>
+			</Fragment>
+		);
+	},
+};
diff --git a/packages/format-library/src/link/index.js b/packages/format-library/src/link/index.js
new file mode 100644
index 00000000000000..a794ef26e55e30
--- /dev/null
+++ b/packages/format-library/src/link/index.js
@@ -0,0 +1,117 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Component, Fragment } from '@wordpress/element';
+import { withSpokenMessages } from '@wordpress/components';
+import {
+	getTextContent,
+	applyFormat,
+	removeFormat,
+	slice,
+} from '@wordpress/rich-text';
+import { isURL } from '@wordpress/url';
+
+/**
+ * Internal dependencies
+ */
+import InlineLinkUI from './inline';
+
+const name = 'core/link';
+
+export const link = {
+	name,
+	title: __( 'Link' ),
+	match: {
+		tagName: 'a',
+	},
+	attributes: {
+		url: 'href',
+		target: 'target',
+	},
+	edit: withSpokenMessages( class LinkEdit extends Component {
+		constructor() {
+			super( ...arguments );
+
+			this.addLink = this.addLink.bind( this );
+			this.stopAddingLink = this.stopAddingLink.bind( this );
+			this.onRemoveFormat = this.onRemoveFormat.bind( this );
+			this.state = {
+				addingLink: false,
+			};
+		}
+
+		addLink() {
+			const { value, onChange } = this.props;
+			const text = getTextContent( slice( value ) );
+
+			if ( text && isURL( text ) ) {
+				onChange( applyFormat( value, { type: name, attributes: { url: text } } ) );
+			} else {
+				this.setState( { addingLink: true } );
+			}
+		}
+
+		stopAddingLink() {
+			this.setState( { addingLink: false } );
+		}
+
+		onRemoveFormat() {
+			const { value, onChange, speak } = this.props;
+
+			onChange( removeFormat( value, name ) );
+			speak( __( 'Link removed.' ), 'assertive' );
+		}
+
+		render() {
+			const { isActive, activeAttributes, value, onChange, ToolbarButton, Shortcut } = this.props;
+
+			return (
+				<Fragment>
+					<Shortcut
+						type="access"
+						character="a"
+						onUse={ this.addLink }
+					/>
+					<Shortcut
+						type="access"
+						character="s"
+						onUse={ this.onRemoveFormat }
+					/>
+					<Shortcut
+						type="primary"
+						character="k"
+						onUse={ this.addLink }
+					/>
+					<Shortcut
+						type="primaryShift"
+						character="k"
+						onUse={ this.onRemoveFormat }
+					/>
+					{ isActive && <ToolbarButton
+						name="link"
+						icon="editor-unlink"
+						title={ __( 'Unlink' ) }
+						onClick={ this.onRemoveFormat }
+						isActive={ isActive }
+					/> }
+					{ ! isActive && <ToolbarButton
+						name="link"
+						icon="admin-links"
+						title={ __( 'Link' ) }
+						onClick={ this.addLink }
+						isActive={ isActive }
+					/> }
+					<InlineLinkUI
+						addingLink={ this.state.addingLink }
+						stopAddingLink={ this.stopAddingLink }
+						isActive={ isActive }
+						activeAttributes={ activeAttributes }
+						value={ value }
+						onChange={ onChange }
+					/>
+				</Fragment>
+			);
+		}
+	} ),
+};
diff --git a/packages/editor/src/components/rich-text/format-toolbar/link-container.js b/packages/format-library/src/link/inline.js
similarity index 61%
rename from packages/editor/src/components/rich-text/format-toolbar/link-container.js
rename to packages/format-library/src/link/inline.js
index fa7eabca07d73b..c72ef6158a2be3 100644
--- a/packages/editor/src/components/rich-text/format-toolbar/link-container.js
+++ b/packages/format-library/src/link/inline.js
@@ -5,39 +5,32 @@ import { __ } from '@wordpress/i18n';
 import { Component, createRef } from '@wordpress/element';
 import {
 	ExternalLink,
-	Fill,
 	IconButton,
 	ToggleControl,
 	withSpokenMessages,
 } from '@wordpress/components';
 import { ESCAPE, LEFT, RIGHT, UP, DOWN, BACKSPACE, ENTER } from '@wordpress/keycodes';
-import { prependHTTP, safeDecodeURI } from '@wordpress/url';
+import { prependHTTP, safeDecodeURI, filterURLForDisplay } from '@wordpress/url';
 import {
 	create,
 	insert,
 	isCollapsed,
 	applyFormat,
 } from '@wordpress/rich-text';
+import { URLInput, URLPopover } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import PositionedAtSelection from './positioned-at-selection';
-import URLInput from '../../url-input';
-import { filterURLForDisplay } from '../../../utils/url';
-import URLPopover from '../../url-popover';
 
 const stopKeyPropagation = ( event ) => event.stopPropagation();
 
-function getLinkAttributesFromFormat( { attributes: { href = '', target } = {} } = {} ) {
-	return { href, target };
-}
-
-function createLinkFormat( { href, opensInNewWindow } ) {
+function createLinkFormat( { url, opensInNewWindow } ) {
 	const format = {
-		type: 'a',
+		type: 'core/link',
 		attributes: {
-			href,
+			url,
 		},
 	};
 
@@ -53,7 +46,7 @@ function isShowingInput( props, state ) {
 	return props.addingLink || state.editLink;
 }
 
-const LinkEditor = ( { inputValue, onChangeInputValue, onKeyDown, submitLink, autocompleteRef } ) => (
+const LinkEditor = ( { value, onChangeInputValue, onKeyDown, submitLink, autocompleteRef } ) => (
 	// Disable reason: KeyPress must be suppressed so the block doesn't hide the toolbar
 	/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
 	<form
@@ -63,7 +56,7 @@ const LinkEditor = ( { inputValue, onChangeInputValue, onKeyDown, submitLink, au
 		onSubmit={ submitLink }
 	>
 		<URLInput
-			value={ inputValue }
+			value={ value }
 			onChange={ onChangeInputValue }
 			autocompleteRef={ autocompleteRef }
 		/>
@@ -72,7 +65,7 @@ const LinkEditor = ( { inputValue, onChangeInputValue, onKeyDown, submitLink, au
 	/* eslint-enable jsx-a11y/no-noninteractive-element-interactions */
 );
 
-const LinkViewer = ( { href, editLink } ) => (
+const LinkViewer = ( { url, editLink } ) => (
 	// Disable reason: KeyPress must be suppressed so the block doesn't hide the toolbar
 	/* eslint-disable jsx-a11y/no-static-element-interactions */
 	<div
@@ -81,16 +74,16 @@ const LinkViewer = ( { href, editLink } ) => (
 	>
 		<ExternalLink
 			className="editor-format-toolbar__link-container-value"
-			href={ href }
+			href={ url }
 		>
-			{ filterURLForDisplay( safeDecodeURI( href ) ) }
+			{ filterURLForDisplay( safeDecodeURI( url ) ) }
 		</ExternalLink>
 		<IconButton icon="edit" label={ __( 'Edit' ) } onClick={ editLink } />
 	</div>
 	/* eslint-enable jsx-a11y/no-static-element-interactions */
 );
 
-class LinkContainer extends Component {
+class InlineLinkUI extends Component {
 	constructor() {
 		super( ...arguments );
 
@@ -107,12 +100,12 @@ class LinkContainer extends Component {
 	}
 
 	static getDerivedStateFromProps( props, state ) {
-		const { href, target } = getLinkAttributesFromFormat( props.link );
+		const { activeAttributes: { url, target } } = props;
 		const opensInNewWindow = target === '_blank';
 
 		if ( ! isShowingInput( props, state ) ) {
-			if ( href !== state.inputValue ) {
-				return { inputValue: href };
+			if ( url !== state.inputValue ) {
+				return { inputValue: url };
 			}
 
 			if ( opensInNewWindow !== state.opensInNewWindow ) {
@@ -140,12 +133,13 @@ class LinkContainer extends Component {
 	}
 
 	setLinkTarget( opensInNewWindow ) {
+		const { activeAttributes: { url }, value, onChange } = this.props;
+
 		this.setState( { opensInNewWindow } );
 
 		// Apply now if URL is not being edited.
 		if ( ! isShowingInput( this.props, this.state ) ) {
-			const { href } = getLinkAttributesFromFormat( this.props.link );
-			this.props.applyFormat( createLinkFormat( { href, opensInNewWindow } ) );
+			onChange( applyFormat( value, createLinkFormat( { url, opensInNewWindow } ) ) );
 		}
 	}
 
@@ -155,29 +149,27 @@ class LinkContainer extends Component {
 	}
 
 	submitLink( event ) {
-		const { link, record } = this.props;
+		const { isActive, value, onChange, speak } = this.props;
 		const { inputValue, opensInNewWindow } = this.state;
-		const href = prependHTTP( inputValue );
-		const format = createLinkFormat( { href, opensInNewWindow } );
+		const url = prependHTTP( inputValue );
+		const format = createLinkFormat( { url, opensInNewWindow } );
 
-		if ( isCollapsed( record ) && link === undefined ) {
-			const toInsert = applyFormat( create( { text: href } ), format, 0, href.length );
-			this.props.onChange( insert( record, toInsert ) );
-		} else {
-			this.props.applyFormat( format );
-		}
+		event.preventDefault();
 
-		if ( this.state.editLink ) {
-			this.props.speak( __( 'Link edited.' ), 'assertive' );
+		if ( isCollapsed( value ) && ! isActive ) {
+			const toInsert = applyFormat( create( { text: url } ), format, 0, url.length );
+			onChange( insert( value, toInsert ) );
+		} else {
+			onChange( applyFormat( value, format ) );
 		}
 
 		this.resetState();
 
-		if ( ! link ) {
-			this.props.speak( __( 'Link added.' ), 'assertive' );
+		if ( isActive ) {
+			speak( __( 'Link edited.' ), 'assertive' );
+		} else {
+			speak( __( 'Link added.' ), 'assertive' );
 		}
-
-		event.preventDefault();
 	}
 
 	onClickOutside( event ) {
@@ -199,51 +191,48 @@ class LinkContainer extends Component {
 	}
 
 	render() {
-		const { link, addingLink, record } = this.props;
+		const { isActive, activeAttributes: { url }, addingLink, value } = this.props;
 
-		if ( ! link && ! addingLink ) {
+		if ( ! isActive && ! addingLink ) {
 			return null;
 		}
 
 		const { inputValue, opensInNewWindow } = this.state;
-		const { href } = getLinkAttributesFromFormat( link );
 		const showInput = isShowingInput( this.props, this.state );
 
 		return (
-			<Fill name="RichText.Siblings">
-				<PositionedAtSelection
-					key={ `${ record.start }${ record.end }` /* Used to force rerender on selection change */ }
+			<PositionedAtSelection
+				key={ `${ value.start }${ value.end }` /* Used to force rerender on selection change */ }
+			>
+				<URLPopover
+					onClickOutside={ this.onClickOutside }
+					focusOnMount={ showInput ? 'firstElement' : false }
+					renderSettings={ () => (
+						<ToggleControl
+							label={ __( 'Open in New Tab' ) }
+							checked={ opensInNewWindow }
+							onChange={ this.setLinkTarget }
+						/>
+					) }
 				>
-					<URLPopover
-						onClickOutside={ this.onClickOutside }
-						focusOnMount={ showInput ? 'firstElement' : false }
-						renderSettings={ () => (
-							<ToggleControl
-								label={ __( 'Open in New Tab' ) }
-								checked={ opensInNewWindow }
-								onChange={ this.setLinkTarget }
-							/>
-						) }
-					>
-						{ showInput ? (
-							<LinkEditor
-								inputValue={ inputValue }
-								onChangeInputValue={ this.onChangeInputValue }
-								onKeyDown={ this.onKeyDown }
-								submitLink={ this.submitLink }
-								autocompleteRef={ this.autocompleteRef }
-							/>
-						) : (
-							<LinkViewer
-								href={ href }
-								editLink={ this.editLink }
-							/>
-						) }
-					</URLPopover>
-				</PositionedAtSelection>
-			</Fill>
+					{ showInput ? (
+						<LinkEditor
+							value={ inputValue }
+							onChangeInputValue={ this.onChangeInputValue }
+							onKeyDown={ this.onKeyDown }
+							submitLink={ this.submitLink }
+							autocompleteRef={ this.autocompleteRef }
+						/>
+					) : (
+						<LinkViewer
+							url={ url }
+							editLink={ this.editLink }
+						/>
+					) }
+				</URLPopover>
+			</PositionedAtSelection>
 		);
 	}
 }
 
-export default withSpokenMessages( LinkContainer );
+export default withSpokenMessages( InlineLinkUI );
diff --git a/packages/editor/src/components/rich-text/format-toolbar/positioned-at-selection.js b/packages/format-library/src/link/positioned-at-selection.js
similarity index 100%
rename from packages/editor/src/components/rich-text/format-toolbar/positioned-at-selection.js
rename to packages/format-library/src/link/positioned-at-selection.js
diff --git a/packages/format-library/src/link/style.scss b/packages/format-library/src/link/style.scss
new file mode 100644
index 00000000000000..e22da7b9422720
--- /dev/null
+++ b/packages/format-library/src/link/style.scss
@@ -0,0 +1,14 @@
+.editor-format-toolbar__link-container-content {
+	display: flex;
+}
+
+.editor-format-toolbar__link-container-value {
+	margin: $grid-size - $border-width;
+	flex-grow: 1;
+	flex-shrink: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	min-width: 150px;
+	max-width: 500px;
+}
diff --git a/packages/format-library/src/strikethrough/index.js b/packages/format-library/src/strikethrough/index.js
new file mode 100644
index 00000000000000..1b5c7c44416f0e
--- /dev/null
+++ b/packages/format-library/src/strikethrough/index.js
@@ -0,0 +1,36 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Fragment } from '@wordpress/element';
+import { toggleFormat } from '@wordpress/rich-text';
+
+const name = 'core/strikethrough';
+
+export const strikethrough = {
+	name,
+	title: __( 'Strikethrough' ),
+	match: {
+		tagName: 'del',
+	},
+	edit( { isActive, value, onChange, ToolbarButton, Shortcut } ) {
+		const onToggle = () => onChange( toggleFormat( value, { type: name } ) );
+
+		return (
+			<Fragment>
+				<Shortcut
+					type="access"
+					character="d"
+					onUse={ onToggle }
+				/>
+				<ToolbarButton
+					name="strikethrough"
+					icon="editor-strikethrough"
+					title={ __( 'Strikethrough' ) }
+					onClick={ onToggle }
+					isActive={ isActive }
+				/>
+			</Fragment>
+		);
+	},
+};
diff --git a/packages/format-library/src/style.scss b/packages/format-library/src/style.scss
new file mode 100644
index 00000000000000..f421ddc28f9283
--- /dev/null
+++ b/packages/format-library/src/style.scss
@@ -0,0 +1 @@
+@import "./link/style.scss";
diff --git a/packages/hooks/README.md b/packages/hooks/README.md
index ab288323567070..d839876d301553 100644
--- a/packages/hooks/README.md
+++ b/packages/hooks/README.md
@@ -22,15 +22,15 @@ myObject.hooks = createHooks();
 myObject.hooks.addAction(); //etc...
 ```
 
-In the WordPress context, API functions can be called via the global `wp.hooks` like this `wp.hooks.addAction()`, etc.
+In the WordPress context, API functions can be called via the global `wp.hooks` like this `wp.hooks.addAction()`, etc. One notable difference from the PHP API is that `addAction()` and `addFilter()` also need to include a namespace as the second argument.
 
 ### API Usage
 
 * `createHooks()`
-* `addAction( 'hookName', 'functionName', callback, priority )`
-* `addFilter( 'hookName', 'functionName', callback, priority )`
-* `removeAction( 'hookName', 'functionName' )`
-* `removeFilter( 'hookName', 'functionName' )`
+* `addAction( 'hookName', 'namespace', 'functionName', callback, priority )`
+* `addFilter( 'hookName', 'namespace', 'functionName', callback, priority )`
+* `removeAction( 'hookName', 'namespace', 'functionName' )`
+* `removeFilter( 'hookName', 'namespace', 'functionName' )`
 * `removeAllActions( 'hookName' )`
 * `removeAllFilters( 'hookName' )`
 * `doAction( 'hookName', arg1, arg2, moreArgs, finalArg )`
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index 8280b49dd6076f..eadd056264532c 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -21,8 +21,10 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.0.0",
+		"@wordpress/data": "file:../data",
 		"@wordpress/escape-html": "file:../escape-html",
-		"lodash": "^4.17.10"
+		"lodash": "^4.17.10",
+		"rememo": "^3.0.0"
 	},
 	"devDependencies": {
 		"deep-freeze": "^0.0.1",
diff --git a/packages/rich-text/src/apply-format.js b/packages/rich-text/src/apply-format.js
index e9fd867a2138db..ebdf6ecaecfea3 100644
--- a/packages/rich-text/src/apply-format.js
+++ b/packages/rich-text/src/apply-format.js
@@ -2,13 +2,15 @@
  * External dependencies
  */
 
-import { find } from 'lodash';
+import { find, reject } from 'lodash';
 
 /**
  * Internal dependencies
  */
 
 import { normaliseFormats } from './normalise-formats';
+import { insert } from './insert';
+import { ZERO_WIDTH_NO_BREAK_SPACE } from './special-characters';
 
 /**
  * Apply a format object to a Rich Text value from the given `startIndex` to the
@@ -30,21 +32,34 @@ export function applyFormat(
 ) {
 	const newFormats = formats.slice( 0 );
 
-	// If the selection is collapsed, expand start and end to the edges of the
-	// format.
+	// The selection is collpased.
 	if ( startIndex === endIndex ) {
 		const startFormat = find( newFormats[ startIndex ], { type: format.type } );
 
-		while ( find( newFormats[ startIndex ], startFormat ) ) {
-			applyFormats( newFormats, startIndex, format );
-			startIndex--;
-		}
-
-		endIndex++;
+		// If the caret is at a format of the same type, expand start and end to
+		// the edges of the format. This is useful to apply new attributes.
+		if ( startFormat ) {
+			while ( find( newFormats[ startIndex ], startFormat ) ) {
+				applyFormats( newFormats, startIndex, format );
+				startIndex--;
+			}
 
-		while ( find( newFormats[ endIndex ], startFormat ) ) {
-			applyFormats( newFormats, endIndex, format );
 			endIndex++;
+
+			while ( find( newFormats[ endIndex ], startFormat ) ) {
+				applyFormats( newFormats, endIndex, format );
+				endIndex++;
+			}
+		// Otherwise, insert a placeholder with the format so new input appears
+		// with the format applied.
+		} else {
+			const previousFormat = newFormats[ startIndex - 1 ] || [];
+			const hasType = find( previousFormat, { type: format.type } );
+
+			return insert( { formats, text, start, end }, {
+				formats: hasType ? [ reject( previousFormat, { type: format.type } ) ] : [ [ ...previousFormat, format ] ],
+				text: ZERO_WIDTH_NO_BREAK_SPACE,
+			} );
 		}
 	} else {
 		for ( let index = startIndex; index < endIndex; index++ ) {
diff --git a/packages/rich-text/src/create.js b/packages/rich-text/src/create.js
index 8998ca7199f2a5..1c050735919fa9 100644
--- a/packages/rich-text/src/create.js
+++ b/packages/rich-text/src/create.js
@@ -1,3 +1,9 @@
+/**
+ * External dependencies
+ */
+
+import { find } from 'lodash';
+
 /**
  * Internal dependencies
  */
@@ -5,6 +11,7 @@
 import { isEmpty } from './is-empty';
 import { isFormatEqual } from './is-format-equal';
 import { createElement } from './create-element';
+import { getFormatTypes } from './get-format-types';
 
 /**
  * Browser dependencies
@@ -16,6 +23,47 @@ function createEmptyValue() {
 	return { formats: [], text: '' };
 }
 
+function simpleFindKey( object, value ) {
+	for ( const key in object ) {
+		if ( object[ key ] === value ) {
+			return key;
+		}
+	}
+}
+
+function toFormat( { type, attributes } ) {
+	const formatType = find( getFormatTypes(), ( { match } ) =>
+		type === match.tagName
+	);
+
+	if ( ! formatType ) {
+		return attributes ? { type, attributes } : { type };
+	}
+
+	if ( ! attributes ) {
+		return { type: formatType.name };
+	}
+
+	const registeredAttributes = {};
+	const unregisteredAttributes = {};
+
+	for ( const name in attributes ) {
+		const key = simpleFindKey( formatType.attributes, name );
+
+		if ( key ) {
+			registeredAttributes[ key ] = attributes[ name ];
+		} else {
+			unregisteredAttributes[ name ] = attributes[ name ];
+		}
+	}
+
+	return {
+		type: formatType.name,
+		attributes: registeredAttributes,
+		unregisteredAttributes,
+	};
+}
+
 /**
  * Create a RichText value from an `Element` tree (DOM), an HTML string or a
  * plain text string, with optionally a `Range` object to set the selection. If
@@ -259,12 +307,13 @@ function createFromElement( {
 		let format;
 
 		if ( ! unwrapNode || ! unwrapNode( node ) ) {
-			const type = node.nodeName.toLowerCase();
-			const attributes = getAttributes( {
-				element: node,
-				removeAttribute,
+			const newFormat = toFormat( {
+				type: node.nodeName.toLowerCase(),
+				attributes: getAttributes( {
+					element: node,
+					removeAttribute,
+				} ),
 			} );
-			const newFormat = attributes ? { type, attributes } : { type };
 
 			// Reuse the last format if it's equal.
 			if ( isFormatEqual( newFormat, lastFormat ) ) {
diff --git a/packages/rich-text/src/get-format-type.js b/packages/rich-text/src/get-format-type.js
new file mode 100644
index 00000000000000..80c1c7e9e3ccb5
--- /dev/null
+++ b/packages/rich-text/src/get-format-type.js
@@ -0,0 +1,15 @@
+/**
+ * WordPress dependencies
+ */
+import { select } from '@wordpress/data';
+
+/**
+ * Returns a registered format type.
+ *
+ * @param {string} name Format name.
+ *
+ * @return {?Object} Format type.
+ */
+export function getFormatType( name ) {
+	return select( 'core/rich-text' ).getFormatType( name );
+}
diff --git a/packages/rich-text/src/get-format-types.js b/packages/rich-text/src/get-format-types.js
new file mode 100644
index 00000000000000..95e6bc7db6fdec
--- /dev/null
+++ b/packages/rich-text/src/get-format-types.js
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { select } from '@wordpress/data';
+
+/**
+ * Returns all registered formats.
+ *
+ * @return {Array} Format settings.
+ */
+export function getFormatTypes() {
+	return select( 'core/rich-text' ).getFormatTypes();
+}
diff --git a/packages/rich-text/src/index.js b/packages/rich-text/src/index.js
index 61f149cc047677..a52b095499cea8 100644
--- a/packages/rich-text/src/index.js
+++ b/packages/rich-text/src/index.js
@@ -1,16 +1,24 @@
+import './store';
+
 export { applyFormat } from './apply-format';
 export { concat } from './concat';
 export { create } from './create';
 export { getActiveFormat } from './get-active-format';
+export { getFormatType } from './get-format-type';
+export { getFormatTypes } from './get-format-types';
 export { getTextContent } from './get-text-content';
 export { isCollapsed } from './is-collapsed';
 export { isEmpty, isEmptyLine } from './is-empty';
 export { join } from './join';
+export { registerFormatType } from './register-format-type';
 export { removeFormat } from './remove-format';
 export { remove } from './remove';
 export { replace } from './replace';
 export { insert } from './insert';
+export { insertObject } from './insert-object';
 export { slice } from './slice';
 export { split } from './split';
 export { apply, toDom as unstableToDom } from './to-dom';
 export { toHTMLString } from './to-html-string';
+export { toggleFormat } from './toggle-format';
+export { unregisterFormatType } from './unregister-format-type';
diff --git a/packages/rich-text/src/insert-object.js b/packages/rich-text/src/insert-object.js
new file mode 100644
index 00000000000000..b3486bcec4ebbe
--- /dev/null
+++ b/packages/rich-text/src/insert-object.js
@@ -0,0 +1,36 @@
+/**
+ * Internal dependencies
+ */
+
+import { insert } from './insert';
+
+const OBJECT_REPLACEMENT_CHARACTER = '\ufffc';
+
+/**
+ * Insert a format as an object into a Rich Text value at the given
+ * `startIndex`. Any content between `startIndex` and `endIndex` will be
+ * removed. Indices are retrieved from the selection if none are provided.
+ *
+ * @param {Object} value          Value to modify.
+ * @param {string} formatToInsert Format to insert as object.
+ * @param {number} startIndex     Start index.
+ * @param {number} endIndex       End index.
+ *
+ * @return {Object} A new value with the object inserted.
+ */
+export function insertObject(
+	value,
+	formatToInsert,
+	startIndex,
+	endIndex
+) {
+	const valueToInsert = {
+		text: OBJECT_REPLACEMENT_CHARACTER,
+		formats: [ [ {
+			...formatToInsert,
+			object: true,
+		} ] ],
+	};
+
+	return insert( value, valueToInsert, startIndex, endIndex );
+}
diff --git a/packages/rich-text/src/register-format-type.js b/packages/rich-text/src/register-format-type.js
new file mode 100644
index 00000000000000..a800b0cb2503a8
--- /dev/null
+++ b/packages/rich-text/src/register-format-type.js
@@ -0,0 +1,84 @@
+/**
+ * External dependencies
+ */
+import { isFunction } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { select, dispatch } from '@wordpress/data';
+import { isValidIcon, normalizeIconObject } from '@wordpress/blocks';
+
+/**
+ * Registers a new format provided a unique name and an object defining its
+ * behavior.
+ *
+ * @param {Object} settings Format settings.
+ *
+ * @return {?WPFormat} The format, if it has been successfully registered;
+ *                     otherwise `undefined`.
+ */
+export function registerFormatType( settings ) {
+	if ( typeof settings.name !== 'string' ) {
+		window.console.error(
+			'Format names must be strings.'
+		);
+		return;
+	}
+
+	if ( ! /^[a-z][a-z0-9-]*\/[a-z][a-z0-9-]*$/.test( settings.name ) ) {
+		window.console.error(
+			'Format names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-format'
+		);
+		return;
+	}
+
+	if ( select( 'core/rich-text' ).getFormatType( settings.name ) ) {
+		window.console.error(
+			'Format "' + settings.name + '" is already registered.'
+		);
+		return;
+	}
+
+	if ( ! settings || ! isFunction( settings.edit ) ) {
+		window.console.error(
+			'The "edit" property must be specified and must be a valid function.'
+		);
+		return;
+	}
+
+	if ( ! ( 'title' in settings ) || settings.title === '' ) {
+		window.console.error(
+			'The format "' + settings.name + '" must have a title.'
+		);
+		return;
+	}
+
+	if ( 'keywords' in settings && settings.keywords.length > 3 ) {
+		window.console.error(
+			'The format "' + settings.name + '" can have a maximum of 3 keywords.'
+		);
+		return;
+	}
+
+	if ( typeof settings.title !== 'string' ) {
+		window.console.error(
+			'Format titles must be strings.'
+		);
+		return;
+	}
+
+	settings.icon = normalizeIconObject( settings.icon );
+
+	if ( ! isValidIcon( settings.icon.src ) ) {
+		window.console.error(
+			'The icon passed is invalid. ' +
+			'The icon should be a string, an element, a function, or an object following the specifications documented in https://wordpress.org/gutenberg/handbook/format-api/#icon-optional'
+		);
+		return;
+	}
+
+	dispatch( 'core/rich-text' ).addFormatTypes( settings );
+
+	return settings;
+}
diff --git a/packages/rich-text/src/special-characters.js b/packages/rich-text/src/special-characters.js
new file mode 100644
index 00000000000000..a607ab03fb7541
--- /dev/null
+++ b/packages/rich-text/src/special-characters.js
@@ -0,0 +1 @@
+export const ZERO_WIDTH_NO_BREAK_SPACE = '\uFEFF';
diff --git a/packages/rich-text/src/store/actions.js b/packages/rich-text/src/store/actions.js
new file mode 100644
index 00000000000000..9b14ac26bca5fc
--- /dev/null
+++ b/packages/rich-text/src/store/actions.js
@@ -0,0 +1,33 @@
+/**
+ * External dependencies
+ */
+import { castArray } from 'lodash';
+
+/**
+ * Returns an action object used in signalling that format types have been
+ * added.
+ *
+ * @param {Array|Object} formatTypes Format types received.
+ *
+ * @return {Object} Action object.
+ */
+export function addFormatTypes( formatTypes ) {
+	return {
+		type: 'ADD_FORMAT_TYPES',
+		formatTypes: castArray( formatTypes ),
+	};
+}
+
+/**
+ * Returns an action object used to remove a registered format type.
+ *
+ * @param {string|Array} names Format name.
+ *
+ * @return {Object} Action object.
+ */
+export function removeFormatTypes( names ) {
+	return {
+		type: 'REMOVE_FORMAT_TYPES',
+		names: castArray( names ),
+	};
+}
diff --git a/packages/rich-text/src/store/index.js b/packages/rich-text/src/store/index.js
new file mode 100644
index 00000000000000..beaed276c2fd69
--- /dev/null
+++ b/packages/rich-text/src/store/index.js
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { registerStore } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import reducer from './reducer';
+import * as selectors from './selectors';
+import * as actions from './actions';
+
+registerStore( 'core/rich-text', { reducer, selectors, actions } );
diff --git a/packages/rich-text/src/store/reducer.js b/packages/rich-text/src/store/reducer.js
new file mode 100644
index 00000000000000..6002b1f55c34d5
--- /dev/null
+++ b/packages/rich-text/src/store/reducer.js
@@ -0,0 +1,33 @@
+/**
+ * External dependencies
+ */
+import { keyBy, omit } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { combineReducers } from '@wordpress/data';
+
+/**
+ * Reducer managing the format types
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ *
+ * @return {Object} Updated state.
+ */
+export function formatTypes( state = {}, action ) {
+	switch ( action.type ) {
+		case 'ADD_FORMAT_TYPES':
+			return {
+				...state,
+				...keyBy( action.formatTypes, 'name' ),
+			};
+		case 'REMOVE_FORMAT_TYPES':
+			return omit( state, action.names );
+	}
+
+	return state;
+}
+
+export default combineReducers( { formatTypes } );
diff --git a/packages/rich-text/src/store/selectors.js b/packages/rich-text/src/store/selectors.js
new file mode 100644
index 00000000000000..c5a28baf0abc22
--- /dev/null
+++ b/packages/rich-text/src/store/selectors.js
@@ -0,0 +1,30 @@
+/**
+ * External dependencies
+ */
+import createSelector from 'rememo';
+
+/**
+ * Returns all the available format types.
+ *
+ * @param {Object} state Data state.
+ *
+ * @return {Array} Format types.
+ */
+export const getFormatTypes = createSelector(
+	( state ) => Object.values( state.formatTypes ),
+	( state ) => [
+		state.formatTypes,
+	]
+);
+
+/**
+ * Returns a format type by name.
+ *
+ * @param {Object} state Data state.
+ * @param {string} name Format type name.
+ *
+ * @return {Object?} Format type.
+ */
+export function getFormatType( state, name ) {
+	return state.formatTypes[ name ];
+}
diff --git a/packages/rich-text/src/store/test/reducer.js b/packages/rich-text/src/store/test/reducer.js
new file mode 100644
index 00000000000000..4ae50a544d08eb
--- /dev/null
+++ b/packages/rich-text/src/store/test/reducer.js
@@ -0,0 +1,47 @@
+/**
+ * External dependencies
+ */
+import deepFreeze from 'deep-freeze';
+
+/**
+ * Internal dependencies
+ */
+import { formatTypes } from '../reducer';
+
+describe( 'formatTypes', () => {
+	it( 'should return an empty object as default state', () => {
+		expect( formatTypes( undefined, {} ) ).toEqual( {} );
+	} );
+
+	it( 'should add add a new format type', () => {
+		const original = deepFreeze( {
+			'core/bold': { name: 'core/bold' },
+		} );
+
+		const state = formatTypes( original, {
+			type: 'ADD_FORMAT_TYPES',
+			formatTypes: [ { name: 'core/code' } ],
+		} );
+
+		expect( state ).toEqual( {
+			'core/bold': { name: 'core/bold' },
+			'core/code': { name: 'core/code' },
+		} );
+	} );
+
+	it( 'should remove format types', () => {
+		const original = deepFreeze( {
+			'core/bold': { name: 'core/bold' },
+			'core/code': { name: 'core/code' },
+		} );
+
+		const state = formatTypes( original, {
+			type: 'REMOVE_FORMAT_TYPES',
+			names: [ 'core/code' ],
+		} );
+
+		expect( state ).toEqual( {
+			'core/bold': { name: 'core/bold' },
+		} );
+	} );
+} );
diff --git a/packages/rich-text/src/test/apply-format.js b/packages/rich-text/src/test/apply-format.js
index 55e99b66891bb8..73416cdb5cfacc 100644
--- a/packages/rich-text/src/test/apply-format.js
+++ b/packages/rich-text/src/test/apply-format.js
@@ -8,6 +8,7 @@ import deepFreeze from 'deep-freeze';
  */
 
 import { applyFormat } from '../apply-format';
+import { ZERO_WIDTH_NO_BREAK_SPACE } from '../special-characters';
 import { getSparseArrayLength } from './helpers';
 
 describe( 'applyFormat', () => {
@@ -52,7 +53,7 @@ describe( 'applyFormat', () => {
 		expect( getSparseArrayLength( result.formats ) ).toBe( 4 );
 	} );
 
-	it( 'should not apply format on non existing format if selection is collapsed', () => {
+	it( 'should apply format in placeholder if selection is collapsed', () => {
 		const record = {
 			formats: [ , , , , [ a ], [ a ], [ a ], , , , , , , ],
 			text: 'one two three',
@@ -60,16 +61,16 @@ describe( 'applyFormat', () => {
 			end: 0,
 		};
 		const expected = {
-			formats: [ , , , , [ a ], [ a ], [ a ], , , , , , , ],
-			text: 'one two three',
-			start: 0,
-			end: 0,
+			formats: [ [ a2 ], , , , , [ a ], [ a ], [ a ], , , , , , , ],
+			text: `${ ZERO_WIDTH_NO_BREAK_SPACE }one two three`,
+			start: 1,
+			end: 1,
 		};
 		const result = applyFormat( deepFreeze( record ), a2 );
 
 		expect( result ).toEqual( expected );
 		expect( result ).not.toBe( record );
-		expect( getSparseArrayLength( result.formats ) ).toBe( 3 );
+		expect( getSparseArrayLength( result.formats ) ).toBe( 4 );
 	} );
 
 	it( 'should apply format on existing format if selection is collapsed', () => {
diff --git a/packages/rich-text/src/test/create.js b/packages/rich-text/src/test/create.js
index 619c38826b67dc..2ce9b605817845 100644
--- a/packages/rich-text/src/test/create.js
+++ b/packages/rich-text/src/test/create.js
@@ -7,7 +7,6 @@ import { JSDOM } from 'jsdom';
 /**
  * Internal dependencies
  */
-
 import { create } from '../create';
 import { createElement } from '../create-element';
 import { getSparseArrayLength, spec } from './helpers';
@@ -19,6 +18,11 @@ describe( 'create', () => {
 	const em = { type: 'em' };
 	const strong = { type: 'strong' };
 
+	beforeAll( () => {
+		// Initialize the rich-text store.
+		require( '../store' );
+	} );
+
 	spec.forEach( ( { description, multilineTag, settings, html, createRange, record } ) => {
 		it( description, () => {
 			const element = createElement( document, html );
diff --git a/packages/rich-text/src/test/to-dom.js b/packages/rich-text/src/test/to-dom.js
index f68a3dda498980..7be38e49fa80d0 100644
--- a/packages/rich-text/src/test/to-dom.js
+++ b/packages/rich-text/src/test/to-dom.js
@@ -16,6 +16,11 @@ const { window } = new JSDOM();
 const { document } = window;
 
 describe( 'recordToDom', () => {
+	beforeAll( () => {
+		// Initialize the rich-text store.
+		require( '../store' );
+	} );
+
 	spec.forEach( ( { description, multilineTag, record, startPath, endPath } ) => {
 		it( description, () => {
 			const { body, selection } = toDom( record, multilineTag );
diff --git a/packages/rich-text/src/test/to-html-string.js b/packages/rich-text/src/test/to-html-string.js
index a65c3cb772447d..daadd733fd9a21 100644
--- a/packages/rich-text/src/test/to-html-string.js
+++ b/packages/rich-text/src/test/to-html-string.js
@@ -21,6 +21,11 @@ function createNode( HTML ) {
 }
 
 describe( 'toHTMLString', () => {
+	beforeAll( () => {
+		// Initialize the rich-text store.
+		require( '../store' );
+	} );
+
 	it( 'should extract recreate HTML 1', () => {
 		const HTML = 'one <em>two 🍒</em> <a href="#"><img src=""><strong>three</strong></a><img src="">';
 		const element = createNode( `<p>${ HTML }</p>` );
diff --git a/packages/rich-text/src/to-tree.js b/packages/rich-text/src/to-tree.js
index c1ced44a16c6b1..b40c04846b8b1c 100644
--- a/packages/rich-text/src/to-tree.js
+++ b/packages/rich-text/src/to-tree.js
@@ -3,6 +3,40 @@
  */
 
 import { split } from './split';
+import { getFormatType } from './get-format-type';
+
+function fromFormat( { type, attributes, object } ) {
+	const formatType = getFormatType( type );
+
+	if ( ! formatType ) {
+		return { type, attributes, object };
+	}
+
+	if ( ! attributes ) {
+		return {
+			type: formatType.match.tagName,
+			object: formatType.object,
+		};
+	}
+
+	const elementAttributes = {};
+
+	for ( const name in attributes ) {
+		const key = formatType.attributes[ name ];
+
+		if ( key ) {
+			elementAttributes[ key ] = attributes[ name ];
+		} else {
+			elementAttributes[ name ] = attributes[ name ];
+		}
+	}
+
+	return {
+		type: formatType.match.tagName,
+		object: formatType.object,
+		attributes: elementAttributes,
+	};
+}
 
 export function toTree( value, multilineTag, settings ) {
 	if ( multilineTag ) {
@@ -61,7 +95,7 @@ export function toTree( value, multilineTag, settings ) {
 
 				const { type, attributes, object } = format;
 				const parent = getParent( pointer );
-				const newNode = append( parent, { type, attributes, object } );
+				const newNode = append( parent, fromFormat( { type, attributes, object } ) );
 
 				if ( isText( pointer ) && getText( pointer ).length === 0 ) {
 					remove( pointer );
diff --git a/packages/rich-text/src/toggle-format.js b/packages/rich-text/src/toggle-format.js
new file mode 100644
index 00000000000000..147d9524df246b
--- /dev/null
+++ b/packages/rich-text/src/toggle-format.js
@@ -0,0 +1,26 @@
+/**
+ * Internal dependencies
+ */
+
+import { getActiveFormat } from './get-active-format';
+import { removeFormat } from './remove-format';
+import { applyFormat } from './apply-format';
+
+/**
+ * Toggles a format object to a Rich Text value at the current selection.
+ *
+ * @param {Object} value      Value to modify.
+ * @param {Object} format     Format to apply or remove.
+ *
+ * @return {Object} A new value with the format applied or removed.
+ */
+export function toggleFormat(
+	value,
+	format
+) {
+	if ( getActiveFormat( value, format.type ) ) {
+		return removeFormat( value, format.type );
+	}
+
+	return applyFormat( value, format );
+}
diff --git a/packages/rich-text/src/unregister-format-type.js b/packages/rich-text/src/unregister-format-type.js
new file mode 100644
index 00000000000000..a01b648622342e
--- /dev/null
+++ b/packages/rich-text/src/unregister-format-type.js
@@ -0,0 +1,27 @@
+/**
+ * WordPress dependencies
+ */
+import { select, dispatch } from '@wordpress/data';
+
+/**
+ * Unregisters a format.
+ *
+ * @param {string} name Format name.
+ *
+ * @return {?WPFormat} The previous format value, if it has been successfully
+ *                     unregistered; otherwise `undefined`.
+ */
+export function unregisterFormatType( name ) {
+	const oldFormat = select( 'core/rich-text' ).getFormatType( name );
+
+	if ( ! oldFormat ) {
+		window.console.error(
+			`Format ${ name } is not registered.`
+		);
+		return;
+	}
+
+	dispatch( 'core/rich-text' ).removeFormatTypes( name );
+
+	return oldFormat;
+}
diff --git a/packages/url/src/index.js b/packages/url/src/index.js
index 98cd123cfc666d..cc368afdc19735 100644
--- a/packages/url/src/index.js
+++ b/packages/url/src/index.js
@@ -109,3 +109,22 @@ export function safeDecodeURI( uri ) {
 		return uri;
 	}
 }
+
+/**
+ * Returns a URL for display.
+ *
+ * @param {string} url Original URL.
+ *
+ * @return {string} Displayed URL.
+ */
+export function filterURLForDisplay( url ) {
+	// Remove protocol and www prefixes.
+	const filteredURL = url.replace( /^(?:https?:)\/\/(?:www\.)?/, '' );
+
+	// Ends with / and only has that single slash, strip it.
+	if ( filteredURL.match( /^[^\/]+\/$/ ) ) {
+		return filteredURL.replace( '/', '' );
+	}
+
+	return filteredURL;
+}
diff --git a/packages/url/src/test/index.test.js b/packages/url/src/test/index.test.js
index 46548528f3bc10..20d6c3628e752a 100644
--- a/packages/url/src/test/index.test.js
+++ b/packages/url/src/test/index.test.js
@@ -14,6 +14,7 @@ import {
 	removeQueryArgs,
 	prependHTTP,
 	safeDecodeURI,
+	filterURLForDisplay,
 } from '../';
 
 describe( 'isURL', () => {
@@ -202,3 +203,29 @@ describe( 'safeDecodeURI', () => {
 		expect( safeDecodeURI( malformed ) ).toBe( malformed );
 	} );
 } );
+
+describe( 'filterURLForDisplay', () => {
+	it( 'should remove protocol', () => {
+		let url = filterURLForDisplay( 'http://wordpress.org' );
+		expect( url ).toBe( 'wordpress.org' );
+		url = filterURLForDisplay( 'https://wordpress.org' );
+		expect( url ).toBe( 'wordpress.org' );
+	} );
+	it( 'should remove www subdomain', () => {
+		const url = filterURLForDisplay( 'http://www.wordpress.org' );
+		expect( url ).toBe( 'wordpress.org' );
+	} );
+	it( 'should remove single trailing slash', () => {
+		const url = filterURLForDisplay( 'http://www.wordpress.org/' );
+		expect( url ).toBe( 'wordpress.org' );
+	} );
+	it( 'should preserve slashes where the url has multiple in the path', () => {
+		const url = filterURLForDisplay( 'http://www.wordpress.org/something/' );
+		expect( url ).toBe( 'wordpress.org/something/' );
+	} );
+	it( 'should preserve slash where the url has path after the initial slash', () => {
+		const url = filterURLForDisplay( 'http://www.wordpress.org/something' );
+		expect( url ).toBe( 'wordpress.org/something' );
+	} );
+} );
+
diff --git a/test/e2e/specs/__snapshots__/compatibility-classic-editor.test.js.snap b/test/e2e/specs/__snapshots__/compatibility-classic-editor.test.js.snap
new file mode 100644
index 00000000000000..e310008a220d3f
--- /dev/null
+++ b/test/e2e/specs/__snapshots__/compatibility-classic-editor.test.js.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Compatibility with Classic Editor Should not apply autop when rendering blocks 1`] = `
+"<a>
+Random Link
+</a>"
+`;
diff --git a/test/e2e/specs/compatibility-classic-editor.test.js b/test/e2e/specs/compatibility-classic-editor.test.js
new file mode 100644
index 00000000000000..3851b8a093851c
--- /dev/null
+++ b/test/e2e/specs/compatibility-classic-editor.test.js
@@ -0,0 +1,30 @@
+/**
+ * Internal dependencies
+ */
+import { newPost, insertBlock, publishPost } from '../support/utils';
+
+describe( 'Compatibility with Classic Editor', () => {
+	beforeEach( async () => {
+		await newPost();
+	} );
+
+	it( 'Should not apply autop when rendering blocks', async () => {
+		await insertBlock( 'Custom HTML' );
+		await page.keyboard.type( '<a>' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Random Link' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '</a>' );
+		await publishPost();
+
+		// View the post.
+		const viewPostLinks = await page.$x( "//a[contains(text(), 'View Post')]" );
+		await viewPostLinks[ 0 ].click();
+		await page.waitForNavigation();
+
+		// Check the the content doesn't contain <p> tags
+		await page.waitForSelector( '.entry-content' );
+		const content = await page.$eval( '.entry-content', ( element ) => element.innerHTML.trim() );
+		expect( content ).toMatchSnapshot();
+	} );
+} );
diff --git a/test/e2e/specs/meta-boxes.test.js b/test/e2e/specs/meta-boxes.test.js
index 51e8a48a16502f..073d7b788cedbc 100644
--- a/test/e2e/specs/meta-boxes.test.js
+++ b/test/e2e/specs/meta-boxes.test.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { newPost } from '../support/utils';
+import { newPost, insertBlock, publishPost } from '../support/utils';
 import { activatePlugin, deactivatePlugin } from '../support/plugins';
 
 describe( 'Meta boxes', () => {
@@ -35,4 +35,27 @@ describe( 'Meta boxes', () => {
 			page.keyboard.up( 'Meta' ),
 		] );
 	} );
+
+	it( 'Should render dynamic blocks when the meta box uses the excerpt for front end rendering', async () => {
+		// Publish a post so there's something for the latest posts dynamic block to render.
+		await newPost();
+		await page.type( '.editor-post-title__input', 'A published post' );
+		await insertBlock( 'Paragraph' );
+		await page.keyboard.type( 'Hello there!' );
+		await publishPost();
+
+		// Publish a post with the latest posts dynamic block.
+		await newPost();
+		await page.type( '.editor-post-title__input', 'Dynamic block test' );
+		await insertBlock( 'Latest Posts' );
+		await publishPost();
+
+		// View the post.
+		const viewPostLinks = await page.$x( "//a[contains(text(), 'View Post')]" );
+		await viewPostLinks[ 0 ].click();
+		await page.waitForNavigation();
+
+		// Check the the dynamic block appears.
+		await page.waitForSelector( '.wp-block-latest-posts' );
+	} );
 } );
diff --git a/test/e2e/test-plugins/meta-box.php b/test/e2e/test-plugins/meta-box.php
index 8d959b50ed80b9..bc16f0bb0c4964 100644
--- a/test/e2e/test-plugins/meta-box.php
+++ b/test/e2e/test-plugins/meta-box.php
@@ -23,3 +23,15 @@ function gutenberg_test_meta_box_add_meta_box() {
 	);
 }
 add_action( 'add_meta_boxes', 'gutenberg_test_meta_box_add_meta_box' );
+
+
+function gutenberg_test_meta_box_render_head() {
+	// Emulates what plugins like Yoast do with meta data on the front end.
+	// Tests that our excerpt processing does not interfere with dynamic blocks.
+	$excerpt = wp_strip_all_tags( get_the_excerpt() );
+	?>
+	<meta property="gutenberg:hello" content="<?php echo esc_attr( $excerpt ); ?>" />
+	<?php
+}
+
+add_action( 'wp_head', 'gutenberg_test_meta_box_render_head' );
diff --git a/test/unit/jest.config.json b/test/unit/jest.config.json
index da5f3807bc5c54..2519b3b4e2e972 100644
--- a/test/unit/jest.config.json
+++ b/test/unit/jest.config.json
@@ -10,7 +10,6 @@
 		"<rootDir>/gutenberg-mobile/"
 	],
 	"moduleNameMapper": {
-		"@wordpress\\/(components)$": "$1",
 		"@wordpress\\/(block-serialization-spec-parser|is-shallow-equal)$": "packages/$1",
 		"@wordpress\\/([a-z0-9-]+)$": "packages/$1/src"
 	},
diff --git a/webpack.config.js b/webpack.config.js
index 78085c77bbbf8f..d9c876cf525eac 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-const ExtractTextPlugin = require( 'extract-text-webpack-plugin' );
 const WebpackRTLPlugin = require( 'webpack-rtl-plugin' );
 const LiveReloadPlugin = require( 'webpack-livereload-plugin' );
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
@@ -17,33 +16,6 @@ const CustomTemplatedPathPlugin = require( '@wordpress/custom-templated-path-web
 const LibraryExportDefaultPlugin = require( '@wordpress/library-export-default-webpack-plugin' );
 const { BundleAnalyzerPlugin } = require( 'webpack-bundle-analyzer' );
 
-// Main CSS loader for everything but blocks..
-const mainCSSExtractTextPlugin = new ExtractTextPlugin( {
-	filename: './build/[basename]/style.css',
-} );
-
-// Configuration for the ExtractTextPlugin.
-const extractConfig = {
-	use: [
-		{ loader: 'raw-loader' },
-		{
-			loader: 'postcss-loader',
-			options: {
-				plugins: require( './bin/packages/post-css-config' ),
-			},
-		},
-		{
-			loader: 'sass-loader',
-			query: {
-				includePaths: [ 'assets/stylesheets' ],
-				data: '@import "colors"; @import "breakpoints"; @import "variables"; @import "mixins"; @import "animations";@import "z-index";',
-				outputStyle: 'production' === process.env.NODE_ENV ?
-					'compressed' : 'nested',
-			},
-		},
-	],
-};
-
 /**
  * Given a string, returns a new string with dash separators converedd to
  * camel-case equivalent. This is not as aggressive as `_.camelCase` in
@@ -61,10 +33,6 @@ function camelCaseDash( string ) {
 	);
 }
 
-const entryPointNames = [
-	'components',
-];
-
 const gutenbergPackages = [
 	'a11y',
 	'api-fetch',
@@ -74,6 +42,7 @@ const gutenbergPackages = [
 	'block-library',
 	'block-serialization-default-parser',
 	'block-serialization-spec-parser',
+	'components',
 	'compose',
 	'core-data',
 	'data',
@@ -85,6 +54,7 @@ const gutenbergPackages = [
 	'editor',
 	'element',
 	'escape-html',
+	'format-library',
 	'hooks',
 	'html-entities',
 	'i18n',
@@ -112,10 +82,7 @@ const externals = {
 	'lodash-es': 'lodash',
 };
 
-[
-	...entryPointNames,
-	...gutenbergPackages,
-].forEach( ( name ) => {
+gutenbergPackages.forEach( ( name ) => {
 	externals[ `@wordpress/${ name }` ] = {
 		this: [ 'wp', camelCaseDash( name ) ],
 	};
@@ -126,18 +93,11 @@ const mode = isProduction ? 'production' : 'development';
 
 const config = {
 	mode,
-	entry: Object.assign(
-		entryPointNames.reduce( ( memo, path ) => {
-			const name = camelCaseDash( path );
-			memo[ name ] = `./${ path }`;
-			return memo;
-		}, {} ),
-		gutenbergPackages.reduce( ( memo, packageName ) => {
-			const name = camelCaseDash( packageName );
-			memo[ name ] = `./packages/${ packageName }`;
-			return memo;
-		}, {} ),
-	),
+	entry: gutenbergPackages.reduce( ( memo, packageName ) => {
+		const name = camelCaseDash( packageName );
+		memo[ name ] = `./packages/${ packageName }`;
+		return memo;
+	}, {} ),
 	output: {
 		filename: './build/[basename]/index.js',
 		path: __dirname,
@@ -170,14 +130,9 @@ const config = {
 				],
 				use: 'babel-loader',
 			},
-			{
-				test: /\.s?css$/,
-				use: mainCSSExtractTextPlugin.extract( extractConfig ),
-			},
 		],
 	},
 	plugins: [
-		mainCSSExtractTextPlugin,
 		// Create RTL files with a -rtl suffix
 		new WebpackRTLPlugin( {
 			suffix: '-rtl',