diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/script-loader.php
--- a/wp/wp-includes/script-loader.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-includes/script-loader.php	Mon Oct 14 18:28:13 2019 +0200
@@ -35,6 +35,802 @@
 require( ABSPATH . WPINC . '/functions.wp-styles.php' );
 
 /**
+ * Registers TinyMCE scripts.
+ *
+ * @since 5.0.0
+ *
+ * @param WP_Scripts $scripts WP_Scripts object.
+ */
+function wp_register_tinymce_scripts( &$scripts, $force_uncompressed = false ) {
+	global $tinymce_version, $concatenate_scripts, $compress_scripts;
+	$suffix     = wp_scripts_get_suffix();
+	$dev_suffix = wp_scripts_get_suffix( 'dev' );
+
+	script_concat_settings();
+
+	$compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )
+				  && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $force_uncompressed;
+
+	// Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production) or
+	// tinymce.min.js (when SCRIPT_DEBUG is true).
+	if ( $compressed ) {
+		$scripts->add( 'wp-tinymce', includes_url( 'js/tinymce/' ) . 'wp-tinymce.js', array(), $tinymce_version );
+	} else {
+		$scripts->add( 'wp-tinymce-root', includes_url( 'js/tinymce/' ) . "tinymce$dev_suffix.js", array(), $tinymce_version );
+		$scripts->add( 'wp-tinymce', includes_url( 'js/tinymce/' ) . "plugins/compat3x/plugin$dev_suffix.js", array( 'wp-tinymce-root' ), $tinymce_version );
+	}
+
+	$scripts->add( 'wp-tinymce-lists', includes_url( "js/tinymce/plugins/lists/plugin$suffix.js" ), array( 'wp-tinymce' ), $tinymce_version );
+}
+
+/**
+ * Registers all the WordPress vendor scripts that are in the standardized
+ * `js/dist/vendor/` location.
+ *
+ * For the order of `$scripts->add` see `wp_default_scripts`.
+ *
+ * @since 5.0.0
+ *
+ * @param WP_Scripts $scripts WP_Scripts object.
+ */
+function wp_default_packages_vendor( &$scripts ) {
+	global $wp_locale;
+
+	$suffix = wp_scripts_get_suffix();
+
+	$vendor_scripts = array(
+		'react'     => array( 'wp-polyfill' ),
+		'react-dom' => array( 'react' ),
+		'moment',
+		'lodash',
+		'wp-polyfill-fetch',
+		'wp-polyfill-formdata',
+		'wp-polyfill-node-contains',
+		'wp-polyfill-element-closest',
+		'wp-polyfill',
+	);
+
+	$vendor_scripts_versions = array(
+		'react'                       => '16.8.4',
+		'react-dom'                   => '16.8.4',
+		'moment'                      => '2.22.2',
+		'lodash'                      => '4.17.11',
+		'wp-polyfill-fetch'           => '3.0.0',
+		'wp-polyfill-formdata'        => '3.0.12',
+		'wp-polyfill-node-contains'   => '3.26.0-0',
+		'wp-polyfill-element-closest' => '2.0.2',
+		'wp-polyfill'                 => '7.0.0',
+	);
+
+	foreach ( $vendor_scripts as $handle => $dependencies ) {
+		if ( is_string( $dependencies ) ) {
+			$handle       = $dependencies;
+			$dependencies = array();
+		}
+
+		$path    = "/wp-includes/js/dist/vendor/$handle$suffix.js";
+		$version = $vendor_scripts_versions[ $handle ];
+
+		$scripts->add( $handle, $path, $dependencies, $version, 1 );
+	}
+
+	$scripts->add( 'wp-polyfill', null, array( 'wp-polyfill' ) );
+	did_action( 'init' ) && $scripts->add_inline_script(
+		'wp-polyfill',
+		wp_get_script_polyfill(
+			$scripts,
+			array(
+				'\'fetch\' in window' => 'wp-polyfill-fetch',
+				'document.contains'   => 'wp-polyfill-node-contains',
+				'window.FormData && window.FormData.prototype.keys' => 'wp-polyfill-formdata',
+				'Element.prototype.matches && Element.prototype.closest' => 'wp-polyfill-element-closest',
+			)
+		)
+	);
+
+	did_action( 'init' ) && $scripts->add_inline_script( 'lodash', 'window.lodash = _.noConflict();' );
+
+	did_action( 'init' ) && $scripts->add_inline_script(
+		'moment',
+		sprintf(
+			"moment.locale( '%s', %s );",
+			get_user_locale(),
+			wp_json_encode(
+				array(
+					'months'         => array_values( $wp_locale->month ),
+					'monthsShort'    => array_values( $wp_locale->month_abbrev ),
+					'weekdays'       => array_values( $wp_locale->weekday ),
+					'weekdaysShort'  => array_values( $wp_locale->weekday_abbrev ),
+					'week'           => array(
+						'dow' => (int) get_option( 'start_of_week', 0 ),
+					),
+					'longDateFormat' => array(
+						'LT'   => get_option( 'time_format', __( 'g:i a', 'default' ) ),
+						'LTS'  => null,
+						'L'    => null,
+						'LL'   => get_option( 'date_format', __( 'F j, Y', 'default' ) ),
+						'LLL'  => __( 'F j, Y g:i a', 'default' ),
+						'LLLL' => null,
+					),
+				)
+			)
+		),
+		'after'
+	);
+}
+
+/**
+ * Returns contents of an inline script used in appending polyfill scripts for
+ * browsers which fail the provided tests. The provided array is a mapping from
+ * a condition to verify feature support to its polyfill script handle.
+ *
+ * @since 5.0.0
+ *
+ * @param WP_Scripts $scripts WP_Scripts object.
+ * @param array      $tests   Features to detect.
+ * @return string Conditional polyfill inline script.
+ */
+function wp_get_script_polyfill( &$scripts, $tests ) {
+	$polyfill = '';
+	foreach ( $tests as $test => $handle ) {
+		if ( ! array_key_exists( $handle, $scripts->registered ) ) {
+			continue;
+		}
+
+		$src = $scripts->registered[ $handle ]->src;
+		$ver = $scripts->registered[ $handle ]->ver;
+
+		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $scripts->content_url && 0 === strpos( $src, $scripts->content_url ) ) ) {
+			$src = $scripts->base_url . $src;
+		}
+
+		if ( ! empty( $ver ) ) {
+			$src = add_query_arg( 'ver', $ver, $src );
+		}
+
+		/** This filter is documented in wp-includes/class.wp-scripts.php */
+		$src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
+
+		if ( ! $src ) {
+			continue;
+		}
+
+		$polyfill .= (
+			// Test presence of feature...
+			'( ' . $test . ' ) || ' .
+			// ...appending polyfill on any failures. Cautious viewers may balk
+			// at the `document.write`. Its caveat of synchronous mid-stream
+			// blocking write is exactly the behavior we need though.
+			'document.write( \'<script src="' .
+			$src .
+			'"></scr\' + \'ipt>\' );'
+		);
+	}
+
+	return $polyfill;
+}
+
+/**
+ * Registers all the WordPress packages scripts that are in the standardized
+ * `js/dist/` location.
+ *
+ * For the order of `$scripts->add` see `wp_default_scripts`.
+ *
+ * @since 5.0.0
+ *
+ * @param WP_Scripts $scripts WP_Scripts object.
+ */
+function wp_default_packages_scripts( &$scripts ) {
+	$suffix = wp_scripts_get_suffix();
+
+	$packages_versions = array(
+		'a11y'                               => '2.2.0',
+		'annotations'                        => '1.2.3',
+		'api-fetch'                          => '3.1.2',
+		'autop'                              => '2.0.0',
+		'blob'                               => '2.3.0',
+		'block-editor'                       => '2.0.3',
+		'block-library'                      => '2.4.6',
+		'block-serialization-default-parser' => '3.1.0',
+		'blocks'                             => '6.2.5',
+		'components'                         => '7.3.2',
+		'compose'                            => '3.2.0',
+		'core-data'                          => '2.2.2',
+		'data'                               => '4.4.0',
+		'date'                               => '3.2.0',
+		'deprecated'                         => '2.2.0',
+		'dom'                                => '2.2.5',
+		'dom-ready'                          => '2.2.0',
+		'edit-post'                          => '3.3.6',
+		'editor'                             => '9.2.6',
+		'element'                            => '2.3.0',
+		'escape-html'                        => '1.2.0',
+		'format-library'                     => '1.4.6',
+		'hooks'                              => '2.2.0',
+		'html-entities'                      => '2.2.0',
+		'i18n'                               => '3.3.0',
+		'is-shallow-equal'                   => '1.2.0',
+		'keycodes'                           => '2.2.0',
+		'list-reusable-blocks'               => '1.3.5',
+		'notices'                            => '1.3.0',
+		'nux'                                => '3.2.5',
+		'plugins'                            => '2.2.0',
+		'priority-queue'                     => '1.1.0',
+		'redux-routine'                      => '3.2.0',
+		'rich-text'                          => '3.2.3',
+		'shortcode'                          => '2.2.0',
+		'token-list'                         => '1.2.0',
+		'url'                                => '2.5.0',
+		'viewport'                           => '2.3.0',
+		'wordcount'                          => '2.2.0',
+	);
+
+	$packages_dependencies = array(
+		'api-fetch'                          => array( 'wp-polyfill', 'wp-i18n', 'wp-url' ),
+		'a11y'                               => array( 'wp-dom-ready', 'wp-polyfill' ),
+		'annotations'                        => array(
+			'wp-data',
+			'wp-hooks',
+			'wp-i18n',
+			'wp-polyfill',
+			'wp-rich-text',
+		),
+		'autop'                              => array( 'wp-polyfill' ),
+		'blob'                               => array( 'wp-polyfill' ),
+		'blocks'                             => array(
+			'wp-autop',
+			'wp-blob',
+			'wp-block-serialization-default-parser',
+			'wp-data',
+			'wp-dom',
+			'wp-element',
+			'wp-hooks',
+			'wp-html-entities',
+			'wp-i18n',
+			'wp-is-shallow-equal',
+			'wp-polyfill',
+			'wp-shortcode',
+			'lodash',
+		),
+		'block-library'                      => array(
+			'editor',
+			'lodash',
+			'wp-api-fetch',
+			'wp-autop',
+			'wp-blob',
+			'wp-block-editor',
+			'wp-blocks',
+			'wp-components',
+			'wp-compose',
+			'wp-core-data',
+			'wp-data',
+			'wp-date',
+			'wp-editor',
+			'wp-element',
+			'wp-html-entities',
+			'wp-i18n',
+			'wp-keycodes',
+			'wp-polyfill',
+			'wp-url',
+			'wp-viewport',
+			'wp-rich-text',
+		),
+		'block-serialization-default-parser' => array(),
+		'block-editor'                       => array(
+			'lodash',
+			'wp-a11y',
+			'wp-blob',
+			'wp-blocks',
+			'wp-components',
+			'wp-compose',
+			'wp-core-data',
+			'wp-data',
+			'wp-dom',
+			'wp-element',
+			'wp-hooks',
+			'wp-html-entities',
+			'wp-i18n',
+			'wp-is-shallow-equal',
+			'wp-keycodes',
+			'wp-rich-text',
+			'wp-token-list',
+			'wp-url',
+			'wp-viewport',
+			'wp-wordcount',
+		),
+		'components'                         => array(
+			'lodash',
+			'moment',
+			'wp-a11y',
+			'wp-api-fetch',
+			'wp-compose',
+			'wp-dom',
+			'wp-element',
+			'wp-hooks',
+			'wp-html-entities',
+			'wp-i18n',
+			'wp-is-shallow-equal',
+			'wp-keycodes',
+			'wp-polyfill',
+			'wp-rich-text',
+			'wp-url',
+		),
+		'compose'                            => array(
+			'lodash',
+			'wp-element',
+			'wp-is-shallow-equal',
+			'wp-polyfill',
+		),
+		'core-data'                          => array(
+			'lodash',
+			'wp-api-fetch',
+			'wp-data',
+			'wp-deprecated',
+			'wp-polyfill',
+			'wp-url',
+		),
+		'data'                               => array(
+			'lodash',
+			'wp-compose',
+			'wp-element',
+			'wp-is-shallow-equal',
+			'wp-polyfill',
+			'wp-priority-queue',
+			'wp-redux-routine',
+		),
+		'date'                               => array( 'moment', 'wp-polyfill' ),
+		'deprecated'                         => array( 'wp-polyfill', 'wp-hooks' ),
+		'dom'                                => array( 'lodash', 'wp-polyfill' ),
+		'dom-ready'                          => array( 'wp-polyfill' ),
+		'edit-post'                          => array(
+			'jquery',
+			'lodash',
+			'postbox',
+			'media-models',
+			'media-views',
+			'wp-a11y',
+			'wp-api-fetch',
+			'wp-block-editor',
+			'wp-block-library',
+			'wp-blocks',
+			'wp-components',
+			'wp-compose',
+			'wp-core-data',
+			'wp-data',
+			'wp-dom-ready',
+			'wp-editor',
+			'wp-element',
+			'wp-embed',
+			'wp-i18n',
+			'wp-keycodes',
+			'wp-notices',
+			'wp-nux',
+			'wp-plugins',
+			'wp-polyfill',
+			'wp-url',
+			'wp-viewport',
+		),
+		'editor'                             => array(
+			'lodash',
+			'wp-api-fetch',
+			'wp-blob',
+			'wp-block-editor',
+			'wp-blocks',
+			'wp-components',
+			'wp-compose',
+			'wp-core-data',
+			'wp-data',
+			'wp-date',
+			'wp-deprecated',
+			'wp-element',
+			'wp-hooks',
+			'wp-html-entities',
+			'wp-i18n',
+			'wp-keycodes',
+			'wp-notices',
+			'wp-nux',
+			'wp-polyfill',
+			'wp-url',
+			'wp-viewport',
+			'wp-wordcount',
+		),
+		'element'                            => array( 'wp-polyfill', 'react', 'react-dom', 'lodash', 'wp-escape-html' ),
+		'escape-html'                        => array( 'wp-polyfill' ),
+		'format-library'                     => array(
+			'wp-block-editor',
+			'wp-components',
+			'wp-editor',
+			'wp-element',
+			'wp-i18n',
+			'wp-keycodes',
+			'wp-polyfill',
+			'wp-rich-text',
+			'wp-url',
+		),
+		'hooks'                              => array( 'wp-polyfill' ),
+		'html-entities'                      => array( 'wp-polyfill' ),
+		'i18n'                               => array( 'wp-polyfill' ),
+		'is-shallow-equal'                   => array( 'wp-polyfill' ),
+		'keycodes'                           => array( 'lodash', 'wp-polyfill', 'wp-i18n' ),
+		'list-reusable-blocks'               => array(
+			'lodash',
+			'wp-api-fetch',
+			'wp-components',
+			'wp-compose',
+			'wp-element',
+			'wp-i18n',
+			'wp-polyfill',
+		),
+		'notices'                            => array(
+			'lodash',
+			'wp-a11y',
+			'wp-data',
+			'wp-polyfill',
+		),
+		'nux'                                => array(
+			'wp-element',
+			'lodash',
+			'wp-components',
+			'wp-compose',
+			'wp-data',
+			'wp-i18n',
+			'wp-polyfill',
+			'lodash',
+		),
+		'plugins'                            => array( 'lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill' ),
+		'priority-queue'                     => array(),
+		'redux-routine'                      => array( 'wp-polyfill' ),
+		'rich-text'                          => array(
+			'lodash',
+			'wp-data',
+			'wp-escape-html',
+			'wp-polyfill',
+		),
+		'shortcode'                          => array( 'wp-polyfill', 'lodash' ),
+		'token-list'                         => array( 'lodash', 'wp-polyfill' ),
+		'url'                                => array( 'wp-polyfill' ),
+		'viewport'                           => array( 'wp-polyfill', 'wp-element', 'wp-data', 'wp-compose', 'lodash' ),
+		'wordcount'                          => array( 'wp-polyfill' ),
+	);
+
+	$package_translations = array(
+		'api-fetch',
+		'blocks',
+		'block-editor',
+		'block-library',
+		'components',
+		'edit-post',
+		'editor',
+		'format-library',
+		'keycodes',
+		'list-reusable-blocks',
+		'nux',
+	);
+
+	foreach ( $packages_dependencies as $package => $dependencies ) {
+		$handle  = 'wp-' . $package;
+		$path    = "/wp-includes/js/dist/$package$suffix.js";
+		$version = $packages_versions[ $package ];
+
+		$scripts->add( $handle, $path, $dependencies, $version, 1 );
+
+		if ( in_array( $package, $package_translations, true ) ) {
+			$scripts->set_translations( $handle );
+		}
+	}
+}
+
+/**
+ * Adds inline scripts required for the WordPress JavaScript packages.
+ *
+ * @since 5.0.0
+ *
+ * @param WP_Scripts $scripts WP_Scripts object.
+ */
+function wp_default_packages_inline_scripts( &$scripts ) {
+	global $wp_locale;
+
+	if ( isset( $scripts->registered['wp-api-fetch'] ) ) {
+		$scripts->registered['wp-api-fetch']->deps[] = 'wp-hooks';
+	}
+	$scripts->add_inline_script(
+		'wp-api-fetch',
+		sprintf(
+			implode(
+				"\n",
+				array(
+					'( function() {',
+					'	var nonceMiddleware = wp.apiFetch.createNonceMiddleware( "%s" );',
+					'	wp.apiFetch.use( nonceMiddleware );',
+					'	wp.hooks.addAction(',
+					'		"heartbeat.tick",',
+					'		"core/api-fetch/create-nonce-middleware",',
+					'		function( response ) {',
+					'			if ( response[ "rest_nonce" ] ) {',
+					'				nonceMiddleware.nonce = response[ "rest_nonce" ];',
+					'			}',
+					'		}',
+					'	);',
+					'} )();',
+				)
+			),
+			( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' )
+		),
+		'after'
+	);
+	$scripts->add_inline_script(
+		'wp-api-fetch',
+		sprintf(
+			'wp.apiFetch.use( wp.apiFetch.createRootURLMiddleware( "%s" ) );',
+			esc_url_raw( get_rest_url() )
+		),
+		'after'
+	);
+
+	$scripts->add_inline_script(
+		'wp-data',
+		implode(
+			"\n",
+			array(
+				'( function() {',
+				'	var userId = ' . get_current_user_ID() . ';',
+				'	var storageKey = "WP_DATA_USER_" + userId;',
+				'	wp.data',
+				'		.use( wp.data.plugins.persistence, { storageKey: storageKey } )',
+				'		.use( wp.data.plugins.controls );',
+				'	wp.data.plugins.persistence.__unstableMigrate( { storageKey: storageKey } );',
+				'} )();',
+			)
+		)
+	);
+
+	$scripts->add_inline_script(
+		'wp-date',
+		sprintf(
+			'wp.date.setSettings( %s );',
+			wp_json_encode(
+				array(
+					'l10n'     => array(
+						'locale'        => get_user_locale(),
+						'months'        => array_values( $wp_locale->month ),
+						'monthsShort'   => array_values( $wp_locale->month_abbrev ),
+						'weekdays'      => array_values( $wp_locale->weekday ),
+						'weekdaysShort' => array_values( $wp_locale->weekday_abbrev ),
+						'meridiem'      => (object) $wp_locale->meridiem,
+						'relative'      => array(
+							/* translators: %s: duration */
+							'future' => __( '%s from now' ),
+							/* translators: %s: duration */
+							'past'   => __( '%s ago' ),
+						),
+					),
+					'formats'  => array(
+						/* translators: Time format, see https://secure.php.net/date */
+						'time'                => get_option( 'time_format', __( 'g:i a' ) ),
+						/* translators: Date format, see https://secure.php.net/date */
+						'date'                => get_option( 'date_format', __( 'F j, Y' ) ),
+						/* translators: Date/Time format, see https://secure.php.net/date */
+						'datetime'            => __( 'F j, Y g:i a' ),
+						/* translators: Abbreviated date/time format, see https://secure.php.net/date */
+						'datetimeAbbreviated' => __( 'M j, Y g:i a' ),
+					),
+					'timezone' => array(
+						'offset' => get_option( 'gmt_offset', 0 ),
+						'string' => get_option( 'timezone_string', 'UTC' ),
+					),
+				)
+			)
+		),
+		'after'
+	);
+
+	// Loading the old editor and its config to ensure the classic block works as expected.
+	$scripts->add_inline_script(
+		'editor',
+		'window.wp.oldEditor = window.wp.editor;',
+		'after'
+	);
+}
+
+/**
+ * Adds inline scripts required for the TinyMCE in the block editor.
+ *
+ * These TinyMCE init settings are used to extend and override the default settings
+ * from `_WP_Editors::default_settings()` for the Classic block.
+ *
+ * @since 5.0.0
+ *
+ * @global WP_Scripts $wp_scripts
+ */
+function wp_tinymce_inline_scripts() {
+	global $wp_scripts;
+
+	/** This filter is documented in wp-includes/class-wp-editor.php */
+	$editor_settings = apply_filters( 'wp_editor_settings', array( 'tinymce' => true ), 'classic-block' );
+
+	$tinymce_plugins = array(
+		'charmap',
+		'colorpicker',
+		'hr',
+		'lists',
+		'media',
+		'paste',
+		'tabfocus',
+		'textcolor',
+		'fullscreen',
+		'wordpress',
+		'wpautoresize',
+		'wpeditimage',
+		'wpemoji',
+		'wpgallery',
+		'wplink',
+		'wpdialogs',
+		'wptextpattern',
+		'wpview',
+	);
+
+	/* This filter is documented in wp-includes/class-wp-editor.php */
+	$tinymce_plugins = apply_filters( 'tiny_mce_plugins', $tinymce_plugins, 'classic-block' );
+	$tinymce_plugins = array_unique( $tinymce_plugins );
+
+	$disable_captions = false;
+	// Runs after `tiny_mce_plugins` but before `mce_buttons`.
+	/** This filter is documented in wp-admin/includes/media.php */
+	if ( apply_filters( 'disable_captions', '' ) ) {
+		$disable_captions = true;
+	}
+
+	$toolbar1 = array(
+		'formatselect',
+		'bold',
+		'italic',
+		'bullist',
+		'numlist',
+		'blockquote',
+		'alignleft',
+		'aligncenter',
+		'alignright',
+		'link',
+		'unlink',
+		'wp_more',
+		'spellchecker',
+		'wp_add_media',
+		'wp_adv',
+	);
+
+	/* This filter is documented in wp-includes/class-wp-editor.php */
+	$toolbar1 = apply_filters( 'mce_buttons', $toolbar1, 'classic-block' );
+
+	$toolbar2 = array(
+		'strikethrough',
+		'hr',
+		'forecolor',
+		'pastetext',
+		'removeformat',
+		'charmap',
+		'outdent',
+		'indent',
+		'undo',
+		'redo',
+		'wp_help',
+	);
+
+	/* This filter is documented in wp-includes/class-wp-editor.php */
+	$toolbar2 = apply_filters( 'mce_buttons_2', $toolbar2, 'classic-block' );
+	/* This filter is documented in wp-includes/class-wp-editor.php */
+	$toolbar3 = apply_filters( 'mce_buttons_3', array(), 'classic-block' );
+	/* This filter is documented in wp-includes/class-wp-editor.php */
+	$toolbar4 = apply_filters( 'mce_buttons_4', array(), 'classic-block' );
+	/* This filter is documented in wp-includes/class-wp-editor.php */
+	$external_plugins = apply_filters( 'mce_external_plugins', array(), 'classic-block' );
+
+	$tinymce_settings = array(
+		'plugins'              => implode( ',', $tinymce_plugins ),
+		'toolbar1'             => implode( ',', $toolbar1 ),
+		'toolbar2'             => implode( ',', $toolbar2 ),
+		'toolbar3'             => implode( ',', $toolbar3 ),
+		'toolbar4'             => implode( ',', $toolbar4 ),
+		'external_plugins'     => wp_json_encode( $external_plugins ),
+		'classic_block_editor' => true,
+	);
+
+	if ( $disable_captions ) {
+		$tinymce_settings['wpeditimage_disable_captions'] = true;
+	}
+
+	if ( ! empty( $editor_settings['tinymce'] ) && is_array( $editor_settings['tinymce'] ) ) {
+		array_merge( $tinymce_settings, $editor_settings['tinymce'] );
+	}
+
+	/* This filter is documented in wp-includes/class-wp-editor.php */
+	$tinymce_settings = apply_filters( 'tiny_mce_before_init', $tinymce_settings, 'classic-block' );
+
+	// Do "by hand" translation from PHP array to js object.
+	// Prevents breakage in some custom settings.
+	$init_obj = '';
+	foreach ( $tinymce_settings as $key => $value ) {
+		if ( is_bool( $value ) ) {
+			$val       = $value ? 'true' : 'false';
+			$init_obj .= $key . ':' . $val . ',';
+			continue;
+		} elseif ( ! empty( $value ) && is_string( $value ) && (
+			( '{' == $value{0} && '}' == $value{strlen( $value ) - 1} ) ||
+			( '[' == $value{0} && ']' == $value{strlen( $value ) - 1} ) ||
+			preg_match( '/^\(?function ?\(/', $value ) ) ) {
+			$init_obj .= $key . ':' . $value . ',';
+			continue;
+		}
+		$init_obj .= $key . ':"' . $value . '",';
+	}
+
+	$init_obj = '{' . trim( $init_obj, ' ,' ) . '}';
+
+	$script = 'window.wpEditorL10n = {
+		tinymce: {
+			baseURL: ' . wp_json_encode( includes_url( 'js/tinymce' ) ) . ',
+			suffix: ' . ( SCRIPT_DEBUG ? '""' : '".min"' ) . ',
+			settings: ' . $init_obj . ',
+		}
+	}';
+
+	$wp_scripts->add_inline_script( 'wp-block-library', $script, 'before' );
+}
+
+/**
+ * Registers all the WordPress packages scripts.
+ *
+ * @since 5.0.0
+ *
+ * @param WP_Scripts $scripts WP_Scripts object.
+ */
+function wp_default_packages( &$scripts ) {
+	wp_default_packages_vendor( $scripts );
+	wp_register_tinymce_scripts( $scripts );
+	wp_default_packages_scripts( $scripts );
+
+	if ( did_action( 'init' ) ) {
+		wp_default_packages_inline_scripts( $scripts );
+	}
+}
+
+/**
+ * Returns the suffix that can be used for the scripts.
+ *
+ * There are two suffix types, the normal one and the dev suffix.
+ *
+ * @since 5.0.0
+ *
+ * @param string $type The type of suffix to retrieve.
+ * @return string The script suffix.
+ */
+function wp_scripts_get_suffix( $type = '' ) {
+	static $suffixes;
+
+	if ( $suffixes === null ) {
+		include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+
+		$develop_src = false !== strpos( $wp_version, '-src' );
+
+		if ( ! defined( 'SCRIPT_DEBUG' ) ) {
+			define( 'SCRIPT_DEBUG', $develop_src );
+		}
+		$suffix     = SCRIPT_DEBUG ? '' : '.min';
+		$dev_suffix = $develop_src ? '' : '.min';
+
+		$suffixes = array(
+			'suffix'     => $suffix,
+			'dev_suffix' => $dev_suffix,
+		);
+	}
+
+	if ( $type === 'dev' ) {
+		return $suffixes['dev_suffix'];
+	}
+
+	return $suffixes['suffix'];
+}
+
+/**
  * Register all WordPress scripts.
  *
  * Localizes some of them.
@@ -46,110 +842,132 @@
  * @param WP_Scripts $scripts WP_Scripts object.
  */
 function wp_default_scripts( &$scripts ) {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
-
-	$develop_src = false !== strpos( $wp_version, '-src' );
-
-	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
-		define( 'SCRIPT_DEBUG', $develop_src );
-	}
+	$suffix     = wp_scripts_get_suffix();
+	$dev_suffix = wp_scripts_get_suffix( 'dev' );
 
 	if ( ! $guessurl = site_url() ) {
 		$guessed_url = true;
-		$guessurl = wp_guess_url();
+		$guessurl    = wp_guess_url();
 	}
 
-	$scripts->base_url = $guessurl;
-	$scripts->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
+	$scripts->base_url        = $guessurl;
+	$scripts->content_url     = defined( 'WP_CONTENT_URL' ) ? WP_CONTENT_URL : '';
 	$scripts->default_version = get_bloginfo( 'version' );
-	$scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/');
-
-	$suffix = SCRIPT_DEBUG ? '' : '.min';
-	$dev_suffix = $develop_src ? '' : '.min';
+	$scripts->default_dirs    = array( '/wp-admin/js/', '/wp-includes/js/' );
 
 	$scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
-	did_action( 'init' ) && $scripts->localize( 'utils', 'userSettings', array(
-		'url' => (string) SITECOOKIEPATH,
-		'uid' => (string) get_current_user_id(),
-		'time' => (string) time(),
-		'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'utils',
+		'userSettings',
+		array(
+			'url'    => (string) SITECOOKIEPATH,
+			'uid'    => (string) get_current_user_id(),
+			'time'   => (string) time(),
+			'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ),
+		)
+	);
 
-	$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
-		'warnDelete'   => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
-		'dismiss'      => __( 'Dismiss this notice.' ),
-		'collapseMenu' => __( 'Collapse Main menu' ),
-		'expandMenu'   => __( 'Expand Main menu' ),
-	) );
+	$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array( 'jquery', 'hoverIntent', 'utils' ), false, 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'common',
+		'commonL10n',
+		array(
+			'warnDelete'   => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
+			'dismiss'      => __( 'Dismiss this notice.' ),
+			'collapseMenu' => __( 'Collapse Main menu' ),
+			'expandMenu'   => __( 'Expand Main menu' ),
+		)
+	);
 
-	$scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery' ), false, 1 );
+	$scripts->add( 'wp-sanitize', "/wp-includes/js/wp-sanitize$suffix.js", array(), false, 1 );
+
+	$scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery', 'wp-sanitize' ), false, 1 );
 
 	$scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1 );
 
 	$scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
-		'closeAllOpenTags'      => __( 'Close all open tags' ),
-		'closeTags'             => __( 'close tags' ),
-		'enterURL'              => __( 'Enter the URL' ),
-		'enterImageURL'         => __( 'Enter the URL of the image' ),
-		'enterImageDescription' => __( 'Enter a description of the image' ),
-		'textdirection'         => __( 'text direction' ),
-		'toggleTextdirection'   => __( 'Toggle Editor Text Direction' ),
-		'dfw'                   => __( 'Distraction-free writing mode' ),
-		'strong'          => __( 'Bold' ),
-		'strongClose'     => __( 'Close bold tag' ),
-		'em'              => __( 'Italic' ),
-		'emClose'         => __( 'Close italic tag' ),
-		'link'            => __( 'Insert link' ),
-		'blockquote'      => __( 'Blockquote' ),
-		'blockquoteClose' => __( 'Close blockquote tag' ),
-		'del'             => __( 'Deleted text (strikethrough)' ),
-		'delClose'        => __( 'Close deleted text tag' ),
-		'ins'             => __( 'Inserted text' ),
-		'insClose'        => __( 'Close inserted text tag' ),
-		'image'           => __( 'Insert image' ),
-		'ul'              => __( 'Bulleted list' ),
-		'ulClose'         => __( 'Close bulleted list tag' ),
-		'ol'              => __( 'Numbered list' ),
-		'olClose'         => __( 'Close numbered list tag' ),
-		'li'              => __( 'List item' ),
-		'liClose'         => __( 'Close list item tag' ),
-		'code'            => __( 'Code' ),
-		'codeClose'       => __( 'Close code tag' ),
-		'more'            => __( 'Insert Read More tag' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'quicktags',
+		'quicktagsL10n',
+		array(
+			'closeAllOpenTags'      => __( 'Close all open tags' ),
+			'closeTags'             => __( 'close tags' ),
+			'enterURL'              => __( 'Enter the URL' ),
+			'enterImageURL'         => __( 'Enter the URL of the image' ),
+			'enterImageDescription' => __( 'Enter a description of the image' ),
+			'textdirection'         => __( 'text direction' ),
+			'toggleTextdirection'   => __( 'Toggle Editor Text Direction' ),
+			'dfw'                   => __( 'Distraction-free writing mode' ),
+			'strong'                => __( 'Bold' ),
+			'strongClose'           => __( 'Close bold tag' ),
+			'em'                    => __( 'Italic' ),
+			'emClose'               => __( 'Close italic tag' ),
+			'link'                  => __( 'Insert link' ),
+			'blockquote'            => __( 'Blockquote' ),
+			'blockquoteClose'       => __( 'Close blockquote tag' ),
+			'del'                   => __( 'Deleted text (strikethrough)' ),
+			'delClose'              => __( 'Close deleted text tag' ),
+			'ins'                   => __( 'Inserted text' ),
+			'insClose'              => __( 'Close inserted text tag' ),
+			'image'                 => __( 'Insert image' ),
+			'ul'                    => __( 'Bulleted list' ),
+			'ulClose'               => __( 'Close bulleted list tag' ),
+			'ol'                    => __( 'Numbered list' ),
+			'olClose'               => __( 'Close numbered list tag' ),
+			'li'                    => __( 'List item' ),
+			'liClose'               => __( 'Close list item tag' ),
+			'code'                  => __( 'Code' ),
+			'codeClose'             => __( 'Close code tag' ),
+			'more'                  => __( 'Insert Read More tag' ),
+		)
+	);
 
-	$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
+	$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array( 'prototype' ), '3517m' );
 
-	$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), false, 1 );
+	$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array( 'utils', 'jquery' ), false, 1 );
+
+	$scripts->add( 'clipboard', "/wp-includes/js/clipboard$suffix.js", array(), false, 1 );
 
 	// Back-compat for old DFW. To-do: remove at the end of 2016.
 	$scripts->add( 'wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1 );
 
-	$scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
-		'noPerm' => __('Sorry, you are not allowed to do that.'),
-		'broken' => __('Something went wrong.')
-	) );
+	$scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array( 'jquery' ), false, 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'wp-ajax-response',
+		'wpAjax',
+		array(
+			'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
+			'broken' => __( 'Something went wrong.' ),
+		)
+	);
 
 	$scripts->add( 'wp-api-request', "/wp-includes/js/api-request$suffix.js", array( 'jquery' ), false, 1 );
 	// `wpApiSettings` is also used by `wp-api`, which depends on this script.
-	did_action( 'init' ) && $scripts->localize( 'wp-api-request', 'wpApiSettings', array(
-		'root'          => esc_url_raw( get_rest_url() ),
-		'nonce'         => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
-		'versionString' => 'wp/v2/',
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'wp-api-request',
+		'wpApiSettings',
+		array(
+			'root'          => esc_url_raw( get_rest_url() ),
+			'nonce'         => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
+			'versionString' => 'wp/v2/',
+		)
+	);
 
 	$scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111129a', 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-pointer', 'wpPointerL10n', array(
-		'dismiss' => __('Dismiss'),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'wp-pointer',
+		'wpPointerL10n',
+		array(
+			'dismiss' => __( 'Dismiss' ),
+		)
+	);
 
-	$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('heartbeat'), false, 1 );
+	$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array( 'heartbeat' ), false, 1 );
 
-	$scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings',
+	$scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array( 'jquery', 'wp-hooks' ), false, 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'heartbeat',
+		'heartbeatSettings',
 		/**
 		 * Filters the Heartbeat settings.
 		 *
@@ -160,154 +978,166 @@
 		apply_filters( 'heartbeat_settings', array() )
 	);
 
-	$scripts->add( 'wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array('heartbeat'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-auth-check', 'authcheckL10n', array(
-		'beforeunload' => __('Your session has expired. You can log in again from this page or go to the login page.'),
+	$scripts->add( 'wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array( 'heartbeat' ), false, 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'wp-auth-check',
+		'authcheckL10n',
+		array(
+			'beforeunload' => __( 'Your session has expired. You can log in again from this page or go to the login page.' ),
 
-		/**
-		 * Filters the authentication check interval.
-		 *
-		 * @since 3.6.0
-		 *
-		 * @param int $interval The interval in which to check a user's authentication.
-		 *                      Default 3 minutes in seconds, or 180.
-		 */
-		'interval' => apply_filters( 'wp_auth_check_interval', 3 * MINUTE_IN_SECONDS ),
-	) );
+			/**
+			 * Filters the authentication check interval.
+			 *
+			 * @since 3.6.0
+			 *
+			 * @param int $interval The interval in which to check a user's authentication.
+			 *                      Default 3 minutes in seconds, or 180.
+			 */
+			'interval'     => apply_filters( 'wp_auth_check_interval', 3 * MINUTE_IN_SECONDS ),
+		)
+	);
 
 	$scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
 
 	// WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.
-	$scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
-	$scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0');
-	$scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
-	$scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0');
+	$scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1' );
+	$scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array( 'prototype' ), '1.9.0' );
+	$scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array( 'scriptaculous-root' ), '1.9.0' );
+	$scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array( 'scriptaculous-builder', 'scriptaculous-effects' ), '1.9.0' );
+	$scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array( 'scriptaculous-root' ), '1.9.0' );
+	$scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array( 'scriptaculous-effects' ), '1.9.0' );
 	$scripts->add( 'scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' );
-	$scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls') );
+	$scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array( 'scriptaculous-root' ), '1.9.0' );
+	$scripts->add( 'scriptaculous', false, array( 'scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls' ) );
 
 	// not used in core, replaced by Jcrop.js
-	$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop') );
+	$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array( 'scriptaculous-dragdrop' ) );
 
 	// jQuery
-	$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4' );
-	$scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4' );
+	$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4-wp' );
+	$scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4-wp' );
 	$scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );
 
 	// full jQuery UI
-	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
 
-	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-scale'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-size'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array( 'jquery-effects-core', 'jquery-effects-scale' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array( 'jquery-effects-core', 'jquery-effects-size' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
 
-	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array( 'jquery-ui-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array( 'jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array( 'jquery-ui-draggable' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array( 'jquery-ui-menu' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array( 'jquery-ui-button' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
 
 	// Strings for 'jquery-ui-autocomplete' live region messages
-	did_action( 'init' ) && $scripts->localize( 'jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
-		'noResults' => __( 'No results found.' ),
-		/* translators: Number of results found when using jQuery UI Autocomplete */
-		'oneResult' => __( '1 result found. Use up and down arrow keys to navigate.' ),
-		/* translators: %d: Number of results found when using jQuery UI Autocomplete */
-		'manyResults' => __( '%d results found. Use up and down arrow keys to navigate.' ),
-		'itemSelected' => __( 'Item selected.' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'jquery-ui-autocomplete',
+		'uiAutocompleteL10n',
+		array(
+			'noResults'    => __( 'No results found.' ),
+			/* translators: Number of results found when using jQuery UI Autocomplete */
+			'oneResult'    => __( '1 result found. Use up and down arrow keys to navigate.' ),
+			/* translators: %d: Number of results found when using jQuery UI Autocomplete */
+			'manyResults'  => __( '%d results found. Use up and down arrow keys to navigate.' ),
+			'itemSelected' => __( 'Item selected.' ),
+		)
+	);
 
 	// deprecated, not used in core, most functionality is included in jQuery 1.3
-	$scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '4.2.1', 1 );
+	$scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array( 'jquery' ), '4.2.1', 1 );
 
 	// jQuery plugins
-	$scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color.min.js", array('jquery'), '2.1.1', 1 );
-	$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1 );
-	$scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1 );
-	$scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1 );
-	$scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1 );
-	$scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1 );
-	$scripts->add( 'jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1 );
+	$scripts->add( 'jquery-color', '/wp-includes/js/jquery/jquery.color.min.js', array( 'jquery' ), '2.1.1', 1 );
+	$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array( 'jquery' ), '20m', 1 );
+	$scripts->add( 'jquery-query', '/wp-includes/js/jquery/jquery.query.js', array( 'jquery' ), '2.1.7', 1 );
+	$scripts->add( 'jquery-serialize-object', '/wp-includes/js/jquery/jquery.serialize-object.js', array( 'jquery' ), '0.2', 1 );
+	$scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array( 'jquery' ), '0.0.2m', 1 );
+	$scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array( 'jquery', 'jquery-hotkeys' ), false, 1 );
+	$scripts->add( 'jquery-touch-punch', '/wp-includes/js/jquery/jquery.ui.touch-punch.js', array( 'jquery-ui-widget', 'jquery-ui-mouse' ), '0.2.2', 1 );
 
-	// Not used any more, registered for backwards compatibility.
-	$scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
+	// Not used any more, registered for backward compatibility.
+	$scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array( 'jquery' ), '1.1-20110113', 1 );
 
 	// Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
 	// It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
-	$scripts->add( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 );
-	$scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array( 'imagesloaded' ), '3.3.2', 1 );
+	$scripts->add( 'imagesloaded', '/wp-includes/js/imagesloaded.min.js', array(), '3.2.0', 1 );
+	$scripts->add( 'masonry', '/wp-includes/js/masonry.min.js', array( 'imagesloaded' ), '3.3.2', 1 );
 	$scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2b', 1 );
 
-	$scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
-	did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
-		'next' => __('Next &gt;'),
-		'prev' => __('&lt; Prev'),
-		'image' => __('Image'),
-		'of' => __('of'),
-		'close' => __('Close'),
-		'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
-		'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'),
-	) );
+	$scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array( 'jquery' ), '3.1-20121105', 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'thickbox',
+		'thickboxL10n',
+		array(
+			'next'             => __( 'Next &gt;' ),
+			'prev'             => __( '&lt; Prev' ),
+			'image'            => __( 'Image' ),
+			'of'               => __( 'of' ),
+			'close'            => __( 'Close' ),
+			'noiframes'        => __( 'This feature requires inline frames. You have iframes disabled or your browser does not support them.' ),
+			'loadingAnimation' => includes_url( 'js/thickbox/loadingAnimation.gif' ),
+		)
+	);
 
-	$scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.12');
+	$scripts->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.min.js', array( 'jquery' ), '0.9.12' );
 
-	$scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
+	$scripts->add( 'swfobject', '/wp-includes/js/swfobject.js', array(), '2.2-20120417' );
 
 	// Error messages for Plupload.
 	$uploader_l10n = array(
-		'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
-		'file_exceeds_size_limit' => __('%s exceeds the maximum upload size for this site.'),
-		'zero_byte_file' => __('This file is empty. Please try another.'),
-		'invalid_filetype' => __('Sorry, this file type is not permitted for security reasons.'),
-		'not_an_image' => __('This file is not an image. Please try another.'),
-		'image_memory_exceeded' => __('Memory exceeded. Please try another smaller file.'),
-		'image_dimensions_exceeded' => __('This is larger than the maximum size. Please try another.'),
-		'default_error' => __('An error occurred in the upload. Please try again later.'),
-		'missing_upload_url' => __('There was a configuration error. Please contact the server administrator.'),
-		'upload_limit_exceeded' => __('You may only upload 1 file.'),
-		'http_error' => __('HTTP error.'),
-		'upload_failed' => __('Upload failed.'),
+		'queue_limit_exceeded'      => __( 'You have attempted to queue too many files.' ),
+		'file_exceeds_size_limit'   => __( '%s exceeds the maximum upload size for this site.' ),
+		'zero_byte_file'            => __( 'This file is empty. Please try another.' ),
+		'invalid_filetype'          => __( 'Sorry, this file type is not permitted for security reasons.' ),
+		'not_an_image'              => __( 'This file is not an image. Please try another.' ),
+		'image_memory_exceeded'     => __( 'Memory exceeded. Please try another smaller file.' ),
+		'image_dimensions_exceeded' => __( 'This is larger than the maximum size. Please try another.' ),
+		'default_error'             => __( 'An error occurred in the upload. Please try again later.' ),
+		'missing_upload_url'        => __( 'There was a configuration error. Please contact the server administrator.' ),
+		'upload_limit_exceeded'     => __( 'You may only upload 1 file.' ),
+		'http_error'                => __( 'HTTP error.' ),
+		'upload_failed'             => __( 'Upload failed.' ),
 		/* translators: 1: Opening link tag, 2: Closing link tag */
-		'big_upload_failed' => __('Please try uploading this file with the %1$sbrowser uploader%2$s.'),
-		'big_upload_queued' => __('%s exceeds the maximum upload size for the multi-file uploader when used in your browser.'),
-		'io_error' => __('IO error.'),
-		'security_error' => __('Security error.'),
-		'file_cancelled' => __('File canceled.'),
-		'upload_stopped' => __('Upload stopped.'),
-		'dismiss' => __('Dismiss'),
-		'crunching' => __('Crunching&hellip;'),
-		'deleted' => __('moved to the trash.'),
-		'error_uploading' => __('&#8220;%s&#8221; has failed to upload.')
+		'big_upload_failed'         => __( 'Please try uploading this file with the %1$sbrowser uploader%2$s.' ),
+		'big_upload_queued'         => __( '%s exceeds the maximum upload size for the multi-file uploader when used in your browser.' ),
+		'io_error'                  => __( 'IO error.' ),
+		'security_error'            => __( 'Security error.' ),
+		'file_cancelled'            => __( 'File canceled.' ),
+		'upload_stopped'            => __( 'Upload stopped.' ),
+		'dismiss'                   => __( 'Dismiss' ),
+		'crunching'                 => __( 'Crunching&hellip;' ),
+		'deleted'                   => __( 'moved to the trash.' ),
+		'error_uploading'           => __( '&#8220;%s&#8221; has failed to upload.' ),
 	);
 
 	$scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' );
@@ -324,9 +1154,9 @@
 	did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
 
 	// keep 'swfupload' for back-compat.
-	$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
+	$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113' );
 	$scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' );
-	$scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
+	$scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array( 'swfupload-all', 'jquery' ), '2201-20110524' );
 	did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
 
 	$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 );
@@ -335,126 +1165,140 @@
 	did_action( 'init' ) && $scripts->add_data( 'json2', 'conditional', 'lt IE 8' );
 
 	$scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1 );
-	$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.2.3', 1 );
+	$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore', 'jquery' ), '1.2.3', 1 );
 
-	$scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-util', '_wpUtilSettings', array(
-		'ajax' => array(
-			'url' => admin_url( 'admin-ajax.php', 'relative' ),
-		),
-	) );
+	$scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array( 'underscore', 'jquery' ), false, 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'wp-util',
+		'_wpUtilSettings',
+		array(
+			'ajax' => array(
+				'url' => admin_url( 'admin-ajax.php', 'relative' ),
+			),
+		)
+	);
 
-	$scripts->add( 'wp-sanitize', "/wp-includes/js/wp-sanitize$suffix.js", array('jquery'), false, 1 );
+	$scripts->add( 'wp-sanitize', "/wp-includes/js/wp-sanitize$suffix.js", array( 'jquery' ), false, 1 );
 
-	$scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 );
+	$scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array( 'backbone', 'wp-util' ), false, 1 );
 
 	$scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 );
 
-	$scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1 );
+	$scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array( 'jquery' ), false, 1 );
 
 	$scripts->add( 'mediaelement', false, array( 'jquery', 'mediaelement-core', 'mediaelement-migrate' ), '4.2.6-78496d1' );
 	$scripts->add( 'mediaelement-core', "/wp-includes/js/mediaelement/mediaelement-and-player$suffix.js", array(), '4.2.6-78496d1', 1 );
-	$scripts->add( 'mediaelement-migrate', "/wp-includes/js/mediaelement/mediaelement-migrate$suffix.js", array(), false, 1);
+	$scripts->add( 'mediaelement-migrate', "/wp-includes/js/mediaelement/mediaelement-migrate$suffix.js", array(), false, 1 );
 
-	did_action( 'init' ) && $scripts->add_inline_script( 'mediaelement-core', sprintf( 'var mejsL10n = %s;', wp_json_encode( array(
-		'language' => strtolower( strtok( is_admin() ? get_user_locale() : get_locale(), '_-' ) ),
-		'strings'  => array(
-			'mejs.install-flash'       => __( 'You are using a browser that does not have Flash player enabled or installed. Please turn on your Flash player plugin or download the latest version from https://get.adobe.com/flashplayer/' ),
-			'mejs.fullscreen-off'      => __( 'Turn off Fullscreen' ),
-			'mejs.fullscreen-on'       => __( 'Go Fullscreen' ),
-			'mejs.download-video'      => __( 'Download Video' ),
-			'mejs.fullscreen'          => __( 'Fullscreen' ),
-			'mejs.time-jump-forward'   => array( __( 'Jump forward 1 second' ), __( 'Jump forward %1 seconds' ) ),
-			'mejs.loop'                => __( 'Toggle Loop' ),
-			'mejs.play'                => __( 'Play' ),
-			'mejs.pause'               => __( 'Pause' ),
-			'mejs.close'               => __( 'Close' ),
-			'mejs.time-slider'         => __( 'Time Slider' ),
-			'mejs.time-help-text'      => __( 'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' ),
-			'mejs.time-skip-back'      => array( __( 'Skip back 1 second' ), __( 'Skip back %1 seconds' ) ),
-			'mejs.captions-subtitles'  => __( 'Captions/Subtitles' ),
-			'mejs.captions-chapters'   => __( 'Chapters' ),
-			'mejs.none'                => __( 'None' ),
-			'mejs.mute-toggle'         => __( 'Mute Toggle' ),
-			'mejs.volume-help-text'    => __( 'Use Up/Down Arrow keys to increase or decrease volume.' ),
-			'mejs.unmute'              => __( 'Unmute' ),
-			'mejs.mute'                => __( 'Mute' ),
-			'mejs.volume-slider'       => __( 'Volume Slider' ),
-			'mejs.video-player'        => __( 'Video Player' ),
-			'mejs.audio-player'        => __( 'Audio Player' ),
-			'mejs.ad-skip'             => __( 'Skip ad' ),
-			'mejs.ad-skip-info'        => array( __( 'Skip in 1 second' ), __( 'Skip in %1 seconds' ) ),
-			'mejs.source-chooser'      => __( 'Source Chooser' ),
-			'mejs.stop'                => __( 'Stop' ),
-			'mejs.speed-rate'          => __( 'Speed Rate' ),
-			'mejs.live-broadcast'      => __( 'Live Broadcast' ),
-			'mejs.afrikaans'           => __( 'Afrikaans' ),
-			'mejs.albanian'            => __( 'Albanian' ),
-			'mejs.arabic'              => __( 'Arabic' ),
-			'mejs.belarusian'          => __( 'Belarusian' ),
-			'mejs.bulgarian'           => __( 'Bulgarian' ),
-			'mejs.catalan'             => __( 'Catalan' ),
-			'mejs.chinese'             => __( 'Chinese' ),
-			'mejs.chinese-simplified'  => __( 'Chinese (Simplified)' ),
-			'mejs.chinese-traditional' => __( 'Chinese (Traditional)' ),
-			'mejs.croatian'            => __( 'Croatian' ),
-			'mejs.czech'               => __( 'Czech' ),
-			'mejs.danish'              => __( 'Danish' ),
-			'mejs.dutch'               => __( 'Dutch' ),
-			'mejs.english'             => __( 'English' ),
-			'mejs.estonian'            => __( 'Estonian' ),
-			'mejs.filipino'            => __( 'Filipino' ),
-			'mejs.finnish'             => __( 'Finnish' ),
-			'mejs.french'              => __( 'French' ),
-			'mejs.galician'            => __( 'Galician' ),
-			'mejs.german'              => __( 'German' ),
-			'mejs.greek'               => __( 'Greek' ),
-			'mejs.haitian-creole'      => __( 'Haitian Creole' ),
-			'mejs.hebrew'              => __( 'Hebrew' ),
-			'mejs.hindi'               => __( 'Hindi' ),
-			'mejs.hungarian'           => __( 'Hungarian' ),
-			'mejs.icelandic'           => __( 'Icelandic' ),
-			'mejs.indonesian'          => __( 'Indonesian' ),
-			'mejs.irish'               => __( 'Irish' ),
-			'mejs.italian'             => __( 'Italian' ),
-			'mejs.japanese'            => __( 'Japanese' ),
-			'mejs.korean'              => __( 'Korean' ),
-			'mejs.latvian'             => __( 'Latvian' ),
-			'mejs.lithuanian'          => __( 'Lithuanian' ),
-			'mejs.macedonian'          => __( 'Macedonian' ),
-			'mejs.malay'               => __( 'Malay' ),
-			'mejs.maltese'             => __( 'Maltese' ),
-			'mejs.norwegian'           => __( 'Norwegian' ),
-			'mejs.persian'             => __( 'Persian' ),
-			'mejs.polish'              => __( 'Polish' ),
-			'mejs.portuguese'          => __( 'Portuguese' ),
-			'mejs.romanian'            => __( 'Romanian' ),
-			'mejs.russian'             => __( 'Russian' ),
-			'mejs.serbian'             => __( 'Serbian' ),
-			'mejs.slovak'              => __( 'Slovak' ),
-			'mejs.slovenian'           => __( 'Slovenian' ),
-			'mejs.spanish'             => __( 'Spanish' ),
-			'mejs.swahili'             => __( 'Swahili' ),
-			'mejs.swedish'             => __( 'Swedish' ),
-			'mejs.tagalog'             => __( 'Tagalog' ),
-			'mejs.thai'                => __( 'Thai' ),
-			'mejs.turkish'             => __( 'Turkish' ),
-			'mejs.ukrainian'           => __( 'Ukrainian' ),
-			'mejs.vietnamese'          => __( 'Vietnamese' ),
-			'mejs.welsh'               => __( 'Welsh' ),
-			'mejs.yiddish'             => __( 'Yiddish' ),
-			),
-		) ) ), 'before' );
+	did_action( 'init' ) && $scripts->add_inline_script(
+		'mediaelement-core',
+		sprintf(
+			'var mejsL10n = %s;',
+			wp_json_encode(
+				array(
+					'language' => strtolower( strtok( determine_locale(), '_-' ) ),
+					'strings'  => array(
+						'mejs.install-flash'       => __( 'You are using a browser that does not have Flash player enabled or installed. Please turn on your Flash player plugin or download the latest version from https://get.adobe.com/flashplayer/' ),
+						'mejs.fullscreen-off'      => __( 'Turn off Fullscreen' ),
+						'mejs.fullscreen-on'       => __( 'Go Fullscreen' ),
+						'mejs.download-video'      => __( 'Download Video' ),
+						'mejs.fullscreen'          => __( 'Fullscreen' ),
+						'mejs.time-jump-forward'   => array( __( 'Jump forward 1 second' ), __( 'Jump forward %1 seconds' ) ),
+						'mejs.loop'                => __( 'Toggle Loop' ),
+						'mejs.play'                => __( 'Play' ),
+						'mejs.pause'               => __( 'Pause' ),
+						'mejs.close'               => __( 'Close' ),
+						'mejs.time-slider'         => __( 'Time Slider' ),
+						'mejs.time-help-text'      => __( 'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' ),
+						'mejs.time-skip-back'      => array( __( 'Skip back 1 second' ), __( 'Skip back %1 seconds' ) ),
+						'mejs.captions-subtitles'  => __( 'Captions/Subtitles' ),
+						'mejs.captions-chapters'   => __( 'Chapters' ),
+						'mejs.none'                => __( 'None' ),
+						'mejs.mute-toggle'         => __( 'Mute Toggle' ),
+						'mejs.volume-help-text'    => __( 'Use Up/Down Arrow keys to increase or decrease volume.' ),
+						'mejs.unmute'              => __( 'Unmute' ),
+						'mejs.mute'                => __( 'Mute' ),
+						'mejs.volume-slider'       => __( 'Volume Slider' ),
+						'mejs.video-player'        => __( 'Video Player' ),
+						'mejs.audio-player'        => __( 'Audio Player' ),
+						'mejs.ad-skip'             => __( 'Skip ad' ),
+						'mejs.ad-skip-info'        => array( __( 'Skip in 1 second' ), __( 'Skip in %1 seconds' ) ),
+						'mejs.source-chooser'      => __( 'Source Chooser' ),
+						'mejs.stop'                => __( 'Stop' ),
+						'mejs.speed-rate'          => __( 'Speed Rate' ),
+						'mejs.live-broadcast'      => __( 'Live Broadcast' ),
+						'mejs.afrikaans'           => __( 'Afrikaans' ),
+						'mejs.albanian'            => __( 'Albanian' ),
+						'mejs.arabic'              => __( 'Arabic' ),
+						'mejs.belarusian'          => __( 'Belarusian' ),
+						'mejs.bulgarian'           => __( 'Bulgarian' ),
+						'mejs.catalan'             => __( 'Catalan' ),
+						'mejs.chinese'             => __( 'Chinese' ),
+						'mejs.chinese-simplified'  => __( 'Chinese (Simplified)' ),
+						'mejs.chinese-traditional' => __( 'Chinese (Traditional)' ),
+						'mejs.croatian'            => __( 'Croatian' ),
+						'mejs.czech'               => __( 'Czech' ),
+						'mejs.danish'              => __( 'Danish' ),
+						'mejs.dutch'               => __( 'Dutch' ),
+						'mejs.english'             => __( 'English' ),
+						'mejs.estonian'            => __( 'Estonian' ),
+						'mejs.filipino'            => __( 'Filipino' ),
+						'mejs.finnish'             => __( 'Finnish' ),
+						'mejs.french'              => __( 'French' ),
+						'mejs.galician'            => __( 'Galician' ),
+						'mejs.german'              => __( 'German' ),
+						'mejs.greek'               => __( 'Greek' ),
+						'mejs.haitian-creole'      => __( 'Haitian Creole' ),
+						'mejs.hebrew'              => __( 'Hebrew' ),
+						'mejs.hindi'               => __( 'Hindi' ),
+						'mejs.hungarian'           => __( 'Hungarian' ),
+						'mejs.icelandic'           => __( 'Icelandic' ),
+						'mejs.indonesian'          => __( 'Indonesian' ),
+						'mejs.irish'               => __( 'Irish' ),
+						'mejs.italian'             => __( 'Italian' ),
+						'mejs.japanese'            => __( 'Japanese' ),
+						'mejs.korean'              => __( 'Korean' ),
+						'mejs.latvian'             => __( 'Latvian' ),
+						'mejs.lithuanian'          => __( 'Lithuanian' ),
+						'mejs.macedonian'          => __( 'Macedonian' ),
+						'mejs.malay'               => __( 'Malay' ),
+						'mejs.maltese'             => __( 'Maltese' ),
+						'mejs.norwegian'           => __( 'Norwegian' ),
+						'mejs.persian'             => __( 'Persian' ),
+						'mejs.polish'              => __( 'Polish' ),
+						'mejs.portuguese'          => __( 'Portuguese' ),
+						'mejs.romanian'            => __( 'Romanian' ),
+						'mejs.russian'             => __( 'Russian' ),
+						'mejs.serbian'             => __( 'Serbian' ),
+						'mejs.slovak'              => __( 'Slovak' ),
+						'mejs.slovenian'           => __( 'Slovenian' ),
+						'mejs.spanish'             => __( 'Spanish' ),
+						'mejs.swahili'             => __( 'Swahili' ),
+						'mejs.swedish'             => __( 'Swedish' ),
+						'mejs.tagalog'             => __( 'Tagalog' ),
+						'mejs.thai'                => __( 'Thai' ),
+						'mejs.turkish'             => __( 'Turkish' ),
+						'mejs.ukrainian'           => __( 'Ukrainian' ),
+						'mejs.vietnamese'          => __( 'Vietnamese' ),
+						'mejs.welsh'               => __( 'Welsh' ),
+						'mejs.yiddish'             => __( 'Yiddish' ),
+					),
+				)
+			)
+		),
+		'before'
+	);
 
-
-	$scripts->add( 'mediaelement-vimeo', "/wp-includes/js/mediaelement/renderers/vimeo.min.js", array('mediaelement'), '4.2.6-78496d1', 1 );
-	$scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1 );
+	$scripts->add( 'mediaelement-vimeo', '/wp-includes/js/mediaelement/renderers/vimeo.min.js', array( 'mediaelement' ), '4.2.6-78496d1', 1 );
+	$scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array( 'mediaelement' ), false, 1 );
 	$mejs_settings = array(
-		'pluginPath'    => includes_url( 'js/mediaelement/', 'relative' ),
-		'classPrefix'   => 'mejs-',
-		'stretching'    => 'responsive',
+		'pluginPath'  => includes_url( 'js/mediaelement/', 'relative' ),
+		'classPrefix' => 'mejs-',
+		'stretching'  => 'responsive',
 	);
-	did_action( 'init' ) && $scripts->localize( 'mediaelement', '_wpmejsSettings',
+	did_action( 'init' ) && $scripts->localize(
+		'mediaelement',
+		'_wpmejsSettings',
 		/**
 		 * Filters the MediaElement configuration settings.
 		 *
@@ -467,50 +1311,71 @@
 
 	$scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' );
 	$scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' );
-	$scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5.999' );
+	$scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.0' );
+	$scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' );
 	$scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' );
 	$scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' );
 	$scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) );
 	$scripts->add( 'code-editor', "/wp-admin/js/code-editor$suffix.js", array( 'jquery', 'wp-codemirror', 'underscore' ) );
 	$scripts->add( 'wp-theme-plugin-editor', "/wp-admin/js/theme-plugin-editor$suffix.js", array( 'wp-util', 'wp-sanitize', 'jquery', 'jquery-ui-core', 'wp-a11y', 'underscore' ) );
-	did_action( 'init' ) && $scripts->add_inline_script( 'wp-theme-plugin-editor', sprintf( 'wp.themePluginEditor.l10n = %s;', wp_json_encode( array(
-		'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-		'saveError' => __( 'Something went wrong. Your change may not have been saved. Please try again. There is also a chance that you may need to manually fix and upload the file over FTP.' ),
-		'lintError' => array(
-			/* translators: %d: error count */
-			'singular' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 1 ),
-			/* translators: %d: error count */
-			'plural' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
-		),
-	) ) ) );
+	did_action( 'init' ) && $scripts->add_inline_script(
+		'wp-theme-plugin-editor',
+		sprintf(
+			'wp.themePluginEditor.l10n = %s;',
+			wp_json_encode(
+				array(
+					'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+					'saveError' => __( 'Something went wrong. Your change may not have been saved. Please try again. There is also a chance that you may need to manually fix and upload the file over FTP.' ),
+					'lintError' => array(
+						/* translators: %d: error count */
+						'singular' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 1 ),
+						/* translators: %d: error count */
+						'plural'   => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
+					),
+				)
+			)
+		)
+	);
 
 	$scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
 
 	$scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
-	did_action( 'init' ) && $scripts->localize( 'zxcvbn-async', '_zxcvbnSettings', array(
-		'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'zxcvbn-async',
+		'_zxcvbnSettings',
+		array(
+			'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
+		)
+	);
 
 	$scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
-		'unknown'  => _x( 'Password strength unknown', 'password strength' ),
-		'short'    => _x( 'Very weak', 'password strength' ),
-		'bad'      => _x( 'Weak', 'password strength' ),
-		'good'     => _x( 'Medium', 'password strength' ),
-		'strong'   => _x( 'Strong', 'password strength' ),
-		'mismatch' => _x( 'Mismatch', 'password mismatch' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'password-strength-meter',
+		'pwsL10n',
+		array(
+			'unknown'  => _x( 'Password strength unknown', 'password strength' ),
+			'short'    => _x( 'Very weak', 'password strength' ),
+			'bad'      => _x( 'Weak', 'password strength' ),
+			'good'     => _x( 'Medium', 'password strength' ),
+			'strong'   => _x( 'Strong', 'password strength' ),
+			'mismatch' => _x( 'Mismatch', 'password mismatch' ),
+		)
+	);
 
 	$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array(
-		'warn'     => __( 'Your new password has not been saved.' ),
-		'warnWeak' => __( 'Confirm use of weak password' ),
-		'show'     => __( 'Show' ),
-		'hide'     => __( 'Hide' ),
-		'cancel'   => __( 'Cancel' ),
-		'ariaShow' => esc_attr__( 'Show password' ),
-		'ariaHide' => esc_attr__( 'Hide password' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'user-profile',
+		'userProfileL10n',
+		array(
+			'warn'     => __( 'Your new password has not been saved.' ),
+			'warnWeak' => __( 'Confirm use of weak password' ),
+			'show'     => __( 'Show' ),
+			'hide'     => __( 'Hide' ),
+			'cancel'   => __( 'Cancel' ),
+			'ariaShow' => esc_attr__( 'Show password' ),
+			'ariaHide' => esc_attr__( 'Hide password' ),
+		)
+	);
 
 	$scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 );
 
@@ -519,15 +1384,19 @@
 	$scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
 
 	$scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wplink', 'wpLinkL10n', array(
-		'title' => __('Insert/edit link'),
-		'update' => __('Update'),
-		'save' => __('Add Link'),
-		'noTitle' => __('(no title)'),
-		'noMatchesFound' => __('No results found.'),
-		'linkSelected' => __( 'Link selected.' ),
-		'linkInserted' => __( 'Link inserted.' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'wplink',
+		'wpLinkL10n',
+		array(
+			'title'          => __( 'Insert/edit link' ),
+			'update'         => __( 'Update' ),
+			'save'           => __( 'Add Link' ),
+			'noTitle'        => __( '(no title)' ),
+			'noMatchesFound' => __( 'No results found.' ),
+			'linkSelected'   => __( 'Link selected.' ),
+			'linkInserted'   => __( 'Link inserted.' ),
+		)
+	);
 
 	$scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
 
@@ -535,83 +1404,87 @@
 
 	$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
 
-	$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '1.8.1', 1 );
+	$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array( 'jquery' ), '1.8.1', 1 );
 
-	$scripts->add( 'customize-base',     "/wp-includes/js/customize-base$suffix.js",     array( 'jquery', 'json2', 'underscore' ), false, 1 );
-	$scripts->add( 'customize-loader',   "/wp-includes/js/customize-loader$suffix.js",   array( 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-preview',  "/wp-includes/js/customize-preview$suffix.js",  array( 'wp-a11y', 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-models',   "/wp-includes/js/customize-models.js", array( 'underscore', 'backbone' ), false, 1 );
-	$scripts->add( 'customize-views',    "/wp-includes/js/customize-views.js",  array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 );
+	$scripts->add( 'customize-base', "/wp-includes/js/customize-base$suffix.js", array( 'jquery', 'json2', 'underscore' ), false, 1 );
+	$scripts->add( 'customize-loader', "/wp-includes/js/customize-loader$suffix.js", array( 'customize-base' ), false, 1 );
+	$scripts->add( 'customize-preview', "/wp-includes/js/customize-preview$suffix.js", array( 'wp-a11y', 'customize-base' ), false, 1 );
+	$scripts->add( 'customize-models', '/wp-includes/js/customize-models.js', array( 'underscore', 'backbone' ), false, 1 );
+	$scripts->add( 'customize-views', '/wp-includes/js/customize-views.js', array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 );
 	$scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y', 'wp-util', 'jquery-ui-core' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
-		'activate'           => __( 'Activate &amp; Publish' ),
-		'save'               => __( 'Save &amp; Publish' ), // @todo Remove as not required.
-		'publish'            => __( 'Publish' ),
-		'published'          => __( 'Published' ),
-		'saveDraft'          => __( 'Save Draft' ),
-		'draftSaved'         => __( 'Draft Saved' ),
-		'updating'           => __( 'Updating' ),
-		'schedule'           => _x( 'Schedule', 'customizer changeset action/button label' ),
-		'scheduled'          => _x( 'Scheduled', 'customizer changeset status' ),
-		'invalid'            => __( 'Invalid' ),
-		'saveBeforeShare'    => __( 'Please save your changes in order to share the preview.' ),
-		'futureDateError'    => __( 'You must supply a future date to schedule.' ),
-		'saveAlert'          => __( 'The changes you made will be lost if you navigate away from this page.' ),
-		'saved'              => __( 'Saved' ),
-		'cancel'             => __( 'Cancel' ),
-		'close'              => __( 'Close' ),
-		'action'             => __( 'Action' ),
-		'discardChanges'     => __( 'Discard changes' ),
-		'cheatin'            => __( 'Something went wrong.' ),
-		'notAllowedHeading'  => __( 'You need a higher level of permission.' ),
-		'notAllowed'         => __( 'Sorry, you are not allowed to customize this site.' ),
-		'previewIframeTitle' => __( 'Site Preview' ),
-		'loginIframeTitle'   => __( 'Session expired' ),
-		'collapseSidebar'    => _x( 'Hide Controls', 'label for hide controls button without length constraints' ),
-		'expandSidebar'      => _x( 'Show Controls', 'label for hide controls button without length constraints' ),
-		'untitledBlogName'   => __( '(Untitled)' ),
-		'unknownRequestFail' => __( 'Looks like something&#8217;s gone wrong. Wait a couple seconds, and then try again.' ),
-		'themeDownloading'   => __( 'Downloading your new theme&hellip;' ),
-		'themePreviewWait'   => __( 'Setting up your live preview. This may take a bit.' ),
-		'revertingChanges'   => __( 'Reverting unpublished changes&hellip;' ),
-		'trashConfirm'       => __( 'Are you sure you&#8217;d like to discard your unpublished changes?' ),
-		/* translators: %s: Display name of the user who has taken over the changeset in customizer. */
-		'takenOverMessage'   => __( '%s has taken over and is currently customizing.' ),
-		/* translators: %s: URL to the Customizer to load the autosaved version */
-		'autosaveNotice'     => __( 'There is a more recent autosave of your changes than the one you are previewing. <a href="%s">Restore the autosave</a>' ),
-		'videoHeaderNotice'  => __( 'This theme doesn&#8217;t support video headers on this page. Navigate to the front page or another page that supports video headers.' ),
-		// Used for overriding the file types allowed in plupload.
-		'allowedFiles'       => __( 'Allowed Files' ),
-		'customCssError'     => array(
-			/* translators: %d: error count */
-			'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),
-			/* translators: %d: error count */
-			'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
-		),
-		'pageOnFrontError' => __( 'Homepage and posts page must be different.' ),
-		'saveBlockedError' => array(
-			/* translators: %s: number of invalid settings */
-			'singular' => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 1 ),
-			/* translators: %s: number of invalid settings */
-			'plural'   => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
-		),
-		'scheduleDescription' => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),
-		'themePreviewUnavailable' => __( 'Sorry, you can&#8217;t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),
-		'themeInstallUnavailable' => sprintf(
-			/* translators: %s: URL to Add Themes admin screen */
-			__( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
-			esc_url( admin_url( 'theme-install.php' ) )
-		),
-		'publishSettings' => __( 'Publish Settings' ),
-		'invalidDate'     => __( 'Invalid date.' ),
-		'invalidValue'    => __( 'Invalid value.' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'customize-controls',
+		'_wpCustomizeControlsL10n',
+		array(
+			'activate'                => __( 'Activate &amp; Publish' ),
+			'save'                    => __( 'Save &amp; Publish' ), // @todo Remove as not required.
+			'publish'                 => __( 'Publish' ),
+			'published'               => __( 'Published' ),
+			'saveDraft'               => __( 'Save Draft' ),
+			'draftSaved'              => __( 'Draft Saved' ),
+			'updating'                => __( 'Updating' ),
+			'schedule'                => _x( 'Schedule', 'customizer changeset action/button label' ),
+			'scheduled'               => _x( 'Scheduled', 'customizer changeset status' ),
+			'invalid'                 => __( 'Invalid' ),
+			'saveBeforeShare'         => __( 'Please save your changes in order to share the preview.' ),
+			'futureDateError'         => __( 'You must supply a future date to schedule.' ),
+			'saveAlert'               => __( 'The changes you made will be lost if you navigate away from this page.' ),
+			'saved'                   => __( 'Saved' ),
+			'cancel'                  => __( 'Cancel' ),
+			'close'                   => __( 'Close' ),
+			'action'                  => __( 'Action' ),
+			'discardChanges'          => __( 'Discard changes' ),
+			'cheatin'                 => __( 'Something went wrong.' ),
+			'notAllowedHeading'       => __( 'You need a higher level of permission.' ),
+			'notAllowed'              => __( 'Sorry, you are not allowed to customize this site.' ),
+			'previewIframeTitle'      => __( 'Site Preview' ),
+			'loginIframeTitle'        => __( 'Session expired' ),
+			'collapseSidebar'         => _x( 'Hide Controls', 'label for hide controls button without length constraints' ),
+			'expandSidebar'           => _x( 'Show Controls', 'label for hide controls button without length constraints' ),
+			'untitledBlogName'        => __( '(Untitled)' ),
+			'unknownRequestFail'      => __( 'Looks like something&#8217;s gone wrong. Wait a couple seconds, and then try again.' ),
+			'themeDownloading'        => __( 'Downloading your new theme&hellip;' ),
+			'themePreviewWait'        => __( 'Setting up your live preview. This may take a bit.' ),
+			'revertingChanges'        => __( 'Reverting unpublished changes&hellip;' ),
+			'trashConfirm'            => __( 'Are you sure you&#8217;d like to discard your unpublished changes?' ),
+			/* translators: %s: Display name of the user who has taken over the changeset in customizer. */
+			'takenOverMessage'        => __( '%s has taken over and is currently customizing.' ),
+			/* translators: %s: URL to the Customizer to load the autosaved version */
+			'autosaveNotice'          => __( 'There is a more recent autosave of your changes than the one you are previewing. <a href="%s">Restore the autosave</a>' ),
+			'videoHeaderNotice'       => __( 'This theme doesn&#8217;t support video headers on this page. Navigate to the front page or another page that supports video headers.' ),
+			// Used for overriding the file types allowed in plupload.
+			'allowedFiles'            => __( 'Allowed Files' ),
+			'customCssError'          => array(
+				/* translators: %d: error count */
+				'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),
+				/* translators: %d: error count */
+				'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
+			),
+			'pageOnFrontError'        => __( 'Homepage and posts page must be different.' ),
+			'saveBlockedError'        => array(
+				/* translators: %s: number of invalid settings */
+				'singular' => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 1 ),
+				/* translators: %s: number of invalid settings */
+				'plural'   => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
+			),
+			'scheduleDescription'     => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),
+			'themePreviewUnavailable' => __( 'Sorry, you can&#8217;t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),
+			'themeInstallUnavailable' => sprintf(
+				/* translators: %s: URL to Add Themes admin screen */
+				   __( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
+				esc_url( admin_url( 'theme-install.php' ) )
+			),
+			'publishSettings'         => __( 'Publish Settings' ),
+			'invalidDate'             => __( 'Invalid date.' ),
+			'invalidValue'            => __( 'Invalid value.' ),
+		)
+	);
 	$scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
 
 	$scripts->add( 'customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 );
 	$scripts->add( 'customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array( 'jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh' ), false, 1 );
 
-	$scripts->add( 'customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array( 'jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu' ), false, 1 );
+	$scripts->add( 'customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array( 'jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu', 'wp-sanitize' ), false, 1 );
 	$scripts->add( 'customize-preview-nav-menus', "/wp-includes/js/customize-preview-nav-menus$suffix.js", array( 'jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh' ), false, 1 );
 
 	$scripts->add( 'wp-custom-header', "/wp-includes/js/wp-custom-header$suffix.js", array( 'wp-a11y' ), false, 1 );
@@ -620,18 +1493,22 @@
 
 	$scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
 	$scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'wp-backbone' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
-		'settings' => array(
-			'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
-			'post' => array( 'id' => 0 ),
-		),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'media-models',
+		'_wpMediaModelsL10n',
+		array(
+			'settings' => array(
+				'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
+				'post'    => array( 'id' => 0 ),
+			),
+		)
+	);
 
 	$scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js" );
 
 	// To enqueue media-views or media-editor, call wp_enqueue_media().
 	// Both rely on numerous settings, styles, and templates to operate correctly.
-	$scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request' ), false, 1 );
+	$scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request' ), false, 1 );
 	$scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
 	$scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
 	$scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );
@@ -640,27 +1517,37 @@
 
 	if ( is_admin() ) {
 		$scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
-			'noPerm' => __('Sorry, you are not allowed to do that.'),
-			'broken' => __('Something went wrong.')
-		));
+		did_action( 'init' ) && $scripts->localize(
+			'admin-tags',
+			'tagsl10n',
+			array(
+				'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
+				'broken' => __( 'Something went wrong.' ),
+			)
+		);
 
-		$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
-			'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
-			'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
-			'replyApprove' => __( 'Approve and Reply' ),
-			'reply' => __( 'Reply' ),
-			'warnQuickEdit' => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
-			'warnCommentChanges' => __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ),
-			'docTitleComments' => __( 'Comments' ),
-			/* translators: %s: comments count */
-			'docTitleCommentsCount' => __( 'Comments (%s)' ),
-		) );
+		$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array( 'wp-lists', 'quicktags', 'jquery-query' ), false, 1 );
+		did_action( 'init' ) && $scripts->localize(
+			'admin-comments',
+			'adminCommentsL10n',
+			array(
+				'hotkeys_highlight_first' => isset( $_GET['hotkeys_highlight_first'] ),
+				'hotkeys_highlight_last'  => isset( $_GET['hotkeys_highlight_last'] ),
+				'replyApprove'            => __( 'Approve and Reply' ),
+				'reply'                   => __( 'Reply' ),
+				'warnQuickEdit'           => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
+				'warnCommentChanges'      => __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ),
+				'docTitleComments'        => __( 'Comments' ),
+				/* translators: %s: comments count */
+				'docTitleCommentsCount'   => __( 'Comments (%s)' ),
+			)
+		);
 
-		$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 );
+		$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array( 'jquery' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'xfn', 'privacyToolsL10n', array(
+			'xfn',
+			'privacyToolsL10n',
+			array(
 				'noDataFound'     => __( 'No personal data was found for this user.' ),
 				'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
 				'noneRemoved'     => __( 'Personal data was found for this user but was not erased.' ),
@@ -671,48 +1558,60 @@
 			)
 		);
 
-		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'postbox', 'postBoxL10n', array(
-			'postBoxEmptyString' => __( 'Drag boxes here' ),
-		) );
+		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array( 'jquery-ui-sortable' ), false, 1 );
+		did_action( 'init' ) && $scripts->localize(
+			'postbox',
+			'postBoxL10n',
+			array(
+				'postBoxEmptyString' => __( 'Drag boxes here' ),
+			)
+		);
 
 		$scripts->add( 'tags-box', "/wp-admin/js/tags-box$suffix.js", array( 'jquery', 'tags-suggest' ), false, 1 );
 
 		$scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'tags-suggest', 'tagsSuggestL10n', array(
-			'tagDelimiter' => _x( ',', 'tag delimiter' ),
-			'removeTerm'   => __( 'Remove term:' ),
-			'termSelected' => __( 'Term selected.' ),
-			'termAdded'    => __( 'Term added.' ),
-			'termRemoved'  => __( 'Term removed.' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'tags-suggest',
+			'tagsSuggestL10n',
+			array(
+				'tagDelimiter' => _x( ',', 'tag delimiter' ),
+				'removeTerm'   => __( 'Remove term:' ),
+				'termSelected' => __( 'Term selected.' ),
+				'termAdded'    => __( 'Term added.' ),
+				'termRemoved'  => __( 'Term removed.' ),
+			)
+		);
 
-		$scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
-			'ok' => __('OK'),
-			'cancel' => __('Cancel'),
-			'publishOn' => __('Publish on:'),
-			'publishOnFuture' =>  __('Schedule for:'),
-			'publishOnPast' => __('Published on:'),
-			/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-			'dateFormat' => __('%1$s %2$s, %3$s @ %4$s:%5$s'),
-			'showcomm' => __('Show more comments'),
-			'endcomm' => __('No more comments found.'),
-			'publish' => __('Publish'),
-			'schedule' => _x('Schedule', 'post action/button label'),
-			'update' => __('Update'),
-			'savePending' => __('Save as Pending'),
-			'saveDraft' => __('Save Draft'),
-			'private' => __('Private'),
-			'public' => __('Public'),
-			'publicSticky' => __('Public, Sticky'),
-			'password' => __('Password Protected'),
-			'privatelyPublished' => __('Privately Published'),
-			'published' => __('Published'),
-			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
-			'savingText' => __('Saving Draft&#8230;'),
-			'permalinkSaved' => __( 'Permalink saved' ),
-		) );
+		$scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y', 'wp-sanitize' ), false, 1 );
+		did_action( 'init' ) && $scripts->localize(
+			'post',
+			'postL10n',
+			array(
+				'ok'                 => __( 'OK' ),
+				'cancel'             => __( 'Cancel' ),
+				'publishOn'          => __( 'Publish on:' ),
+				'publishOnFuture'    => __( 'Schedule for:' ),
+				'publishOnPast'      => __( 'Published on:' ),
+				/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
+				'dateFormat'         => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ),
+				'showcomm'           => __( 'Show more comments' ),
+				'endcomm'            => __( 'No more comments found.' ),
+				'publish'            => __( 'Publish' ),
+				'schedule'           => _x( 'Schedule', 'post action/button label' ),
+				'update'             => __( 'Update' ),
+				'savePending'        => __( 'Save as Pending' ),
+				'saveDraft'          => __( 'Save Draft' ),
+				'private'            => __( 'Private' ),
+				'public'             => __( 'Public' ),
+				'publicSticky'       => __( 'Public, Sticky' ),
+				'password'           => __( 'Password Protected' ),
+				'privatelyPublished' => __( 'Privately Published' ),
+				'published'          => __( 'Published' ),
+				'saveAlert'          => __( 'The changes you made will be lost if you navigate away from this page.' ),
+				'savingText'         => __( 'Saving Draft&#8230;' ),
+				'permalinkSaved'     => __( 'Permalink saved' ),
+			)
+		);
 
 		$scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery', 'underscore' ), false, 1 );
 
@@ -720,20 +1619,32 @@
 
 		$scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
 		$scripts->add_data( 'comment', 'group', 1 );
-		did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array(
-			'submittedOn' => __( 'Submitted on:' ),
-			/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-			'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' )
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'comment',
+			'commentL10n',
+			array(
+				'submittedOn' => __( 'Submitted on:' ),
+				/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
+				'dateFormat'  => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ),
+			)
+		);
 
 		$scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );
 
 		$scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 );
-		did_action( 'init' ) && $scripts->add_inline_script( 'admin-widgets', sprintf( 'wpWidgets.l10n = %s;', wp_json_encode( array(
-			'save' => __( 'Save' ),
-			'saved' => __( 'Saved' ),
-			'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-		) ) ) );
+		did_action( 'init' ) && $scripts->add_inline_script(
+			'admin-widgets',
+			sprintf(
+				'wpWidgets.l10n = %s;',
+				wp_json_encode(
+					array(
+						'save'      => __( 'Save' ),
+						'saved'     => __( 'Saved' ),
+						'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+					)
+				)
+			)
+		);
 
 		$scripts->add( 'media-widgets', "/wp-admin/js/widgets/media-widgets$suffix.js", array( 'jquery', 'media-models', 'media-views', 'wp-api-request' ) );
 		$scripts->add_inline_script( 'media-widgets', 'wp.mediaWidgets.init();', 'after' );
@@ -748,125 +1659,148 @@
 		$scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y', 'customize-base' ), false, 1 );
 
 		$scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
-			'error'      => __( 'Error while saving the changes.' ),
-			'ntdeltitle' => __( 'Remove From Bulk Edit' ),
-			'notitle'    => __( '(no title)' ),
-			'comma'      => trim( _x( ',', 'tag delimiter' ) ),
-			'saved'      => __( 'Changes saved.' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'inline-edit-post',
+			'inlineEditL10n',
+			array(
+				'error'      => __( 'Error while saving the changes.' ),
+				'ntdeltitle' => __( 'Remove From Bulk Edit' ),
+				'notitle'    => __( '(no title)' ),
+				'comma'      => trim( _x( ',', 'tag delimiter' ) ),
+				'saved'      => __( 'Changes saved.' ),
+			)
+		);
 
 		$scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
-			'error' => __( 'Error while saving the changes.' ),
-			'saved' => __( 'Changes saved.' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'inline-edit-tax',
+			'inlineEditL10n',
+			array(
+				'error' => __( 'Error while saving the changes.' ),
+				'saved' => __( 'Changes saved.' ),
+			)
+		);
 
 		$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
-			'plugin_information' => __( 'Plugin:' ),
-			'plugin_modal_label' => __( 'Plugin details' ),
-			'ays' => __('Are you sure you want to install this plugin?')
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'plugin-install',
+			'plugininstallL10n',
+			array(
+				'plugin_information' => __( 'Plugin:' ),
+				'plugin_modal_label' => __( 'Plugin details' ),
+				'ays'                => __( 'Are you sure you want to install this plugin?' ),
+			)
+		);
+
+		$scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y', 'wp-i18n' ), false, 1 );
+		$scripts->set_translations( 'site-health' );
 
-		$scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array(
-			'ajax_nonce' => wp_create_nonce( 'updates' ),
-			'l10n'       => array(
-				/* translators: %s: Search string */
-				'searchResults'              => __( 'Search results for &#8220;%s&#8221;' ),
-				'searchResultsLabel'         => __( 'Search Results' ),
-				'noPlugins'                  => __( 'You do not appear to have any plugins available at this time.' ),
-				'noItemsSelected'            => __( 'Please select at least one item to perform this action on.' ),
-				'updating'                   => __( 'Updating...' ), // No ellipsis.
-				'pluginUpdated'              => _x( 'Updated!', 'plugin' ),
-				'themeUpdated'               => _x( 'Updated!', 'theme' ),
-				'update'                     => __( 'Update' ),
-				'updateNow'                  => __( 'Update Now' ),
-				/* translators: %s: Plugin name and version */
-				'pluginUpdateNowLabel'       => _x( 'Update %s now', 'plugin' ),
-				'updateFailedShort'          => __( 'Update Failed!' ),
-				/* translators: %s: Error string for a failed update */
-				'updateFailed'               => __( 'Update Failed: %s' ),
-				/* translators: %s: Plugin name and version */
-				'pluginUpdatingLabel'        => _x( 'Updating %s...', 'plugin' ), // No ellipsis.
-				/* translators: %s: Plugin name and version */
-				'pluginUpdatedLabel'         => _x( '%s updated!', 'plugin' ),
-				/* translators: %s: Plugin name and version */
-				'pluginUpdateFailedLabel'    => _x( '%s update failed', 'plugin' ),
-				/* translators: Accessibility text */
-				'updatingMsg'                => __( 'Updating... please wait.' ), // No ellipsis.
-				/* translators: Accessibility text */
-				'updatedMsg'                 => __( 'Update completed successfully.' ),
-				/* translators: Accessibility text */
-				'updateCancel'               => __( 'Update canceled.' ),
-				'beforeunload'               => __( 'Updates may not complete if you navigate away from this page.' ),
-				'installNow'                 => __( 'Install Now' ),
-				/* translators: %s: Plugin name */
-				'pluginInstallNowLabel'      => _x( 'Install %s now', 'plugin' ),
-				'installing'                 => __( 'Installing...' ),
-				'pluginInstalled'            => _x( 'Installed!', 'plugin' ),
-				'themeInstalled'             => _x( 'Installed!', 'theme' ),
-				'installFailedShort'         => __( 'Installation Failed!' ),
-				/* translators: %s: Error string for a failed installation */
-				'installFailed'              => __( 'Installation failed: %s' ),
-				/* translators: %s: Plugin name and version */
-				'pluginInstallingLabel'      => _x( 'Installing %s...', 'plugin' ), // no ellipsis
-				/* translators: %s: Theme name and version */
-				'themeInstallingLabel'       => _x( 'Installing %s...', 'theme' ), // no ellipsis
-				/* translators: %s: Plugin name and version */
-				'pluginInstalledLabel'       => _x( '%s installed!', 'plugin' ),
-				/* translators: %s: Theme name and version */
-				'themeInstalledLabel'        => _x( '%s installed!', 'theme' ),
-				/* translators: %s: Plugin name and version */
-				'pluginInstallFailedLabel'   => _x( '%s installation failed', 'plugin' ),
-				/* translators: %s: Theme name and version */
-				'themeInstallFailedLabel'    => _x( '%s installation failed', 'theme' ),
-				'installingMsg'              => __( 'Installing... please wait.' ),
-				'installedMsg'               => __( 'Installation completed successfully.' ),
-				/* translators: %s: Activation URL */
-				'importerInstalledMsg'       => __( 'Importer installed successfully. <a href="%s">Run importer</a>' ),
-				/* translators: %s: Theme name */
-				'aysDelete'                  => __( 'Are you sure you want to delete %s?' ),
-				/* translators: %s: Plugin name */
-				'aysDeleteUninstall'         => __( 'Are you sure you want to delete %s and its data?' ),
-				'aysBulkDelete'              => __( 'Are you sure you want to delete the selected plugins and their data?' ),
-				'aysBulkDeleteThemes'        => __( 'Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?' ),
-				'deleting'                   => __( 'Deleting...' ),
-				/* translators: %s: Error string for a failed deletion */
-				'deleteFailed'               => __( 'Deletion failed: %s' ),
-				'pluginDeleted'              => _x( 'Deleted!', 'plugin' ),
-				'themeDeleted'               => _x( 'Deleted!', 'theme' ),
-				'livePreview'                => __( 'Live Preview' ),
-				'activatePlugin'             => is_network_admin() ? __( 'Network Activate' ) : __( 'Activate' ),
-				'activateTheme'              => is_network_admin() ? __( 'Network Enable' ) : __( 'Activate' ),
-				/* translators: %s: Plugin name */
-				'activatePluginLabel'        => is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate %s', 'plugin' ),
-				/* translators: %s: Theme name */
-				'activateThemeLabel'         => is_network_admin() ? _x( 'Network Activate %s', 'theme' ) : _x( 'Activate %s', 'theme' ),
-				'activateImporter'           => __( 'Run Importer' ),
-				/* translators: %s: Importer name */
-				'activateImporterLabel'      => __( 'Run %s' ),
-				'unknownError'               => __( 'Something went wrong.' ),
-				'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
-				'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),
-				'pluginsFound'               => __( 'Number of plugins found: %d' ),
-				'noPluginsFound'             => __( 'No plugins found. Try a different search.' ),
-			),
-		) );
+		$scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y', 'wp-sanitize' ), false, 1 );
+		did_action( 'init' ) && $scripts->localize(
+			'updates',
+			'_wpUpdatesSettings',
+			array(
+				'ajax_nonce' => wp_create_nonce( 'updates' ),
+				'l10n'       => array(
+					/* translators: %s: Search string */
+					'searchResults'            => __( 'Search results for &#8220;%s&#8221;' ),
+					'searchResultsLabel'       => __( 'Search Results' ),
+					'noPlugins'                => __( 'You do not appear to have any plugins available at this time.' ),
+					'noItemsSelected'          => __( 'Please select at least one item to perform this action on.' ),
+					'updating'                 => __( 'Updating...' ), // No ellipsis.
+					'pluginUpdated'            => _x( 'Updated!', 'plugin' ),
+					'themeUpdated'             => _x( 'Updated!', 'theme' ),
+					'update'                   => __( 'Update' ),
+					'updateNow'                => __( 'Update Now' ),
+					/* translators: %s: Plugin name and version */
+					'pluginUpdateNowLabel'     => _x( 'Update %s now', 'plugin' ),
+					'updateFailedShort'        => __( 'Update Failed!' ),
+					/* translators: %s: Error string for a failed update */
+					'updateFailed'             => __( 'Update Failed: %s' ),
+					/* translators: %s: Plugin name and version */
+					'pluginUpdatingLabel'      => _x( 'Updating %s...', 'plugin' ), // No ellipsis.
+					/* translators: %s: Plugin name and version */
+					'pluginUpdatedLabel'       => _x( '%s updated!', 'plugin' ),
+					/* translators: %s: Plugin name and version */
+					'pluginUpdateFailedLabel'  => _x( '%s update failed', 'plugin' ),
+					/* translators: Accessibility text */
+					'updatingMsg'              => __( 'Updating... please wait.' ), // No ellipsis.
+					/* translators: Accessibility text */
+					'updatedMsg'               => __( 'Update completed successfully.' ),
+					/* translators: Accessibility text */
+					'updateCancel'             => __( 'Update canceled.' ),
+					'beforeunload'             => __( 'Updates may not complete if you navigate away from this page.' ),
+					'installNow'               => __( 'Install Now' ),
+					/* translators: %s: Plugin name */
+					'pluginInstallNowLabel'    => _x( 'Install %s now', 'plugin' ),
+					'installing'               => __( 'Installing...' ),
+					'pluginInstalled'          => _x( 'Installed!', 'plugin' ),
+					'themeInstalled'           => _x( 'Installed!', 'theme' ),
+					'installFailedShort'       => __( 'Installation Failed!' ),
+					/* translators: %s: Error string for a failed installation */
+					'installFailed'            => __( 'Installation failed: %s' ),
+					/* translators: %s: Plugin name and version */
+					'pluginInstallingLabel'    => _x( 'Installing %s...', 'plugin' ), // no ellipsis
+					/* translators: %s: Theme name and version */
+					'themeInstallingLabel'     => _x( 'Installing %s...', 'theme' ), // no ellipsis
+					/* translators: %s: Plugin name and version */
+					'pluginInstalledLabel'     => _x( '%s installed!', 'plugin' ),
+					/* translators: %s: Theme name and version */
+					'themeInstalledLabel'      => _x( '%s installed!', 'theme' ),
+					/* translators: %s: Plugin name and version */
+					'pluginInstallFailedLabel' => _x( '%s installation failed', 'plugin' ),
+					/* translators: %s: Theme name and version */
+					'themeInstallFailedLabel'  => _x( '%s installation failed', 'theme' ),
+					'installingMsg'            => __( 'Installing... please wait.' ),
+					'installedMsg'             => __( 'Installation completed successfully.' ),
+					/* translators: %s: Activation URL */
+					'importerInstalledMsg'     => __( 'Importer installed successfully. <a href="%s">Run importer</a>' ),
+					/* translators: %s: Theme name */
+					'aysDelete'                => __( 'Are you sure you want to delete %s?' ),
+					/* translators: %s: Plugin name */
+					'aysDeleteUninstall'       => __( 'Are you sure you want to delete %s and its data?' ),
+					'aysBulkDelete'            => __( 'Are you sure you want to delete the selected plugins and their data?' ),
+					'aysBulkDeleteThemes'      => __( 'Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?' ),
+					'deleting'                 => __( 'Deleting...' ),
+					/* translators: %s: Error string for a failed deletion */
+					'deleteFailed'             => __( 'Deletion failed: %s' ),
+					'pluginDeleted'            => _x( 'Deleted!', 'plugin' ),
+					'themeDeleted'             => _x( 'Deleted!', 'theme' ),
+					'livePreview'              => __( 'Live Preview' ),
+					'activatePlugin'           => is_network_admin() ? __( 'Network Activate' ) : __( 'Activate' ),
+					'activateTheme'            => is_network_admin() ? __( 'Network Enable' ) : __( 'Activate' ),
+					/* translators: %s: Plugin name */
+					'activatePluginLabel'      => is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate %s', 'plugin' ),
+					/* translators: %s: Theme name */
+					'activateThemeLabel'       => is_network_admin() ? _x( 'Network Activate %s', 'theme' ) : _x( 'Activate %s', 'theme' ),
+					'activateImporter'         => __( 'Run Importer' ),
+					/* translators: %s: Importer name */
+					'activateImporterLabel'    => __( 'Run %s' ),
+					'unknownError'             => __( 'Something went wrong.' ),
+					'connectionError'          => __( 'Connection lost or the server is busy. Please try again later.' ),
+					'nonceError'               => __( 'An error has occurred. Please reload the page and try again.' ),
+					'pluginsFound'             => __( 'Number of plugins found: %d' ),
+					'noPluginsFound'           => __( 'No plugins found. Try a different search.' ),
+				),
+			)
+		);
 
-		$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
+		$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array( 'jquery' ), '1.2' );
 
 		$scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 );
 		$scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'wp-color-picker', 'wpColorPickerL10n', array(
-			'clear'            => __( 'Clear' ),
-			'clearAriaLabel'   => __( 'Clear color' ),
-			'defaultString'    => __( 'Default' ),
-			'defaultAriaLabel' => __( 'Select default color' ),
-			'pick'             => __( 'Select Color' ),
-			'defaultLabel'     => __( 'Color value' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'wp-color-picker',
+			'wpColorPickerL10n',
+			array(
+				'clear'            => __( 'Clear' ),
+				'clearAriaLabel'   => __( 'Clear color' ),
+				'defaultString'    => __( 'Default' ),
+				'defaultAriaLabel' => __( 'Select default color' ),
+				'pick'             => __( 'Select Color' ),
+				'defaultLabel'     => __( 'Color value' ),
+			)
+		);
 
 		$scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox', 'wp-util', 'wp-a11y' ), false, 1 );
 
@@ -874,35 +1808,54 @@
 
 		$scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 );
 		$scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'media', 'attachMediaBoxL10n', array(
-			'error' => __( 'An error has occurred. Please reload the page and try again.' ),
-		));
+		did_action( 'init' ) && $scripts->localize(
+			'media',
+			'attachMediaBoxL10n',
+			array(
+				'error' => __( 'An error has occurred. Please reload the page and try again.' ),
+			)
+		);
 
-		$scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'image-edit', 'imageEditL10n', array(
-			'error' => __( 'Could not load the preview image. Please reload the page and try again.' )
-		));
+		$scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array( 'jquery', 'json2', 'imgareaselect' ), false, 1 );
+		did_action( 'init' ) && $scripts->localize(
+			'image-edit',
+			'imageEditL10n',
+			array(
+				'error' => __( 'Could not load the preview image. Please reload the page and try again.' ),
+			)
+		);
 
 		$scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
-			'setThumbnail' => __( 'Use as featured image' ),
-			'saving' => __( 'Saving...' ), // no ellipsis
-			'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
-			'done' => __( 'Done' )
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'set-post-thumbnail',
+			'setPostThumbnailL10n',
+			array(
+				'setThumbnail' => __( 'Use as featured image' ),
+				'saving'       => __( 'Saving...' ), // no ellipsis
+				'error'        => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
+				'done'         => __( 'Done' ),
+			)
+		);
 
-		// Navigation Menus
-		$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) );
-		did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array(
-			'noResultsFound' => __( 'No results found.' ),
-			'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
-			'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-			'untitled' => _x( '(no label)', 'missing menu item navigation label' )
-		) );
+		/*
+		 * Navigation Menus: Adding underscore as a dependency to utilize _.debounce
+		 * see https://core.trac.wordpress.org/ticket/42321
+		 */
+		$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2', 'underscore' ) );
+		did_action( 'init' ) && $scripts->localize(
+			'nav-menu',
+			'navMenuL10n',
+			array(
+				'noResultsFound' => __( 'No results found.' ),
+				'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
+				'saveAlert'      => __( 'The changes you made will be lost if you navigate away from this page.' ),
+				'untitled'       => _x( '(no label)', 'missing menu item navigation label' ),
+			)
+		);
 
-		$scripts->add( 'custom-header', "/wp-admin/js/custom-header.js", array( 'jquery-masonry' ), false, 1 );
+		$scripts->add( 'custom-header', '/wp-admin/js/custom-header.js', array( 'jquery-masonry' ), false, 1 );
 		$scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array( 'wp-color-picker', 'media-views' ), false, 1 );
-		$scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1 );
+		$scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array( 'jquery' ), false, 1 );
 
 		$scripts->add( 'svg-painter', '/wp-admin/js/svg-painter.js', array( 'jquery' ), false, 1 );
 	}
@@ -926,17 +1879,19 @@
 function wp_default_styles( &$styles ) {
 	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
-	if ( ! defined( 'SCRIPT_DEBUG' ) )
+	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
 		define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
-
-	if ( ! $guessurl = site_url() )
-		$guessurl = wp_guess_url();
+	}
 
-	$styles->base_url = $guessurl;
-	$styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
+	if ( ! $guessurl = site_url() ) {
+		$guessurl = wp_guess_url();
+	}
+
+	$styles->base_url        = $guessurl;
+	$styles->content_url     = defined( 'WP_CONTENT_URL' ) ? WP_CONTENT_URL : '';
 	$styles->default_version = get_bloginfo( 'version' );
-	$styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
-	$styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
+	$styles->text_direction  = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
+	$styles->default_dirs    = array( '/wp-admin/', '/wp-includes/css/' );
 
 	// Open Sans is no longer used by core, but may be relied upon by themes and plugins.
 	$open_sans_font_url = '';
@@ -970,74 +1925,172 @@
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 
 	// Admin CSS
-	$styles->add( 'common',              "/wp-admin/css/common$suffix.css" );
-	$styles->add( 'forms',               "/wp-admin/css/forms$suffix.css" );
-	$styles->add( 'admin-menu',          "/wp-admin/css/admin-menu$suffix.css" );
-	$styles->add( 'dashboard',           "/wp-admin/css/dashboard$suffix.css" );
-	$styles->add( 'list-tables',         "/wp-admin/css/list-tables$suffix.css" );
-	$styles->add( 'edit',                "/wp-admin/css/edit$suffix.css" );
-	$styles->add( 'revisions',           "/wp-admin/css/revisions$suffix.css" );
-	$styles->add( 'media',               "/wp-admin/css/media$suffix.css" );
-	$styles->add( 'themes',              "/wp-admin/css/themes$suffix.css" );
-	$styles->add( 'about',               "/wp-admin/css/about$suffix.css" );
-	$styles->add( 'nav-menus',           "/wp-admin/css/nav-menus$suffix.css" );
-	$styles->add( 'widgets',             "/wp-admin/css/widgets$suffix.css", array( 'wp-pointer' ) );
-	$styles->add( 'site-icon',           "/wp-admin/css/site-icon$suffix.css" );
-	$styles->add( 'l10n',                "/wp-admin/css/l10n$suffix.css" );
-	$styles->add( 'code-editor',         "/wp-admin/css/code-editor$suffix.css", array( 'wp-codemirror' ) );
+	$styles->add( 'common', "/wp-admin/css/common$suffix.css" );
+	$styles->add( 'forms', "/wp-admin/css/forms$suffix.css" );
+	$styles->add( 'admin-menu', "/wp-admin/css/admin-menu$suffix.css" );
+	$styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css" );
+	$styles->add( 'list-tables', "/wp-admin/css/list-tables$suffix.css" );
+	$styles->add( 'edit', "/wp-admin/css/edit$suffix.css" );
+	$styles->add( 'revisions', "/wp-admin/css/revisions$suffix.css" );
+	$styles->add( 'media', "/wp-admin/css/media$suffix.css" );
+	$styles->add( 'themes', "/wp-admin/css/themes$suffix.css" );
+	$styles->add( 'about', "/wp-admin/css/about$suffix.css" );
+	$styles->add( 'nav-menus', "/wp-admin/css/nav-menus$suffix.css" );
+	$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array( 'wp-pointer' ) );
+	$styles->add( 'site-icon', "/wp-admin/css/site-icon$suffix.css" );
+	$styles->add( 'l10n', "/wp-admin/css/l10n$suffix.css" );
+	$styles->add( 'code-editor', "/wp-admin/css/code-editor$suffix.css", array( 'wp-codemirror' ) );
+	$styles->add( 'site-health', "/wp-admin/css/site-health$suffix.css" );
 
 	$styles->add( 'wp-admin', false, array( 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) );
 
-	$styles->add( 'login',               "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
-	$styles->add( 'install',             "/wp-admin/css/install$suffix.css", array( 'buttons' ) );
-	$styles->add( 'wp-color-picker',     "/wp-admin/css/color-picker$suffix.css" );
-	$styles->add( 'customize-controls',  "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
-	$styles->add( 'customize-widgets',   "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
+	$styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
+	$styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
+	$styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" );
+	$styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
+	$styles->add( 'customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
 	$styles->add( 'customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array( 'wp-admin', 'colors' ) );
 
 	$styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
 	$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
 
 	// Common dependencies
-	$styles->add( 'buttons',   "/wp-includes/css/buttons$suffix.css" );
+	$styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" );
 	$styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );
 
 	// Includes CSS
-	$styles->add( 'admin-bar',            "/wp-includes/css/admin-bar$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'wp-auth-check',        "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'editor-buttons',       "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'media-views',          "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
-	$styles->add( 'wp-pointer',           "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'customize-preview',    "/wp-includes/css/customize-preview$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
+	$styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'customize-preview', "/wp-includes/css/customize-preview$suffix.css", array( 'dashicons' ) );
 	$styles->add( 'wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css" );
 	$styles->add_data( 'wp-embed-template-ie', 'conditional', 'lte IE 8' );
 
 	// External libraries and friends
-	$styles->add( 'imgareaselect',       '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
+	$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
 	$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'mediaelement',        "/wp-includes/js/mediaelement/mediaelementplayer-legacy.min.css", array(), '4.2.6-78496d1' );
-	$styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) );
-	$styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );
-	$styles->add( 'wp-codemirror',       '/wp-includes/js/codemirror/codemirror.min.css', array(), '5.29.1-alpha-ee20357' );
+	$styles->add( 'mediaelement', '/wp-includes/js/mediaelement/mediaelementplayer-legacy.min.css', array(), '4.2.6-78496d1' );
+	$styles->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) );
+	$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );
+	$styles->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.css', array(), '5.29.1-alpha-ee20357' );
 
 	// Deprecated CSS
 	$styles->add( 'deprecated-media', "/wp-admin/css/deprecated-media$suffix.css" );
-	$styles->add( 'farbtastic',       "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' );
-	$styles->add( 'jcrop',            "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
+	$styles->add( 'farbtastic', "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' );
+	$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.min.css', array(), '0.9.12' );
 	$styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) ); // Old handle.
 	$styles->add( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6
 
+	// Packages styles
+	$fonts_url = '';
+
+	/*
+	 * Translators: Use this to specify the proper Google Font name and variants
+	 * to load that is supported by your language. Do not translate.
+	 * Set to 'off' to disable loading.
+	 */
+	$font_family = _x( 'Noto Serif:400,400i,700,700i', 'Google Font Name and Variants' );
+	if ( 'off' !== $font_family ) {
+		$fonts_url = 'https://fonts.googleapis.com/css?family=' . urlencode( $font_family );
+	}
+	$styles->add( 'wp-editor-font', $fonts_url );
+
+	$styles->add( 'wp-block-library-theme', "/wp-includes/css/dist/block-library/theme$suffix.css" );
+
+	$styles->add(
+		'wp-edit-blocks',
+		"/wp-includes/css/dist/block-library/editor$suffix.css",
+		array(
+			'wp-components',
+			'wp-editor',
+			'wp-block-library',
+			// Always include visual styles so the editor never appears broken.
+			'wp-block-library-theme',
+		)
+	);
+
+	$package_styles = array(
+		'block-editor'         => array(
+			'wp-components',
+			'wp-editor-font',
+		),
+		'block-library'        => array(),
+		'components'           => array(),
+		'edit-post'            => array(
+			'wp-components',
+			'wp-block-editor',
+			'wp-editor',
+			'wp-edit-blocks',
+			'wp-block-library',
+			'wp-nux',
+		),
+		'editor'               => array(
+			'wp-components',
+			'wp-block-editor',
+			'wp-nux',
+		),
+		'format-library'       => array(),
+		'list-reusable-blocks' => array( 'wp-components' ),
+		'nux'                  => array( 'wp-components' ),
+	);
+
+	foreach ( $package_styles as $package => $dependencies ) {
+		$handle = 'wp-' . $package;
+		$path   = "/wp-includes/css/dist/$package/style$suffix.css";
+
+		$styles->add( $handle, $path, $dependencies );
+	}
+
 	// RTL CSS
 	$rtl_styles = array(
-		// wp-admin
-		'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus',
-		'widgets', 'site-icon', 'l10n', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'customize-preview',
-		'ie', 'login',
-		// wp-includes
-		'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',
+		// Admin CSS
+		'common',
+		'forms',
+		'admin-menu',
+		'dashboard',
+		'list-tables',
+		'edit',
+		'revisions',
+		'media',
+		'themes',
+		'about',
+		'nav-menus',
+		'widgets',
+		'site-icon',
+		'l10n',
+		'install',
+		'wp-color-picker',
+		'customize-controls',
+		'customize-widgets',
+		'customize-nav-menus',
+		'customize-preview',
+		'ie',
+		'login',
+		'site-health',
+		// Includes CSS
+		'buttons',
+		'admin-bar',
+		'wp-auth-check',
+		'editor-buttons',
+		'media-views',
+		'wp-pointer',
 		'wp-jquery-ui-dialog',
-		// deprecated
-		'deprecated-media', 'farbtastic',
+		// Package styles
+		'wp-block-library-theme',
+		'wp-edit-blocks',
+		'wp-block-editor',
+		'wp-block-library',
+		'wp-components',
+		'wp-edit-post',
+		'wp-editor',
+		'wp-format-library',
+		'wp-list-reusable-blocks',
+		'wp-nux',
+		// Deprecated CSS
+		'deprecated-media',
+		'farbtastic',
 	);
 
 	foreach ( $rtl_styles as $rtl_style ) {
@@ -1057,16 +2110,19 @@
  * @return array Reordered array, if needed.
  */
 function wp_prototype_before_jquery( $js_array ) {
-	if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
+	if ( false === $prototype = array_search( 'prototype', $js_array, true ) ) {
 		return $js_array;
+	}
 
-	if ( false === $jquery = array_search( 'jquery', $js_array, true ) )
+	if ( false === $jquery = array_search( 'jquery', $js_array, true ) ) {
 		return $js_array;
+	}
 
-	if ( $prototype < $jquery )
+	if ( $prototype < $jquery ) {
 		return $js_array;
+	}
 
-	unset($js_array[$prototype]);
+	unset( $js_array[ $prototype ] );
 
 	array_splice( $js_array, $jquery, 0, 'prototype' );
 
@@ -1082,24 +2138,36 @@
  */
 function wp_just_in_time_script_localization() {
 
-	wp_localize_script( 'autosave', 'autosaveL10n', array(
-		'autosaveInterval' => AUTOSAVE_INTERVAL,
-		'blog_id' => get_current_blog_id(),
-	) );
-
-	wp_localize_script( 'mce-view', 'mceViewL10n', array(
-		'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
-	) );
+	wp_localize_script(
+		'autosave',
+		'autosaveL10n',
+		array(
+			'autosaveInterval' => AUTOSAVE_INTERVAL,
+			'blog_id'          => get_current_blog_id(),
+		)
+	);
 
-	wp_localize_script( 'word-count', 'wordCountL10n', array(
-		/*
-		 * translators: If your word count is based on single characters (e.g. East Asian characters),
-		 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
-		 * Do not translate into your own language.
-		 */
-		'type' => _x( 'words', 'Word count type. Do not translate!' ),
-		'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
-	) );
+	wp_localize_script(
+		'mce-view',
+		'mceViewL10n',
+		array(
+			'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array(),
+		)
+	);
+
+	wp_localize_script(
+		'word-count',
+		'wordCountL10n',
+		array(
+			/*
+			 * translators: If your word count is based on single characters (e.g. East Asian characters),
+			 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
+			 * Do not translate into your own language.
+			 */
+			'type'       => _x( 'words', 'Word count type. Do not translate!' ),
+			'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array(),
+		)
+	);
 }
 
 /**
@@ -1121,32 +2189,48 @@
 	// Convert the PHP date format into jQuery UI's format.
 	$datepicker_date_format = str_replace(
 		array(
-			'd', 'j', 'l', 'z', // Day.
-			'F', 'M', 'n', 'm', // Month.
-			'Y', 'y'            // Year.
+			'd',
+			'j',
+			'l',
+			'z', // Day.
+			'F',
+			'M',
+			'n',
+			'm', // Month.
+			'Y',
+			'y',            // Year.
 		),
 		array(
-			'dd', 'd', 'DD', 'o',
-			'MM', 'M', 'm', 'mm',
-			'yy', 'y'
+			'dd',
+			'd',
+			'DD',
+			'o',
+			'MM',
+			'M',
+			'm',
+			'mm',
+			'yy',
+			'y',
 		),
 		get_option( 'date_format' )
 	);
 
-	$datepicker_defaults = wp_json_encode( array(
-		'closeText'       => __( 'Close' ),
-		'currentText'     => __( 'Today' ),
-		'monthNames'      => array_values( $wp_locale->month ),
-		'monthNamesShort' => array_values( $wp_locale->month_abbrev ),
-		'nextText'        => __( 'Next' ),
-		'prevText'        => __( 'Previous' ),
-		'dayNames'        => array_values( $wp_locale->weekday ),
-		'dayNamesShort'   => array_values( $wp_locale->weekday_abbrev ),
-		'dayNamesMin'     => array_values( $wp_locale->weekday_initial ),
-		'dateFormat'      => $datepicker_date_format,
-		'firstDay'        => absint( get_option( 'start_of_week' ) ),
-		'isRTL'           => $wp_locale->is_rtl(),
-	) );
+	$datepicker_defaults = wp_json_encode(
+		array(
+			'closeText'       => __( 'Close' ),
+			'currentText'     => __( 'Today' ),
+			'monthNames'      => array_values( $wp_locale->month ),
+			'monthNamesShort' => array_values( $wp_locale->month_abbrev ),
+			'nextText'        => __( 'Next' ),
+			'prevText'        => __( 'Previous' ),
+			'dayNames'        => array_values( $wp_locale->weekday ),
+			'dayNamesShort'   => array_values( $wp_locale->weekday_abbrev ),
+			'dayNamesMin'     => array_values( $wp_locale->weekday_initial ),
+			'dateFormat'      => $datepicker_date_format,
+			'firstDay'        => absint( get_option( 'start_of_week' ) ),
+			'isRTL'           => $wp_locale->is_rtl(),
+		)
+	);
 
 	wp_add_inline_script( 'jquery-ui-datepicker', "jQuery(document).ready(function(jQuery){jQuery.datepicker.setDefaults({$datepicker_defaults});});" );
 }
@@ -1182,37 +2266,41 @@
 
 	$events_client = new WP_Community_Events( $user_id, $saved_location );
 
-	wp_localize_script( 'dashboard', 'communityEventsData', array(
-		'nonce' => wp_create_nonce( 'community_events' ),
-		'cache' => $events_client->get_cached_events(),
+	wp_localize_script(
+		'dashboard',
+		'communityEventsData',
+		array(
+			'nonce' => wp_create_nonce( 'community_events' ),
+			'cache' => $events_client->get_cached_events(),
 
-		'l10n' => array(
-			'enter_closest_city' => __( 'Enter your closest city to find nearby events.' ),
-			'error_occurred_please_try_again' => __( 'An error occurred. Please try again.' ),
-			'attend_event_near_generic' => __( 'Attend an upcoming event near you.' ),
+			'l10n'  => array(
+				'enter_closest_city'              => __( 'Enter your closest city to find nearby events.' ),
+				'error_occurred_please_try_again' => __( 'An error occurred. Please try again.' ),
+				'attend_event_near_generic'       => __( 'Attend an upcoming event near you.' ),
 
-			/*
-			 * These specific examples were chosen to highlight the fact that a
-			 * state is not needed, even for cities whose name is not unique.
-			 * It would be too cumbersome to include that in the instructions
-			 * to the user, so it's left as an implication.
-			 */
-			/* translators: %s is the name of the city we couldn't locate.
-			 * Replace the examples with cities related to your locale. Test that
-			 * they match the expected location and have upcoming events before
-			 * including them. If no cities related to your locale have events,
-			 * then use cities related to your locale that would be recognizable
-			 * to most users. Use only the city name itself, without any region
-			 * or country. Use the endonym (native locale name) instead of the
-			 * English name if possible.
-			 */
-			'could_not_locate_city' => __( 'We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
+				/*
+				 * These specific examples were chosen to highlight the fact that a
+				 * state is not needed, even for cities whose name is not unique.
+				 * It would be too cumbersome to include that in the instructions
+				 * to the user, so it's left as an implication.
+				 */
+				/* translators: %s is the name of the city we couldn't locate.
+				 * Replace the examples with cities related to your locale. Test that
+				 * they match the expected location and have upcoming events before
+				 * including them. If no cities related to your locale have events,
+				 * then use cities related to your locale that would be recognizable
+				 * to most users. Use only the city name itself, without any region
+				 * or country. Use the endonym (native locale name) instead of the
+				 * English name if possible.
+				 */
+				'could_not_locate_city'           => __( 'We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
 
-			// This one is only used with wp.a11y.speak(), so it can/should be more brief.
-			/* translators: %s: the name of a city */
-			'city_updated' => __( 'City updated. Listing events near %s.' ),
+				// This one is only used with wp.a11y.speak(), so it can/should be more brief.
+				/* translators: %s: the name of a city */
+				'city_updated'                    => __( 'City updated. Listing events near %s.' ),
+			),
 		)
-	) );
+	);
 }
 
 /**
@@ -1238,24 +2326,26 @@
 function wp_style_loader_src( $src, $handle ) {
 	global $_wp_admin_css_colors;
 
-	if ( wp_installing() )
+	if ( wp_installing() ) {
 		return preg_replace( '#^wp-admin/#', './', $src );
+	}
 
 	if ( 'colors' == $handle ) {
-		$color = get_user_option('admin_color');
+		$color = get_user_option( 'admin_color' );
 
-		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
+		if ( empty( $color ) || ! isset( $_wp_admin_css_colors[ $color ] ) ) {
 			$color = 'fresh';
+		}
 
-		$color = $_wp_admin_css_colors[$color];
-		$url = $color->url;
+		$color = $_wp_admin_css_colors[ $color ];
+		$url   = $color->url;
 
 		if ( ! $url ) {
 			return false;
 		}
 
 		$parsed = parse_url( $src );
-		if ( isset($parsed['query']) && $parsed['query'] ) {
+		if ( isset( $parsed['query'] ) && $parsed['query'] ) {
 			wp_parse_str( $parsed['query'], $qv );
 			$url = add_query_arg( $qv, $url );
 		}
@@ -1283,7 +2373,7 @@
 function print_head_scripts() {
 	global $concatenate_scripts;
 
-	if ( ! did_action('wp_print_scripts') ) {
+	if ( ! did_action( 'wp_print_scripts' ) ) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
 		do_action( 'wp_print_scripts' );
 	}
@@ -1356,12 +2446,13 @@
 	global $wp_scripts, $compress_scripts;
 
 	$zip = $compress_scripts ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+	if ( $zip && defined( 'ENFORCE_GZIP' ) && ENFORCE_GZIP ) {
 		$zip = 'gzip';
+	}
 
 	if ( $concat = trim( $wp_scripts->concat, ', ' ) ) {
 
-		if ( !empty($wp_scripts->print_code) ) {
+		if ( ! empty( $wp_scripts->print_code ) ) {
 			echo "\n<script type='text/javascript'>\n";
 			echo "/* <![CDATA[ */\n"; // not needed in HTML 5
 			echo $wp_scripts->print_code;
@@ -1373,11 +2464,12 @@
 		$concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
 
 		$src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version;
-		echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
+		echo "<script type='text/javascript' src='" . esc_attr( $src ) . "'></script>\n";
 	}
 
-	if ( !empty($wp_scripts->print_html) )
+	if ( ! empty( $wp_scripts->print_html ) ) {
 		echo $wp_scripts->print_html;
+	}
 }
 
 /**
@@ -1393,7 +2485,7 @@
  * @return array
  */
 function wp_print_head_scripts() {
-	if ( ! did_action('wp_print_scripts') ) {
+	if ( ! did_action( 'wp_print_scripts' ) ) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
 		do_action( 'wp_print_scripts' );
 	}
@@ -1463,7 +2555,7 @@
 
 	script_concat_settings();
 	$wp_styles->do_concat = $concatenate_scripts;
-	$wp_styles->do_items(false);
+	$wp_styles->do_items( false );
 
 	/**
 	 * Filters whether to print the admin styles.
@@ -1530,8 +2622,9 @@
 	$wp_styles = wp_styles();
 
 	$zip = $compress_css ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+	if ( $zip && defined( 'ENFORCE_GZIP' ) && ENFORCE_GZIP ) {
 		$zip = 'gzip';
+	}
 
 	if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
 		$dir = $wp_styles->text_direction;
@@ -1541,17 +2634,18 @@
 		$concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
 
 		$href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver;
-		echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
+		echo "<link rel='stylesheet' href='" . esc_attr( $href ) . "' type='text/css' media='all' />\n";
 
-		if ( !empty($wp_styles->print_code) ) {
+		if ( ! empty( $wp_styles->print_code ) ) {
 			echo "<style type='text/css'>\n";
 			echo $wp_styles->print_code;
 			echo "\n</style>\n";
 		}
 	}
 
-	if ( !empty($wp_styles->print_html) )
+	if ( ! empty( $wp_styles->print_html ) ) {
 		echo $wp_styles->print_html;
+	}
 }
 
 /**
@@ -1566,23 +2660,97 @@
 function script_concat_settings() {
 	global $concatenate_scripts, $compress_scripts, $compress_css;
 
-	$compressed_output = ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') );
+	$compressed_output = ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' == ini_get( 'output_handler' ) );
+
+	if ( ! isset( $concatenate_scripts ) ) {
+		$concatenate_scripts = defined( 'CONCATENATE_SCRIPTS' ) ? CONCATENATE_SCRIPTS : true;
+		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ) {
+			$concatenate_scripts = false;
+		}
+	}
+
+	if ( ! isset( $compress_scripts ) ) {
+		$compress_scripts = defined( 'COMPRESS_SCRIPTS' ) ? COMPRESS_SCRIPTS : true;
+		if ( $compress_scripts && ( ! get_site_option( 'can_compress_scripts' ) || $compressed_output ) ) {
+			$compress_scripts = false;
+		}
+	}
 
-	if ( ! isset($concatenate_scripts) ) {
-		$concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
-			$concatenate_scripts = false;
+	if ( ! isset( $compress_css ) ) {
+		$compress_css = defined( 'COMPRESS_CSS' ) ? COMPRESS_CSS : true;
+		if ( $compress_css && ( ! get_site_option( 'can_compress_scripts' ) || $compressed_output ) ) {
+			$compress_css = false;
+		}
+	}
+}
+
+/**
+ * Handles the enqueueing of block scripts and styles that are common to both
+ * the editor and the front-end.
+ *
+ * @since 5.0.0
+ *
+ * @global WP_Screen $current_screen
+ */
+function wp_common_block_scripts_and_styles() {
+	global $current_screen;
+
+	if ( is_admin() && ( $current_screen instanceof WP_Screen ) && ! $current_screen->is_block_editor() ) {
+		return;
+	}
+
+	wp_enqueue_style( 'wp-block-library' );
+
+	if ( current_theme_supports( 'wp-block-styles' ) ) {
+		wp_enqueue_style( 'wp-block-library-theme' );
 	}
 
-	if ( ! isset($compress_scripts) ) {
-		$compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
-		if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
-			$compress_scripts = false;
-	}
+	/**
+	 * Fires after enqueuing block assets for both editor and front-end.
+	 *
+	 * Call `add_action` on any hook before 'wp_enqueue_scripts'.
+	 *
+	 * In the function call you supply, simply use `wp_enqueue_script` and
+	 * `wp_enqueue_style` to add your functionality to the Gutenberg editor.
+	 *
+	 * @since 5.0.0
+	 */
+	  do_action( 'enqueue_block_assets' );
+}
+
+/**
+ * Enqueues registered block scripts and styles, depending on current rendered
+ * context (only enqueuing editor scripts while in context of the editor).
+ *
+ * @since 5.0.0
+ *
+ * @global WP_Screen $current_screen
+ */
+function wp_enqueue_registered_block_scripts_and_styles() {
+	global $current_screen;
 
-	if ( ! isset($compress_css) ) {
-		$compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
-		if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
-			$compress_css = false;
+	$is_editor = ( ( $current_screen instanceof WP_Screen ) && $current_screen->is_block_editor() );
+
+	$block_registry = WP_Block_Type_Registry::get_instance();
+	foreach ( $block_registry->get_all_registered() as $block_name => $block_type ) {
+		// Front-end styles.
+		if ( ! empty( $block_type->style ) ) {
+			wp_enqueue_style( $block_type->style );
+		}
+
+		// Front-end script.
+		if ( ! empty( $block_type->script ) ) {
+			wp_enqueue_script( $block_type->script );
+		}
+
+		// Editor styles.
+		if ( $is_editor && ! empty( $block_type->editor_style ) ) {
+			wp_enqueue_style( $block_type->editor_style );
+		}
+
+		// Editor script.
+		if ( $is_editor && ! empty( $block_type->editor_script ) ) {
+			wp_enqueue_script( $block_type->editor_script );
+		}
 	}
 }