Tag 5.1.9

Built from https://develop.svn.wordpress.org/tags/5.1.9@50753 git-svn-id: http://core.svn.wordpress.org/tags/5.1.9@50362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Version bump for 5.1.9.
2021-04-15 02:08:30 +00:00 · 2021-04-15 01:39:44 +00:00 · 2021-04-15 01:12:45 +00:00 · 2021-03-31 19:21:47 +00:00 · 2021-02-05 03:55:07 +00:00 · 2020-11-06 16:40:53 +00:00
1118 changed files with 154378 additions and 130080 deletions
--- a/index.php
+++ b/index.php
@@ -11,7 +11,7 @@
 *
 * @var bool
 */
-define('WP_USE_THEMES', true);
+define( 'WP_USE_THEMES', true );

 /** Loads the WordPress Environment and Template */
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
--- a/readme.html
+++ b/readme.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -26,7 +26,7 @@
 			<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser.</li>
 		</ol>
 	</li>
-	<li>Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="https://wordpress.org/support/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
+	<li>Once the configuration file is set up, the installer will set up the tables needed for your site. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="https://wordpress.org/support/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
 	<li><strong>If you did not enter a password, note the password given to you.</strong> If you did not provide a username, it will be <code>admin</code>.</li>
 	<li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on &#8220;Profile&#8221; to change the password.</li>
 </ol>
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -9,11 +9,11 @@
 define( 'WP_INSTALLING', true );

 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require( dirname( __FILE__ ) . '/wp-load.php' );

 require( dirname( __FILE__ ) . '/wp-blog-header.php' );

-if ( !is_multisite() ) {
+if ( ! is_multisite() ) {
 	wp_redirect( wp_registration_url() );
 	die();
 }
@@ -21,7 +21,7 @@ if ( !is_multisite() ) {
 $valid_error_codes = array( 'already_active', 'blog_taken' );

 list( $activate_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
-$activate_cookie = 'wp-activate-' . COOKIEHASH;
+$activate_cookie       = 'wp-activate-' . COOKIEHASH;

 $key    = '';
 $result = null;
@@ -64,8 +64,9 @@ if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->

 nocache_headers();

-if ( is_object( $wp_object_cache ) )
+if ( is_object( $wp_object_cache ) ) {
 	$wp_object_cache->cache_enabled = false;
+}

 // Fix for page title
 $wp_query->is_404 = false;
@@ -89,10 +90,10 @@ function do_activate_header() {
 	 * Fires before the Site Activation page is loaded.
 	 *
 	 * Fires on the {@see 'wp_head'} action.
-     *
-     * @since 3.0.0
-     */
-    do_action( 'activate_wp_head' );
+	 *
+	 * @since 3.0.0
+	 */
+	do_action( 'activate_wp_head' );
 }
 add_action( 'wp_head', 'do_activate_header' );

@@ -108,7 +109,7 @@ function wpmu_activate_stylesheet() {
 		#submit, #key { width: 90%; font-size: 24px; }
 		#language { margin-top: .5em; }
 		.error { background: #f66; }
-		span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: bold; }
+		span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: 600; }
 	</style>
 	<?php
 }
@@ -122,18 +123,19 @@ get_header( 'wp-activate' );
 	<div class="wp-activate-container">
 	<?php if ( ! $key ) { ?>

-		<h2><?php _e('Activation Key Required') ?></h2>
-		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
+		<h2><?php _e( 'Activation Key Required' ); ?></h2>
+		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">
 			<p>
-			    <label for="key"><?php _e('Activation Key:') ?></label>
-			    <br /><input type="text" name="key" id="key" value="" size="50" />
+				<label for="key"><?php _e( 'Activation Key:' ); ?></label>
+				<br /><input type="text" name="key" id="key" value="" size="50" />
 			</p>
 			<p class="submit">
-			    <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
+				<input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Activate' ); ?>" />
 			</p>
 		</form>

-	<?php } else {
+		<?php
+	} else {
 		if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
 			$signup = $result->get_error_data();
 			?>
@@ -142,7 +144,7 @@ get_header( 'wp-activate' );
 			echo '<p class="lead-in">';
 			if ( $signup->domain . $signup->path == '' ) {
 				printf(
-				/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
+					/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
 					__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
 					network_site_url( 'wp-login.php', 'login' ),
 					$signup->user_login,
@@ -151,7 +153,7 @@ get_header( 'wp-activate' );
 				);
 			} else {
 				printf(
-				/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
+					/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
 					__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
 					sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
 					$signup->user_login,
@@ -168,31 +170,37 @@ get_header( 'wp-activate' );
 			<?php endif; ?>
 			<?php
 		} else {
-			$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+			$url  = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
 			$user = get_userdata( (int) $result['user_id'] );
 			?>
-			<h2><?php _e('Your account is now active!'); ?></h2>
+			<h2><?php _e( 'Your account is now active!' ); ?></h2>

 			<div id="signup-welcome">
-				<p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
-				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
+			<p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo $user->user_login; ?></p>
+			<p><span class="h3"><?php _e( 'Password:' ); ?></span> <?php echo $result['password']; ?></p>
 			</div>

-			<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
+			<?php
+			if ( $url && $url != network_home_url( '', 'http' ) ) :
 				switch_to_blog( (int) $result['blog_id'] );
 				$login_url = wp_login_url();
 				restore_current_blog();
 				?>
-				<p class="view"><?php
+				<p class="view">
+				<?php
 					/* translators: 1: site URL, 2: login URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
-				?></p>
-			<?php else: ?>
-				<p class="view"><?php
+				?>
+				</p>
+			<?php else : ?>
+				<p class="view">
+				<?php
 					/* translators: 1: login URL, 2: network home URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
-				?></p>
-			<?php endif;
+				?>
+				</p>
+				<?php
+				endif;
 		}
 	}
 	?>
@@ -202,4 +210,5 @@ get_header( 'wp-activate' );
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php get_footer( 'wp-activate' );
+<?php
+get_footer( 'wp-activate' );
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -23,33 +23,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 	<div class="wrap about-wrap full-width-layout">
 		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>

-		<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s introduces a robust new content creation experience.' ), $display_version ); ?></p>
-
-		<?php if (
-			// Was the Gutenberg plugin installed before upgrading to 5.0.x?
-			get_option( 'upgrade_500_was_gutenberg_active' ) == '1'  &&
-			current_user_can( 'activate_plugins' ) &&
-			// Has it not been reactivated since?
-			is_plugin_inactive( 'gutenberg/gutenberg.php' ) &&
-			// Is it still installed?
-			file_exists( WP_PLUGIN_DIR . '/gutenberg/gutenberg.php' )
-		) : ?>
-			<div class="about-text" style="font-style:italic;">
-				<?php
-				printf(
-					/* translators: 1: WordPress version, 2: HTML start tag of link, 3: HTML end tag of link */
-					__( 'The Gutenberg plugin has been deactivated, as the features are now included in WordPress %1$s by default. If you&#8217;d like to continue to test the upcoming changes in the WordPress editing experience, please %2$sreactivate the Gutenberg plugin%3$s.' ),
-					$display_version,
-					'<a href="' . esc_url( self_admin_url( 'plugins.php?s=gutenberg&plugin_status=all' ) ) . '">',
-					'</a>'
-				);
-				?>
-			</div>
-		<?php elseif ( ! file_exists( WP_PLUGIN_DIR . '/classic-editor/classic-editor.php' ) ) : ?>
-			<p class="about-text">
-				&#x2139; <a href="#classic-editor"><?php _e( 'Learn how to keep using the old editor.' ); ?></a>
-			</p>
-		<?php endif; ?>
+		<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version!' ), $display_version ); ?></p>

 		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

@@ -67,7 +41,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				printf(
 					/* translators: %s: WordPress version number */
 					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.14'
+					'5.1.9'
 				);
 				?>
 				<?php
@@ -77,7 +51,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 					sprintf(
 						/* translators: %s: WordPress version */
 						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.14' )
+						sanitize_title( '5.1.9' )
 					)
 				);
 				?>
@@ -85,9 +59,14 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<p>
 				<?php
 				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed one security issue.' ),
-					'5.0.13'
+					/* translators: 1: WordPress version number, 2: Plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed %2$s bugs.',
+						1
+					),
+					'5.1.8',
+					number_format_i18n( 1 )
 				);
 				?>
 				<?php
@@ -97,7 +76,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 					sprintf(
 						/* translators: %s: WordPress version */
 						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.13' )
+						sanitize_title( '5.1.8' )
 					)
 				);
 				?>
@@ -107,7 +86,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				printf(
 					/* translators: %s: WordPress version number */
 					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.12'
+					'5.1.7'
 				);
 				?>
 				<?php
@@ -117,147 +96,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 					sprintf(
 						/* translators: %s: WordPress version */
 						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.12' )
-					)
-				);
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.11'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.11' )
-					)
-				);
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.10'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.10' )
-					)
-				);
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.9'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.9' )
-					)
-				);
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.8'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.8' )
-					)
-				);
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.7'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.7' )
-					)
-				);
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.6'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.6' )
-					)
-				);
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.0.4'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.0.4' )
+						sanitize_title( '5.1.7' )
 					)
 				);
 				?>
@@ -267,17 +106,84 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				printf(
 					/* translators: 1: WordPress version number, 2: plural number of bugs. */
 					_n(
-						'<strong>Version %1$s</strong> addressed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed %2$s bugs.',
-						44
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						1
 					),
-					'5.0.3',
-					number_format_i18n( 44 )
+					'5.1.6',
+					number_format_i18n( 1 )
 				);
 				?>
 				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_5.0.3' );
+				printf(
+					/* translators: %s: HelpHub URL */
+					__( 'For more information, see <a href="%s">the release notes</a>.' ),
+					sprintf(
+						/* translators: %s: WordPress version */
+						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+						sanitize_title( '5.1.6' )
+					)
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: %s: WordPress version number */
+					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					'5.1.5'
+				);
+				?>
+				<?php
+				printf(
+					/* translators: %s: HelpHub URL */
+					__( 'For more information, see <a href="%s">the release notes</a>.' ),
+					sprintf(
+						/* translators: %s: WordPress version */
+						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+						sanitize_title( '5.1.5' )
+					)
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: %s: WordPress version number */
+					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					'5.1.4'
+				);
+				?>
+				<?php
+				printf(
+					/* translators: %s: HelpHub URL */
+					__( 'For more information, see <a href="%s">the release notes</a>.' ),
+					sprintf(
+						/* translators: %s: WordPress version */
+						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+						sanitize_title( '5.1.4' )
+					)
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: %s: WordPress version number */
+					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					'5.1.3'
+				);
+				?>
+				<?php
+				printf(
+					/* translators: %s: HelpHub URL */
+					__( 'For more information, see <a href="%s">the release notes</a>.' ),
+					sprintf(
+						/* translators: %s: WordPress version */
+						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+						sanitize_title( '5.1.3' )
+					)
+				);
 				?>
 			</p>
 			<p>
@@ -285,391 +191,154 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				printf(
 					/* translators: 1: WordPress version number, 2: plural number of bugs. */
 					_n(
-						'<strong>Version %1$s</strong> addressed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed %2$s bugs.',
-						73
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						2
 					),
-					'5.0.2',
-					number_format_i18n( 73 )
+					'5.1.2',
+					number_format_i18n( 2 )
 				);
 				?>
 				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_5.0.2' );
+				printf(
+					/* translators: %s: HelpHub URL */
+					__( 'For more information, see <a href="%s">the release notes</a>.' ),
+					sprintf(
+						/* translators: %s: WordPress version */
+						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+						sanitize_title( '5.1.2' )
+					)
+				);
 				?>
 			</p>
 			<p>
 				<?php
-				/* translators: %s: WordPress version number */
-				printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '5.0.1' );
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						14
+					),
+					'5.1.1',
+					number_format_i18n( 14 )
+				);
 				?>
 				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_5.0.1' );
+				printf(
+					/* translators: %s: HelpHub URL */
+					__( 'For more information, see <a href="%s">the release notes</a>.' ),
+					sprintf(
+						/* translators: %s: WordPress version */
+						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+						sanitize_title( '5.1.1' )
+					)
+				);
 				?>
 			</p>
 		</div>

-		<div class="feature-section one-col">
-			<div class="col">
-				<h2><?php _e( 'Say Hello to the New Editor' ); ?></h2>
-			</div>
-		</div>
+		<h2 class="feature-section-header"><?php _e( 'A Little Better Every Day' ); ?></h2>

-		<div class="full-width">
-			<picture>
-				<source type="image/webp" media="(max-width: 782px)" srcset="https://s.w.org/images/core/5.0/header/Gutenberg%20Mobile1x.webp 1x, https://s.w.org/images/core/5.0/header/Gutenberg%20Mobile.webp 2x" />
-				<source media="(max-width: 782px)" srcset="https://s.w.org/images/core/5.0/header/Gutenberg%20Mobile1x.jpg 1x, https://s.w.org/images/core/5.0/header/Gutenberg%20Mobile.jpg 2x" />
-				<source type="image/webp" srcset="https://s.w.org/images/core/5.0/header/Gutenberg1x.webp 1x, https://s.w.org/images/core/5.0/header/Gutenberg.webp 2x" />
-				<img src="https://s.w.org/images/core/5.0/header/Gutenberg1x.jpg" srcset="https://s.w.org/images/core/5.0/header/Gutenberg1x.jpg 1x, https://s.w.org/images/core/5.0/header/Gutenberg.jpg 2x" alt="">
-			</picture>
-		</div>
-
-		<div class="feature-section one-col">
+		<div class="feature-section headline-feature one-col">
 			<div class="col">
-				<p><?php _e( 'You&#8217;ve successfully upgraded to WordPress 5.0! We’ve made some big changes to the editor. Our new block-based editor is the first step toward an exciting new future with a streamlined editing experience across your site. You’ll have more flexibility with how content is displayed, whether you are building your first site, revamping your blog, or write code for a living.' ); ?></p>
-			</div>
-		</div>
-
-		<div class="feature-section four-col">
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/features/Plugins1x.webp 1x, https://s.w.org/images/core/5.0/features/Plugins.webp 2x">
-						<img src="https://s.w.org/images/core/5.0/features/Plugins1x.jpg" srcset="https://s.w.org/images/core/5.0/features/Plugins1x.jpg 1x, https://s.w.org/images/core/5.0/features/Plugins.jpg 2x" alt="" width="250" height="250" />
-					</picture>
-					<figcaption><?php _e( 'Do more with fewer plugins.' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/features/Layout1x.webp 1x, https://s.w.org/images/core/5.0/features/Layout.webp 2x">
-						<img src="https://s.w.org/images/core/5.0/features/Layout1x.jpg" srcset="https://s.w.org/images/core/5.0/features/Layout1x.jpg 1x, https://s.w.org/images/core/5.0/features/Layout.jpg 2x" alt="" width="250" height="250" />
-					</picture>
-					<figcaption><?php _e( 'Create modern, multimedia-heavy layouts.' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/features/Responsive1x.webp 1x, https://s.w.org/images/core/5.0/features/Responsive.webp 2x">
-						<img src="https://s.w.org/images/core/5.0/features/Responsive1x.jpg" srcset="https://s.w.org/images/core/5.0/features/Responsive1x.jpg 1x, https://s.w.org/images/core/5.0/features/Responsive.jpg 2x" alt="" width="250" height="250" />
-					</picture>
-					<figcaption><?php _e( 'Work across all screen sizes and devices.' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/features/Editor%20Styles1x.webp 1x, https://s.w.org/images/core/5.0/features/Editor%20Styles.webp 2x">
-						<img src="https://s.w.org/images/core/5.0/features/Editor%20Styles1x.jpg" srcset="https://s.w.org/images/core/5.0/features/Editor%20Styles1x.jpg 1x, https://s.w.org/images/core/5.0/features/Editor%20Styles.jpg 2x" alt="" width="250" height="250" />
-					</picture>
-					<figcaption><?php _e( 'Trust that your editor looks like your website.' ); ?></figcaption>
-				</figure>
-			</div>
-		</div>
-
-		<div class="feature-section one-col">
-			<div class="col">
-				<h2><?php _e( 'Building with Blocks' ); ?></h2>
-				<p><?php _e( 'The new block-based editor won&#8217;t change the way any of your content looks to your visitors. What it will do is let you insert any type of multimedia in a snap and rearrange to your heart&#8217;s content. Each piece of content will be in its own block; a distinct wrapper for easy maneuvering. If you&#8217;re more of an HTML and CSS sort of person, then the blocks won&#8217;t stand in your way. WordPress is here to simplify the process, not the outcome.' ); ?></p>
-				<video controls>
-					<source src="https://s.w.org/images/core/5.0/videos/add-block.mp4" type="video/mp4">
-					<source src="https://s.w.org/images/core/5.0/videos/add-block.webm" type="video/webm">
-					<p><?php printf( __('Your browser doesn&#8217;t support HTML5 video. Here is a %1$slink to the video%2$s instead.'), '<a href="https://wordpress.org/gutenberg/files/2018/11/add-block.mp4">', '</a>'); ?></p>
-				</video>
-				<p><?php _e( 'We have tons of blocks available by default, and more get added by the community every day. Here are a few of the blocks to help you get started:' ); ?></p>
-			</div>
-		</div>
-
-		<div class="feature-section eight-col">
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Paragraph@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Paragraph.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Paragraph@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Paragraph@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Paragraph.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Paragraph' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Heading@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Heading.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Heading@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Heading@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Heading.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Heading' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Preformatted@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Preformatted.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Preformatted@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Preformatted@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Preformatted.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Preformatted' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Quote@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Quote.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Quote@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Quote@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Quote.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Quote' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Image@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Image.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Image@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Image@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Image.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Image' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Gallery@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Gallery.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Gallery@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Gallery@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Gallery.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Gallery' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Cover%20Image@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Cover%20Image.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Cover%20Image@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Cover%20Image@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Cover%20Image.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Cover' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Video@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Video.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Video@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Video@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Video.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Video' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Audio@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Audio.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Audio@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Audio@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Audio.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Audio' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Column@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Column.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Column@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Column@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Column.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Columns' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20File@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20File.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20File@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20File@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20File.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'File' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Code@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Code.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Code@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Code@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Code.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Code' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20List@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20List.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20List@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20List@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20List.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'List' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Button@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Button.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Button@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Button@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Button.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Button' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Embeds@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Embeds.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Embeds@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Embeds@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20Embeds.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'Embeds' ); ?></figcaption>
-				</figure>
-			</div>
-			<div class="col">
-				<figure>
-					<picture>
-						<source type="image/webp" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20More@1x.webp 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20More.webp 2x" />
-						<img src="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20More@1x.jpg" srcset="https://s.w.org/images/core/5.0/blocks/Block%20Icon%20More@1x.jpg 1x, https://s.w.org/images/core/5.0/blocks/Block%20Icon%20More.jpg 2x" alt=""/>
-					</picture>
-					<figcaption><?php _e( 'More' ); ?></figcaption>
-				</figure>
-			</div>
-		</div>
-
-		<div class="feature-section one-col">
-			<div class="col">
-				<h2><?php _e( 'Freedom to Build, Freedom to Write' ); ?></h2>
-				<p><?php _e( 'This new editing experience provides a more consistent treatment of design as well as content. If you&#8217;re building client sites, you can create reusable blocks. This lets your clients add new content anytime, while still maintaining a consistent look and feel.' ); ?></p>
-				<video controls>
-					<source src="https://s.w.org/images/core/5.0/videos/build.mp4" type="video/mp4">
-					<source src="https://s.w.org/images/core/5.0/videos/build.webm" type="video/webm">
-					<p><?php printf( __('Your browser doesn&#8217;t support HTML5 video. Here is a %1$slink to the video%2$s instead.'), '<a href="https://wordpress.org/gutenberg/files/2018/11/build.mp4">', '</a>'); ?></p>
-				</video>
-			</div>
-		</div>
-
-		<?php if ( current_user_can( 'edit_posts' ) ) { ?>
-			<div class="feature-section one-col cta">
-				<div class="col">
-					<a class="button button-primary button-hero" href="<?php echo esc_url( admin_url( 'post-new.php' ) ); ?>"><?php _e( 'Build your first post' ); ?></a>
+				<div class="inline-svg">
+					<img src="https://s.w.org/images/core/5.1/update.svg" alt="">
 				</div>
+				<p><?php _e( 'You&#8217;ve successfully upgraded to WordPress 5.1! Following WordPress 5.0&#8212;a major release which introduced the new block editor&#8212;5.1 focuses on polish, in particular by improving overall performance of the editor. In addition, this release paves the way for a better, faster, and more secure WordPress with some essential tools for site administrators and developers.' ); ?></p>
 			</div>
-		<?php } ?>
+		</div>

+		<div class="feature-section one-col is-wide wp-clearfix">
+			<div class="col">
+				<h3><?php _e( 'Site Health' ); ?></h3>
+				<div class="inline-svg alignright">
+					<img src="https://s.w.org/images/core/5.1/site-health.svg" alt="">
+				</div>
+				<p><?php printf( __( 'With security and speed in mind, this release introduces WordPress&#8217;s first <a href="%s">Site Health</a> features. WordPress will start showing notices to administrators of sites that run long-outdated versions of PHP, which is the programming language that powers WordPress.' ), 'https://make.wordpress.org/core/2019/01/14/php-site-health-mechanisms-in-5-1/' ); ?></p>
+
+				<p><?php _e( 'When installing new plugins, WordPress&#8217;s Site Health features will check whether a plugin requires a version of PHP incompatible with your site. If so, WordPress will prevent you from installing that plugin.' ); ?></p>
+
+				<?php
+				$response = wp_check_php_version();
+				if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable'] && current_user_can( 'update_php' ) ) :
+					?>
+					<p><em><?php _e( 'WordPress has detected your site is running an outdated version of PHP. You will see this notice on your dashboard with instructions for contacting your host.' ); ?></em></p>
+				<?php endif; ?>
+
+				<p><a class="button button-default button-hero" href="<?php echo esc_url( wp_get_update_php_url() ); ?>"><?php _e( 'Learn more about updating PHP' ); ?></a></p>
+			</div>
+		</div>
+
+		<div class="feature-section one-col is-wide wp-clearfix">
+			<div class="col">
+				<h3><?php _e( 'Editor Performance' ); ?></h3>
+				<div class="inline-svg alignright">
+					<img src="https://s.w.org/images/core/5.1/editor-performance.svg" alt="">
+				</div>
+				<p><?php _e( 'Introduced in WordPress 5.0, the new block editor continues to improve. Most significantly, WordPress 5.1 includes solid performance improvements within the editor. The editor should feel a little quicker to start, and typing should feel smoother. Nevertheless, expect more performance improvements in the next releases.' ); ?></p>
+				<?php if ( current_user_can( 'edit_posts' ) ) : ?>
+					<p><a class="button button-default button-hero" href="<?php echo esc_url( admin_url( 'post-new.php' ) ); ?>"><?php _e( 'Build your first post' ); ?></a></p>
+				<?php endif; ?>
+			</div>
+		</div>

 		<hr />

-		<div class="feature-section one-col">
-			<div class="col">
-				<h2><?php _e( 'A Stunning New Default Theme' ); ?></h2>
-			</div>
-		</div>
-
-		<div class="full-width">
-			<figure>
-				<picture>
-					<source type="image/webp" media="(max-width: 782px)" srcset="https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen-mobile@1x.webp 1x, https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen-mobile.webp 2x" />
-					<source media="(max-width: 782px)" srcset="https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen-mobile@1x.jpg 1x, https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen-mobile.jpg 2x" />
-					<source type="image/webp" srcset="https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen@1x.webp 1x, https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen.webp 2x" />
-					<img src="https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen@1x.jpg" srcset="https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen@1x.jpg 1x, https://s.w.org/images/core/5.0/header/twenty-nineteen.jpg 2x" alt="">
-				</picture>
-
-				<figcaption><?php _e( 'The front-end of Twenty Nineteen on the left, and how it looks in the editor on the right.' ); ?></figcaption>
-			</figure>
-		</div>
-
-		<div class="feature-section one-col">
-			<div class="col">
-				<p><?php _e( 'Introducing Twenty Nineteen, a new default theme that shows off the power of the new editor.' ); ?></p>
-			</div>
-		</div>
-
-		<div class="feature-section three-col">
-			<div class="col">
-				<picture>
-					<source type="image/webp" srcset="https://s.w.org/images/core/5.0/twenty%20nineteen/block%20editor@1x.webp 1x, https://s.w.org/images/core/5.0/twenty%20nineteen/block%20editor.webp 2x" />
-					<img src="https://s.w.org/images/core/5.0/twenty%20nineteen/block%20editor@1x.jpg" srcset="https://s.w.org/images/core/5.0/twenty%20nineteen/block%20editor@1x.jpg 1x, https://s.w.org/images/core/5.0/twenty%20nineteen/block%20editor.jpg 2x" alt="">
-				</picture>
-				<h3><?php _e( 'Designed for the block editor' ); ?></h3>
-				<p><?php _e( 'Twenty Nineteen features custom styles for the blocks available by default in 5.0. It makes extensive use of editor styles throughout the theme. That way, what you create in your content editor is what you see on the front of your site.' ); ?></p>
-			</div>
-			<div class="col">
-				<picture>
-					<source type="image/webp" srcset="https://s.w.org/images/core/5.0/twenty%20nineteen/typography@1x.webp 1x, https://s.w.org/images/core/5.0/twenty%20nineteen/typography.webp 2x" />
-					<img src="https://s.w.org/images/core/5.0/twenty%20nineteen/typography@1x.jpg" srcset="https://s.w.org/images/core/5.0/twenty%20nineteen/typography@1x.jpg 1x, https://s.w.org/images/core/5.0/twenty%20nineteen/typography.jpg 2x" alt="">
-				</picture>
-				<h3><?php _e( 'Simple, type-driven layout' ); ?></h3>
-				<p><?php _e( 'Featuring ample whitespace, and modern sans-serif headlines paired with classic serif body text, Twenty Nineteen is built to be beautiful on the go. It uses system fonts to increase loading speed. No more long waits on slow networks!' ); ?></p>
-			</div>
-			<div class="col">
-				<img src="https://s.w.org/images/core/5.0/twenty%20nineteen/twenty-nineteen-versatile.gif" alt="">
-				<h3><?php _e( 'Versatile design for all sites' ); ?></h3>
-				<p><?php _e( 'Twenty Nineteen is designed to work for a wide variety of use cases. Whether you’re running a photo blog, launching a new business, or supporting a non-profit, Twenty Nineteen is flexible enough to fit your needs.' ); ?></p>
-			</div>
-		</div>
-
-		<?php if ( current_user_can( 'customize' ) ) { ?>
-			<div class="feature-section one-col cta">
-				<div class="col">
-					<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo esc_url( admin_url( 'customize.php?theme=twentynineteen' ) ); ?>"><?php _e( 'Give Twenty Nineteen a try' ); ?></a>
-				</div>
-			</div>
-		<?php } ?>
-
-		<hr />
-
-		<div class="under-the-hood feature-section">
-			<div class="col">
-				<h2><?php _e( 'Developer Happiness' ); ?></h2>
-			</div>
-		</div>
+		<h3 class="under-the-hood-header"><?php _e( 'Developer Happiness' ); ?></h3>

 		<div class="under-the-hood feature-section three-col">
 			<div class="col">
-				<picture>
-					<source type="image/webp" srcset="https://s.w.org/images/core/5.0/devs/Protect1x.webp 1x, https://s.w.org/images/core/5.0/devs/Protect.webp 2x" />
-					<img src="https://s.w.org/images/core/5.0/devs/Protect1x.jpg" srcset="https://s.w.org/images/core/5.0/devs/Protect1x.jpg 1x, https://s.w.org/images/core/5.0/devs/Protect.jpg 2x" alt="">
-				</picture>
-				<h3><?php _e( 'Protect' ); ?></h3>
-				<p><?php _e( 'Blocks provide a comfortable way for users to change content directly, while also ensuring the content structure cannot be easily disturbed by accidental code edits. This allows the developer to control the output, building polished and semantic markup that is preserved through edits and not easily broken.' ); ?></p>
+				<h4><?php _e( 'Multisite Metadata' ); ?></h4>
+				<p>
+					<?php _e( '5.1 introduces a new database table to store metadata associated with sites and allows for the storage of arbitrary site data relevant in a multisite / network context.' ); ?>
+					<br>
+					<?php printf( __( '<a href="%s">Read more.</a>' ), 'https://make.wordpress.org/core/2019/01/28/multisite-support-for-site-metadata-in-5-1/' ); ?>
+				</p>
 			</div>
 			<div class="col">
-				<picture>
-					<source type="image/webp" srcset="https://s.w.org/images/core/5.0/devs/Compose1x.webp 1x, https://s.w.org/images/core/5.0/devs/Compose.webp 2x" />
-					<img src="https://s.w.org/images/core/5.0/devs/Compose1x.jpg" srcset="https://s.w.org/images/core/5.0/devs/Compose1x.jpg 1x, https://s.w.org/images/core/5.0/devs/Compose.jpg 2x" alt="">
-				</picture>
-				<h3><?php _e( 'Compose' ); ?></h3>
-				<p><?php _e( 'Take advantage of a wide collection of APIs and interface components to easily create blocks with intuitive controls for your clients. Utilizing these components not only speeds up development work but also provide a more consistent, usable, and accessible interface to all users.' ); ?></p>
+				<h4><?php _e( 'Cron API' ); ?></h4>
+				<p>
+					<?php _e( 'The Cron API has been updated with new functions to assist with returning data and includes new filters for modifying cron storage. Other changes in behavior affect cron spawning on servers running FastCGI and PHP-FPM versions 7.0.16 and above.' ); ?>
+					<br>
+					<?php printf( __( '<a href="%s">Read more.</a>' ), 'https://make.wordpress.org/core/2019/01/09/cron-improvements-with-php-fpm-in-wordpress-5-1/' ); ?>
+				</p>
 			</div>
 			<div class="col">
-				<picture>
-					<source type="image/webp" srcset="https://s.w.org/images/core/5.0/devs/Create1x.webp 1x, https://s.w.org/images/core/5.0/devs/Create.webp 2x" />
-					<img src="https://s.w.org/images/core/5.0/devs/Create1x.jpg" srcset="https://s.w.org/images/core/5.0/devs/Create1x.jpg 1x, https://s.w.org/images/core/5.0/devs/Create.jpg 2x" alt="">
-				</picture>
-				<h3><?php _e( 'Create' ); ?></h3>
-				<p><?php _e( 'The new block paradigm opens up a path of exploration and imagination when it comes to solving user needs. With the unified block insertion flow, it&#8217;s easier for your clients and customers to find and use blocks for all types of content. Developers can focus on executing their vision and providing rich editing experiences, rather than fussing with difficult APIs.' ); ?></p>
+				<h4><?php _e( 'New JS Build Processes' ); ?></h4>
+				<p>
+					<?php _e( 'WordPress 5.1 features a new JavaScript build option, following the large reorganization of code started in the 5.0 release.' ); ?>
+					<br>
+					<?php printf( __( '<a href="%s">Read more.</a>' ), 'https://make.wordpress.org/core/2018/05/16/preparing-wordpress-for-a-javascript-future-part-1-build-step-and-folder-reorganization/' ); ?>
+				</p>
 			</div>
 		</div>

-		<div class="under-the-hood feature-section one-col cta">
+		<div class="under-the-hood feature-section two-col">
+			<div class="col is-span-two">
+				<h4><?php _e( 'Other Developer Goodness' ); ?></h4>
+				<p>
+					<?php _e( 'Miscellaneous improvements include updates to values for the <code>WP_DEBUG_LOG</code> constant, new test config file constant in the test suite, new plugin action hooks, short-circuit filters for <code>wp_unique_post_slug()</code> and <code>WP_User_Query</code> and <code>count_users()</code>, a new <code>human_readable_duration</code> function, improved taxonomy metabox sanitization, limited <code>LIKE</code> support for meta keys when using <code>WP_Meta_Query</code>, a new “doing it wrong” notice when registering REST API endpoints, and more!' ); ?>
+					<br>
+					<?php printf( __( '<a href="%s">Read more.</a>' ), 'https://make.wordpress.org/core/2019/01/23/miscellaneous-developer-focused-changes-in-5-1/' ); ?>
+				</p>
+				<p>
+					<a class="button button-default button-hero" href="<?php echo esc_url( 'https://developer.wordpress.org/' ); ?>"><?php _e( 'Learn how to get started' ); ?></a>
+				</p>
+			</div>
 			<div class="col">
-				<a class="button button-primary button-hero" href="<?php echo esc_url( 'https://wordpress.org/gutenberg/handbook/' ); ?>"><?php _e( 'Learn how to get started' ); ?></a>
+				<div class="inline-svg">
+					<img src="https://s.w.org/images/core/5.1/under-the-hood.svg" alt="">
+				</div>
 			</div>
 		</div>

 		<hr />

 		<?php if ( ! file_exists( WP_PLUGIN_DIR . '/classic-editor/classic-editor.php' ) ) : ?>
+			<h2 class="feature-section-header"><?php _e( 'Keep it Classic' ); ?></h2>
+
 			<div class="feature-section one-col" id="classic-editor">
-				<div class="col">
-					<h2><?php _e( 'Keep it Classic' ); ?></h2>
-				</div>
-			</div>
-
-			<div class="full-width">
-				<picture>
-					<source type="image/webp" media="(max-width: 782px)" srcset="https://s.w.org/images/core/5.0/classic/Classic%20Mobile1x.webp 1x, https://s.w.org/images/core/5.0/classic/Classic%20Mobile.webp 2x" />
-					<source media="(max-width: 782px)" srcset="https://s.w.org/images/core/5.0/classic/Classic%20Mobile1x.jpg 1x, https://s.w.org/images/core/5.0/classic/Classic%20Mobile.jpg 2x" />
-					<source type="image/webp" srcset="https://s.w.org/images/core/5.0/classic/Classic@1x.webp 1x, https://s.w.org/images/core/5.0/classic/Classic.webp 2x" />
-					<img src="https://s.w.org/images/core/5.0/classic/Classic@1x.jpg" srcset="https://s.w.org/images/core/5.0/classic/Classic@1x.jpg 1x, https://s.w.org/images/core/5.0/header/Classic.jpg 2x" alt="">
-				</picture>
-			</div>
-
-			<div class="feature-section one-col">
 				<div class="col">
 					<p><?php _e( 'Prefer to stick with the familiar Classic Editor? No problem! Support for the Classic Editor plugin will remain in WordPress through 2021.' ); ?></p>
 					<p><?php _e( 'The Classic Editor plugin restores the previous WordPress editor and the Edit Post screen. It lets you keep using plugins that extend it, add old-style meta boxes, or otherwise depend on the previous editor. To install, visit your plugins page and click the &#8220;Install Now&#8221; button next to &#8220;Classic Editor&#8221;. After the plugin finishes installing, click &#8220;Activate&#8221;. That’s it!' ); ?></p>
@@ -694,100 +363,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
 		</div>
 	</div>
-
-	<script>
-		(function( $ ) {
-			$( function() {
-				var $window = $( window );
-				var $adminbar = $( '#wpadminbar' );
-				var $sections = $( '.floating-header-section' );
-				var offset = 0;
-
-				// Account for Admin bar.
-				if ( $adminbar.length ) {
-					offset += $adminbar.height();
-				}
-
-				function setup() {
-					$sections.each( function( i, section ) {
-						var $section = $( section );
-						// If the title is long, switch the layout
-						var $title = $section.find( 'h2' );
-						if ( $title.innerWidth() > 300 ) {
-							$section.addClass( 'has-long-title' );
-						}
-					} );
-				}
-
-				var adjustScrollPosition = _.throttle( function adjustScrollPosition() {
-					$sections.each( function( i, section ) {
-						var $section = $( section );
-						var $header = $section.find( 'h2' );
-						var width = $header.innerWidth();
-						var height = $header.innerHeight();
-
-						if ( $section.hasClass( 'has-long-title' ) ) {
-							return;
-						}
-
-						var sectionStart = $section.offset().top - offset;
-						var sectionEnd = sectionStart + $section.innerHeight();
-						var scrollPos = $window.scrollTop();
-
-						// If we're scrolled into a section, stick the header
-						if ( scrollPos >= sectionStart && scrollPos < sectionEnd - height ) {
-							$header.css( {
-								position: 'fixed',
-								top: offset + 'px',
-								bottom: 'auto',
-								width: width + 'px'
-							} );
-						// If we're at the end of the section, stick the header to the bottom
-						} else if ( scrollPos >= sectionEnd - height && scrollPos < sectionEnd ) {
-							$header.css( {
-								position: 'absolute',
-								top: 'auto',
-								bottom: 0,
-								width: width + 'px'
-							} );
-						// Unstick the header
-						} else {
-							$header.css( {
-								position: 'static',
-								top: 'auto',
-								bottom: 'auto',
-								width: 'auto'
-							} );
-						}
-					} );
-				}, 100 );
-
-				function enableFixedHeaders() {
-					if ( $window.width() > 782 ) {
-						setup();
-						adjustScrollPosition();
-						$window.on( 'scroll', adjustScrollPosition );
-					} else {
-						$window.off( 'scroll', adjustScrollPosition );
-						$sections.find( '.section-header' )
-							.css( {
-								width: 'auto'
-							} );
-						$sections.find( 'h2' )
-							.css( {
-								position: 'static',
-								top: 'auto',
-								bottom: 'auto',
-								width: 'auto'
-							} );
-					}
-				}
-				$( window ).resize( enableFixedHeaders );
-				enableFixedHeaders();
-			} );
-		})( jQuery );
-	</script>
-
 <?php

 include( ABSPATH . 'wp-admin/admin-footer.php' );
@@ -810,16 +385,22 @@ __( '<strong>Version %s</strong> addressed one security issue.' );
 __( '<strong>Version %s</strong> addressed some security issues.' );

 /* translators: 1: WordPress version number, 2: plural number of bugs. */
-_n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+_n_noop(
+	'<strong>Version %1$s</strong> addressed %2$s bug.',
+	'<strong>Version %1$s</strong> addressed %2$s bugs.'
+);

 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+_n_noop(
+	'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+	'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.'
+);

 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+_n_noop(
+	'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+	'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.'
+);

 /* translators: %s: Codex URL */
 __( 'For more information, see <a href="%s">the release notes</a>.' );
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -25,8 +25,9 @@ require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 send_origin_headers();

 // Require an action parameter
-if ( empty( $_REQUEST['action'] ) )
+if ( empty( $_REQUEST['action'] ) ) {
 	wp_die( '0', 400 );
+}

 /** Load WordPress Administration APIs */
 require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -44,74 +45,141 @@ nocache_headers();
 do_action( 'admin_init' );

 $core_actions_get = array(
-	'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
-	'autocomplete-user', 'dashboard-widgets', 'logged-in',
+	'fetch-list',
+	'ajax-tag-search',
+	'wp-compression-test',
+	'imgedit-preview',
+	'oembed-cache',
+	'autocomplete-user',
+	'dashboard-widgets',
+	'logged-in',
 );

 $core_actions_post = array(
-	'oembed-cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
-	'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
-	'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
-	'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'closed-postboxes',
-	'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
-	'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
-	'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
-	'save-widget', 'delete-inactive-widgets', 'set-post-thumbnail', 'date_format', 'time_format',
-	'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
-	'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
-	'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
-	'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
-	'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'crop-image',
-	'generate-password', 'save-wporg-username', 'delete-plugin', 'search-plugins',
-	'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme', 'install-theme',
-	'get-post-thumbnail-html', 'get-community-events', 'edit-theme-plugin-file',
+	'oembed-cache',
+	'image-editor',
+	'delete-comment',
+	'delete-tag',
+	'delete-link',
+	'delete-meta',
+	'delete-post',
+	'trash-post',
+	'untrash-post',
+	'delete-page',
+	'dim-comment',
+	'add-link-category',
+	'add-tag',
+	'get-tagcloud',
+	'get-comments',
+	'replyto-comment',
+	'edit-comment',
+	'add-menu-item',
+	'add-meta',
+	'add-user',
+	'closed-postboxes',
+	'hidden-columns',
+	'update-welcome-panel',
+	'menu-get-metabox',
+	'wp-link-ajax',
+	'menu-locations-save',
+	'menu-quick-search',
+	'meta-box-order',
+	'get-permalink',
+	'sample-permalink',
+	'inline-save',
+	'inline-save-tax',
+	'find_posts',
+	'widgets-order',
+	'save-widget',
+	'delete-inactive-widgets',
+	'set-post-thumbnail',
+	'date_format',
+	'time_format',
+	'wp-remove-post-lock',
+	'dismiss-wp-pointer',
+	'upload-attachment',
+	'get-attachment',
+	'query-attachments',
+	'save-attachment',
+	'save-attachment-compat',
+	'send-link-to-editor',
+	'send-attachment-to-editor',
+	'save-attachment-order',
+	'heartbeat',
+	'get-revision-diffs',
+	'save-user-color-scheme',
+	'update-widget',
+	'query-themes',
+	'parse-embed',
+	'set-attachment-thumbnail',
+	'parse-media-shortcode',
+	'destroy-sessions',
+	'install-plugin',
+	'update-plugin',
+	'crop-image',
+	'generate-password',
+	'save-wporg-username',
+	'delete-plugin',
+	'search-plugins',
+	'search-install-plugins',
+	'activate-plugin',
+	'update-theme',
+	'delete-theme',
+	'install-theme',
+	'get-post-thumbnail-html',
+	'get-community-events',
+	'edit-theme-plugin-file',
 	'wp-privacy-export-personal-data',
 	'wp-privacy-erase-personal-data',
 );

 // Deprecated
 $core_actions_post_deprecated = array( 'wp-fullscreen-save-post', 'press-this-save-post', 'press-this-add-category' );
-$core_actions_post = array_merge( $core_actions_post, $core_actions_post_deprecated );
+$core_actions_post            = array_merge( $core_actions_post, $core_actions_post_deprecated );

 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
+if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) {
 	add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
+}

-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
+if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) ) {
 	add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
+}

 add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );

+$action = ( isset( $_REQUEST['action'] ) ) ? $_REQUEST['action'] : '';
+
 if ( is_user_logged_in() ) {
 	// If no action is registered, return a Bad Request response.
-	if ( ! has_action( 'wp_ajax_' . $_REQUEST['action'] ) ) {
+	if ( ! has_action( "wp_ajax_{$action}" ) ) {
 		wp_die( '0', 400 );
 	}

 	/**
 	 * Fires authenticated Ajax actions for logged-in users.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
-	 * refers to the name of the Ajax action callback being fired.
+	 * The dynamic portion of the hook name, `$action`, refers
+	 * to the name of the Ajax action callback being fired.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'wp_ajax_' . $_REQUEST['action'] );
+	do_action( "wp_ajax_{$action}" );
 } else {
 	// If no action is registered, return a Bad Request response.
-	if ( ! has_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] ) ) {
+	if ( ! has_action( "wp_ajax_nopriv_{$action}" ) ) {
 		wp_die( '0', 400 );
 	}

 	/**
 	 * Fires non-authenticated Ajax actions for logged-out users.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
-	 * refers to the name of the Ajax action callback being fired.
+	 * The dynamic portion of the hook name, `$action`, refers
+	 * to the name of the Ajax action callback being fired.
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
+	do_action( "wp_ajax_nopriv_{$action}" );
 }
 // Default status
 wp_die( '0' );
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -7,8 +7,9 @@
 */

 // don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
+if ( ! defined( 'ABSPATH' ) ) {
+	die( '-1' );
+}

 /**
 * @global string $hook_suffix
@@ -99,9 +100,10 @@ do_action( 'admin_print_footer_scripts' );
 do_action( "admin_footer-{$hook_suffix}" );

 // get_site_option() won't exist when auto upgrading from <= 2.7
-if ( function_exists('get_site_option') ) {
-	if ( false === get_site_option('can_compress_scripts') )
+if ( function_exists( 'get_site_option' ) ) {
+	if ( false === get_site_option( 'can_compress_scripts' ) ) {
 		compression_test();
+	}
 }

 ?>
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -9,7 +9,7 @@
 * @subpackage Administration
 */

-_deprecated_file( basename(__FILE__), '2.5.0', 'wp-admin/includes/admin.php' );
+_deprecated_file( basename( __FILE__ ), '2.5.0', 'wp-admin/includes/admin.php' );

 /** WordPress Administration API: Includes all Administration functions. */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -6,9 +6,10 @@
 * @subpackage Administration
 */

-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if ( ! defined( 'WP_ADMIN' ) )
+@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+if ( ! defined( 'WP_ADMIN' ) ) {
 	require_once( dirname( __FILE__ ) . '/admin.php' );
+}

 /**
 * In case admin-header.php is included in a function.
@@ -26,25 +27,26 @@ global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
 	$update_title, $total_update_count, $parent_file;

 // Catch plugins that include admin-header.php before admin.php completes.
-if ( empty( $current_screen ) )
+if ( empty( $current_screen ) ) {
 	set_current_screen();
+}

 get_admin_page_title();
 $title = esc_html( strip_tags( $title ) );

 if ( is_network_admin() ) {
-	/* translators: Network admin screen title. 1: Network name */
+	/* translators: Network admin screen title. %s: Network name */
 	$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
 } elseif ( is_user_admin() ) {
-	/* translators: User dashboard screen title. 1: Network name */
+	/* translators: User dashboard screen title. %s: Network name */
 	$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
 } else {
 	$admin_title = get_bloginfo( 'name' );
 }

 if ( $admin_title == $title ) {
-	/* translators: Admin screen title. 1: Admin screen name */
-	$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
+	/* translators: Admin screen title. %s: Admin screen name */
+	$admin_title = sprintf( __( '%s &#8212; WordPress' ), $title );
 } else {
 	/* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */
 	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
@@ -69,10 +71,10 @@ _wp_admin_html_begin();

 wp_enqueue_style( 'colors' );
 wp_enqueue_style( 'ie' );
-wp_enqueue_script('utils');
+wp_enqueue_script( 'utils' );
 wp_enqueue_script( 'svg-painter' );

-$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
+$admin_body_class = preg_replace( '/[^a-z0-9_-]+/i', '-', $hook_suffix );
 ?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!=='undefined')jQuery(document).ready(func);else if(typeof wpOnload!=='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
@@ -141,37 +143,46 @@ do_action( "admin_head-{$hook_suffix}" );
 */
 do_action( 'admin_head' );

-if ( get_user_setting('mfold') == 'f' )
+if ( get_user_setting( 'mfold' ) == 'f' ) {
 	$admin_body_class .= ' folded';
+}

-if ( !get_user_setting('unfold') )
+if ( ! get_user_setting( 'unfold' ) ) {
 	$admin_body_class .= ' auto-fold';
+}

-if ( is_admin_bar_showing() )
+if ( is_admin_bar_showing() ) {
 	$admin_body_class .= ' admin-bar';
+}

-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}

-if ( $current_screen->post_type )
+if ( $current_screen->post_type ) {
 	$admin_body_class .= ' post-type-' . $current_screen->post_type;
+}

-if ( $current_screen->taxonomy )
+if ( $current_screen->taxonomy ) {
 	$admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
+}

 $admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
 $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
 $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );

-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	$admin_body_class .= ' mobile';
+}

-if ( is_multisite() )
+if ( is_multisite() ) {
 	$admin_body_class .= ' multisite';
+}

-if ( is_network_admin() )
+if ( is_network_admin() ) {
 	$admin_body_class .= ' network-admin';
+}

 $admin_body_class .= ' no-customize-support no-svg';

@@ -202,8 +213,9 @@ if ( $current_screen->is_block_editor() ) {
 * @param string $classes Space-separated list of CSS classes.
 */
 $admin_body_classes = apply_filters( 'admin_body_class', '' );
+$admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
 ?>
-<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes; ?>">
 <script type="text/javascript">
 	document.body.className = document.body.className.replace('no-js','js');
 </script>
@@ -216,7 +228,7 @@ if ( current_user_can( 'customize' ) ) {
 ?>

 <div id="wpwrap">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+<?php require( ABSPATH . 'wp-admin/menu-header.php' ); ?>
 <div id="wpcontent">

 <?php
@@ -230,13 +242,13 @@ do_action( 'in_admin_header' );

 <div id="wpbody" role="main">
 <?php
-unset($title_class, $blog_name, $total_update_count, $update_title);
+unset( $blog_name, $total_update_count, $update_title );

 $current_screen->set_parentage( $parent_file );

 ?>

-<div id="wpbody-content" aria-label="<?php esc_attr_e('Main content'); ?>" tabindex="0">
+<div id="wpbody-content">
 <?php

 $current_screen->render_screen_meta();
@@ -271,5 +283,6 @@ if ( is_network_admin() ) {
 */
 do_action( 'all_admin_notices' );

-if ( $parent_file == 'options-general.php' )
-	require(ABSPATH . 'wp-admin/options-head.php');
+if ( $parent_file == 'options-general.php' ) {
+	require( ABSPATH . 'wp-admin/options-head.php' );
+}
--- a/wp-admin/admin-post.php
+++ b/wp-admin/admin-post.php
@@ -13,15 +13,16 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 	define( 'WP_ADMIN', true );
 }

-if ( defined('ABSPATH') )
-	require_once(ABSPATH . 'wp-load.php');
-else
+if ( defined( 'ABSPATH' ) ) {
+	require_once( ABSPATH . 'wp-load.php' );
+} else {
 	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+}

 /** Allow for cross-domain requests (from the front end). */
 send_origin_headers();

-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );

 nocache_headers();

@@ -30,10 +31,10 @@ do_action( 'admin_init' );

 $action = empty( $_REQUEST['action'] ) ? '' : $_REQUEST['action'];

-if ( ! wp_validate_auth_cookie() ) {
+if ( ! is_user_logged_in() ) {
 	if ( empty( $action ) ) {
 		/**
-		 * Fires on a non-authenticated admin post request where no action was supplied.
+		 * Fires on a non-authenticated admin post request where no action is supplied.
 		 *
 		 * @since 2.6.0
 		 */
@@ -52,7 +53,7 @@ if ( ! wp_validate_auth_cookie() ) {
 } else {
 	if ( empty( $action ) ) {
 		/**
-		 * Fires on an authenticated admin post request where no action was supplied.
+		 * Fires on an authenticated admin post request where no action is supplied.
 		 *
 		 * @since 2.6.0
 		 */
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -15,26 +15,29 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 	define( 'WP_ADMIN', true );
 }

-if ( ! defined('WP_NETWORK_ADMIN') )
-	define('WP_NETWORK_ADMIN', false);
-
-if ( ! defined('WP_USER_ADMIN') )
-	define('WP_USER_ADMIN', false);
-
-if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
-	define('WP_BLOG_ADMIN', true);
+if ( ! defined( 'WP_NETWORK_ADMIN' ) ) {
+	define( 'WP_NETWORK_ADMIN', false );
 }

-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
-	define('WP_LOAD_IMPORTERS', true);
+if ( ! defined( 'WP_USER_ADMIN' ) ) {
+	define( 'WP_USER_ADMIN', false );
+}

-require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
+if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
+	define( 'WP_BLOG_ADMIN', true );
+}
+
+if ( isset( $_GET['import'] ) && ! defined( 'WP_LOAD_IMPORTERS' ) ) {
+	define( 'WP_LOAD_IMPORTERS', true );
+}
+
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );

 nocache_headers();

-if ( get_option('db_upgraded') ) {
+if ( get_option( 'db_upgraded' ) ) {
 	flush_rewrite_rules();
-	update_option( 'db_upgraded',  false );
+	update_option( 'db_upgraded', false );

 	/**
 	 * Fires on the next page load after a successful DB upgrade.
@@ -42,25 +45,25 @@ if ( get_option('db_upgraded') ) {
 	 * @since 2.8.0
 	 */
 	do_action( 'after_db_upgrade' );
-} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
-	if ( !is_multisite() ) {
+} elseif ( get_option( 'db_version' ) != $wp_db_version && empty( $_POST ) ) {
+	if ( ! is_multisite() ) {
 		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
 		exit;

-	/**
-	 * Filters whether to attempt to perform the multisite DB upgrade routine.
-	 *
-	 * In single site, the user would be redirected to wp-admin/upgrade.php.
-	 * In multisite, the DB upgrade routine is automatically fired, but only
-	 * when this filter returns true.
-	 *
-	 * If the network is 50 sites or less, it will run every time. Otherwise,
-	 * it will throttle itself to reduce load.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
-	 */
+		/**
+		 * Filters whether to attempt to perform the multisite DB upgrade routine.
+		 *
+		 * In single site, the user would be redirected to wp-admin/upgrade.php.
+		 * In multisite, the DB upgrade routine is automatically fired, but only
+		 * when this filter returns true.
+		 *
+		 * If the network is 50 sites or less, it will run every time. Otherwise,
+		 * it will throttle itself to reduce load.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
+		 */
 	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
 		$c = get_blog_count();

@@ -68,24 +71,31 @@ if ( get_option('db_upgraded') ) {
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
+		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
 			require_once( ABSPATH . WPINC . '/http.php' );
-			$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
+			$response = wp_remote_get(
+				admin_url( 'upgrade.php?step=1' ),
+				array(
+					'timeout'     => 120,
+					'httpversion' => '1.1',
+				)
+			);
 			/** This action is documented in wp-admin/network/upgrade.php */
 			do_action( 'after_mu_upgrade', $response );
-			unset($response);
+			unset( $response );
 		}
-		unset($c);
+		unset( $c );
 	}
 }

-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );

 auth_redirect();

 // Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
-	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
+	wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );
+}

 // Schedule Transient cleanup.
 if ( ! wp_next_scheduled( 'delete_expired_transients' ) && ! wp_installing() ) {
@@ -117,27 +127,30 @@ $page_hook = null;

 $editing = false;

-if ( isset($_GET['page']) ) {
+if ( isset( $_GET['page'] ) ) {
 	$plugin_page = wp_unslash( $_GET['page'] );
-	$plugin_page = plugin_basename($plugin_page);
+	$plugin_page = plugin_basename( $plugin_page );
 }

-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
 	$typenow = $_REQUEST['post_type'];
-else
+} else {
 	$typenow = '';
+}

-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) ) {
 	$taxnow = $_REQUEST['taxonomy'];
-else
+} else {
 	$taxnow = '';
+}

-if ( WP_NETWORK_ADMIN )
-	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
-	require(ABSPATH . 'wp-admin/user/menu.php');
-else
-	require(ABSPATH . 'wp-admin/menu.php');
+if ( WP_NETWORK_ADMIN ) {
+	require( ABSPATH . 'wp-admin/network/menu.php' );
+} elseif ( WP_USER_ADMIN ) {
+	require( ABSPATH . 'wp-admin/user/menu.php' );
+} else {
+	require( ABSPATH . 'wp-admin/menu.php' );
+}

 if ( current_user_can( 'manage_options' ) ) {
 	wp_raise_memory_limit( 'admin' );
@@ -155,26 +168,30 @@ if ( current_user_can( 'manage_options' ) ) {
 */
 do_action( 'admin_init' );

-if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
+if ( isset( $plugin_page ) ) {
+	if ( ! empty( $typenow ) ) {
 		$the_parent = $pagenow . '?post_type=' . $typenow;
-	else
+	} else {
 		$the_parent = $pagenow;
-	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
-		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
+	}
+
+	$page_hook = get_plugin_page_hook( $plugin_page, $the_parent );
+	if ( ! $page_hook ) {
+		$page_hook = get_plugin_page_hook( $plugin_page, $plugin_page );

 		// Back-compat for plugins using add_management_page().
-		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
-			else
+			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
+				$query_string = $_SERVER['QUERY_STRING'];
+			} else {
 				$query_string = 'page=' . $plugin_page;
-			wp_redirect( admin_url('tools.php?' . $query_string) );
+			}
+			wp_redirect( admin_url( 'tools.php?' . $query_string ) );
 			exit;
 		}
 	}
-	unset($the_parent);
+	unset( $the_parent );
 }

 $hook_suffix = '';
@@ -189,7 +206,7 @@ if ( isset( $page_hook ) ) {
 set_current_screen();

 // Handle plugin admin pages.
-if ( isset($plugin_page) ) {
+if ( isset( $plugin_page ) ) {
 	if ( $page_hook ) {
 		/**
 		 * Fires before a particular screen is loaded.
@@ -212,13 +229,25 @@ if ( isset($plugin_page) ) {
 		 * @since 2.1.0
 		 */
 		do_action( "load-{$page_hook}" );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset( $_GET['noheader'] ) ) {
+			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		}

 		/**
 		 * Used to call the registered callback for a plugin screen.
 		 *
-		 * @ignore
+		 * This hook uses a dynamic hook name, `$page_hook`, which refers to a mixture of plugin
+		 * page information including:
+		 * 1. The page type. If the plugin page is registered as a submenu page, such as for
+		 *    Settings, the page type would be 'settings'. Otherwise the type is 'toplevel'.
+		 * 2. A separator of '_page_'.
+		 * 3. The plugin basename minus the file extension.
+		 *
+		 * Together, the three parts form the `$page_hook`. Citing the example above,
+		 * the hook name used would be 'settings_page_pluginbasename'.
+		 *
+		 * @see get_plugin_page_hook()
+		 *
 		 * @since 1.5.0
 		 */
 		do_action( $page_hook );
@@ -227,8 +256,9 @@ if ( isset($plugin_page) ) {
 			wp_die( __( 'Invalid plugin page.' ) );
 		}

-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
-			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		if ( ! ( file_exists( WP_PLUGIN_DIR . "/$plugin_page" ) && is_file( WP_PLUGIN_DIR . "/$plugin_page" ) ) && ! ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) && is_file( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) ) {
+			wp_die( sprintf( __( 'Cannot load %s.' ), htmlentities( $plugin_page ) ) );
+		}

 		/**
 		 * Fires before a particular screen is loaded.
@@ -244,16 +274,18 @@ if ( isset($plugin_page) ) {
 		 */
 		do_action( "load-{$plugin_page}" );

-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset( $_GET['noheader'] ) ) {
+			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		}

-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
-		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+		if ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) {
+			include( WPMU_PLUGIN_DIR . "/$plugin_page" );
+		} else {
+			include( WP_PLUGIN_DIR . "/$plugin_page" );
+		}
 	}

-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );

 	exit();
 } elseif ( isset( $_GET['import'] ) ) {
@@ -264,12 +296,12 @@ if ( isset($plugin_page) ) {
 		wp_die( __( 'Sorry, you are not allowed to import content.' ) );
 	}

-	if ( validate_file($importer) ) {
+	if ( validate_file( $importer ) ) {
 		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 		exit;
 	}

-	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
+	if ( ! isset( $wp_importers[ $importer ] ) || ! is_callable( $wp_importers[ $importer ][2] ) ) {
 		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 		exit;
 	}
@@ -283,16 +315,17 @@ if ( isset($plugin_page) ) {
 	 */
 	do_action( "load-importer-{$importer}" );

-	$parent_file = 'tools.php';
+	$parent_file  = 'tools.php';
 	$submenu_file = 'import.php';
-	$title = __('Import');
+	$title        = __( 'Import' );

-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if ( ! isset( $_GET['noheader'] ) ) {
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	}

-	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );

-	define('WP_IMPORTING', true);
+	define( 'WP_IMPORTING', true );

 	/**
 	 * Whether to filter imported data through kses on import.
@@ -308,12 +341,12 @@ if ( isset($plugin_page) ) {
 		kses_init_filters();  // Always filter imported data with kses on multisite.
 	}

-	call_user_func($wp_importers[$importer][2]);
+	call_user_func( $wp_importers[ $importer ][2] );

-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );

 	// Make sure rules are flushed
-	flush_rewrite_rules(false);
+	flush_rewrite_rules( false );

 	exit();
 } else {
@@ -336,28 +369,32 @@ if ( isset($plugin_page) ) {
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
 	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
+		if ( $pagenow == 'post-new.php' ) {
 			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
+		} elseif ( $pagenow == 'post.php' ) {
 			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
+		}
+	} elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' ) {
 			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
+		} elseif ( $taxnow == 'link_category' ) {
 			do_action( 'load-edit-link-categories.php' );
-	} elseif( 'term.php' === $pagenow ) {
+		}
+	} elseif ( 'term.php' === $pagenow ) {
 		do_action( 'load-edit-tags.php' );
 	}
 }

 if ( ! empty( $_REQUEST['action'] ) ) {
+	$action = $_REQUEST['action'];
+
 	/**
 	 * Fires when an 'action' request variable is sent.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
-	 * refers to the action derived from the `GET` or `POST` request.
+	 * The dynamic portion of the hook name, `$action`, refers to
+	 * the action derived from the `GET` or `POST` request.
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'admin_action_' . $_REQUEST['action'] );
+	do_action( "admin_action_{$action}" );
 }
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -39,51 +39,61 @@ if ( ! current_user_can( 'upload_files' ) ) {
 }

 // just fetch the detail form for that attachment
-if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
+if ( isset( $_REQUEST['attachment_id'] ) && ( $id = intval( $_REQUEST['attachment_id'] ) ) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
+	if ( 'attachment' != $post->post_type ) {
 		wp_die( __( 'Invalid post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
+	}
+	if ( ! current_user_can( 'edit_post', $id ) ) {
 		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	}

 	switch ( $_REQUEST['fetch'] ) {
-		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
+		case 3:
+			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) {
 				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			}
 			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';

 			// Title shouldn't ever be empty, but use filename just in case.
-			$file = get_attached_file( $post->ID );
+			$file  = get_attached_file( $post->ID );
 			$title = $post->post_title ? $post->post_title : wp_basename( $file );
 			echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
 			break;
-		case 2 :
-			add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id, array( 'send' => false, 'delete' => true ));
+		case 2:
+			add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 );
+			echo get_media_item(
+				$id,
+				array(
+					'send'   => false,
+					'delete' => true,
+				)
+			);
 			break;
 		default:
-			add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id);
+			add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 );
+			echo get_media_item( $id );
 			break;
 	}
 	exit;
 }

-check_admin_referer('media-form');
+check_admin_referer( 'media-form' );

 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
 		$post_id = 0;
+	}
 }

 $id = media_handle_upload( 'async-upload', $post_id );
-if ( is_wp_error($id) ) {
+if ( is_wp_error( $id ) ) {
 	echo '<div class="error-div error">
-	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
-	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
-	esc_html($id->get_error_message()) . '</div>';
+	<button type="button" class="dismiss button-link" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __( 'Dismiss' ) . '</button>
+	<strong>' . sprintf( __( '&#8220;%s&#8221; has failed to upload.' ), esc_html( $_FILES['async-upload']['name'] ) ) . '</strong><br />' .
+	esc_html( $id->get_error_message() ) . '</div>';
 	exit;
 }

@@ -91,7 +101,7 @@ if ( $_REQUEST['short'] ) {
 	// Short form response - attachment ID only.
 	echo $id;
 } else {
-	// Long form response - big chunk o html.
+	// Long form response - big chunk of html.
 	$type = $_REQUEST['type'];

 	/**
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -9,169 +9,176 @@
 /** Load WordPress Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

-$parent_file = 'edit-comments.php';
+$parent_file  = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';

 /**
 * @global string $action
 */
 global $action;
-wp_reset_vars( array('action') );
+wp_reset_vars( array( 'action' ) );

-if ( isset( $_POST['deletecomment'] ) )
+if ( isset( $_POST['deletecomment'] ) ) {
 	$action = 'deletecomment';
+}

-if ( 'cdc' == $action )
+if ( 'cdc' == $action ) {
 	$action = 'delete';
-elseif ( 'mac' == $action )
+} elseif ( 'mac' == $action ) {
 	$action = 'approve';
+}

 if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
+	if ( 'spam' == $_GET['dt'] ) {
 		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
+	} elseif ( 'trash' == $_GET['dt'] ) {
 		$action = 'trash';
+	}
 }

-switch( $action ) {
-
-case 'editcomment' :
-	$title = __('Edit Comment');
-
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __('Overview'),
-		'content' =>
-			'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-			'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
-	) );
-
-	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
-	);
-
-	wp_enqueue_script('comment');
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$comment_id = absint( $_GET['c'] );
-
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
-
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
-
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
-
-	$comment = get_comment_to_edit( $comment_id );
-
-	include( ABSPATH . 'wp-admin/edit-form-comment.php' );
-
-	break;
-
-case 'delete'  :
-case 'approve' :
-case 'trash'   :
-case 'spam'    :
-
-	$title = __('Moderate Comment');
-
-	$comment_id = absint( $_GET['c'] );
-
-	if ( ! $comment = get_comment( $comment_id ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=1') );
-		die();
-	}
-
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
-		die();
-	}
-
-	// No need to re-approve/re-trash/re-spam a comment.
-	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
-		die();
- 	}
-
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$formaction    = $action . 'comment';
-	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
-	$nonce_action .= $comment_id;
-
-?>
-<div class="wrap">
-
-<h1><?php echo esc_html( $title ); ?></h1>
-
-<?php
 switch ( $action ) {
-	case 'spam' :
-		$caution_msg = __('You are about to mark the following comment as spam:');
-		$button      = _x( 'Mark as Spam', 'comment' );
-		break;
-	case 'trash' :
-		$caution_msg = __('You are about to move the following comment to the Trash:');
-		$button      = __('Move to Trash');
-		break;
-	case 'delete' :
-		$caution_msg = __('You are about to delete the following comment:');
-		$button      = __('Permanently Delete Comment');
-		break;
-	default :
-		$caution_msg = __('You are about to approve the following comment:');
-		$button      = __('Approve Comment');
-		break;
-}

-if ( $comment->comment_approved != '0' ) { // if not unapproved
-	$message = '';
-	switch ( $comment->comment_approved ) {
-		case '1' :
-			$message = __('This comment is currently approved.');
-			break;
-		case 'spam' :
-			$message  = __('This comment is currently marked as spam.');
-			break;
-		case 'trash' :
-			$message  = __('This comment is currently in the Trash.');
-			break;
-	}
-	if ( $message ) {
-		echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
-	}
-}
-?>
+	case 'editcomment':
+		$title = __( 'Edit Comment' );
+
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'overview',
+				'title'   => __( 'Overview' ),
+				'content' =>
+					  '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
+					  '<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>',
+			)
+		);
+
+		get_current_screen()->set_help_sidebar(
+			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+			'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+		);
+
+		wp_enqueue_script( 'comment' );
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$comment_id = absint( $_GET['c'] );
+
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'javascript:history.go(-1)' ) );
+		}
+
+		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
+			comment_footer_die( __( 'Sorry, you are not allowed to edit this comment.' ) );
+		}
+
+		if ( 'trash' == $comment->comment_approved ) {
+			comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
+		}
+
+		$comment = get_comment_to_edit( $comment_id );
+
+		include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+
+		break;
+
+	case 'delete':
+	case 'approve':
+	case 'trash':
+	case 'spam':
+		$title = __( 'Moderate Comment' );
+
+		$comment_id = absint( $_GET['c'] );
+
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?error=1' ) );
+			die();
+		}
+
+		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?error=2' ) );
+			die();
+		}
+
+		// No need to re-approve/re-trash/re-spam a comment.
+		if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+			die();
+		}
+
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$formaction    = $action . 'comment';
+		$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
+		$nonce_action .= $comment_id;
+
+		?>
+	<div class="wrap">
+
+	<h1><?php echo esc_html( $title ); ?></h1>
+
+		<?php
+		switch ( $action ) {
+			case 'spam':
+				$caution_msg = __( 'You are about to mark the following comment as spam:' );
+				$button      = _x( 'Mark as Spam', 'comment' );
+				break;
+			case 'trash':
+				$caution_msg = __( 'You are about to move the following comment to the Trash:' );
+				$button      = __( 'Move to Trash' );
+				break;
+			case 'delete':
+				$caution_msg = __( 'You are about to delete the following comment:' );
+				$button      = __( 'Permanently Delete Comment' );
+				break;
+			default:
+				$caution_msg = __( 'You are about to approve the following comment:' );
+				$button      = __( 'Approve Comment' );
+				break;
+		}
+
+		if ( $comment->comment_approved != '0' ) { // if not unapproved
+			$message = '';
+			switch ( $comment->comment_approved ) {
+				case '1':
+					$message = __( 'This comment is currently approved.' );
+					break;
+				case 'spam':
+					$message = __( 'This comment is currently marked as spam.' );
+					break;
+				case 'trash':
+					$message = __( 'This comment is currently in the Trash.' );
+					break;
+			}
+			if ( $message ) {
+				echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+			}
+		}
+		?>
 <div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>

 <table class="form-table comment-ays">
 <tr>
-<th scope="row"><?php _e('Author'); ?></th>
+<th scope="row"><?php _e( 'Author' ); ?></th>
 <td><?php comment_author( $comment ); ?></td>
 </tr>
-<?php if ( get_comment_author_email( $comment ) ) { ?>
+		<?php if ( get_comment_author_email( $comment ) ) { ?>
 <tr>
-<th scope="row"><?php _e('Email'); ?></th>
+<th scope="row"><?php _e( 'Email' ); ?></th>
 <td><?php comment_author_email( $comment ); ?></td>
 </tr>
 <?php } ?>
-<?php if ( get_comment_author_url( $comment ) ) { ?>
+		<?php if ( get_comment_author_url( $comment ) ) { ?>
 <tr>
-<th scope="row"><?php _e('URL'); ?></th>
+<th scope="row"><?php _e( 'URL' ); ?></th>
 <td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
 </tr>
 <?php } ?>
 <tr>
 	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
 	<td>
-	<?php
+		<?php
 		$post_id = $comment->comment_post_ID;
 		if ( current_user_can( 'edit_post', $post_id ) ) {
-			$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+			$post_link  = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
 			$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
 		} else {
 			$post_link = esc_html( get_the_title( $post_id ) );
@@ -188,145 +195,161 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 				'<a href="' . $parent_link . '">' . $name . '</a>'
 			);
 		}
-	?>
+		?>
 	</td>
-</tr>
-<tr>
+	</tr>
+	<tr>
 	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
 	<td>
-	<?php
+		<?php
 		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf( __( '%1$s at %2$s' ),
+		$submitted = sprintf(
+			__( '%1$s at %2$s' ),
 			/* translators: comment date format. See https://secure.php.net/date */
 			get_comment_date( __( 'Y/m/d' ), $comment ),
 			get_comment_date( __( 'g:i a' ), $comment )
 		);
-		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
 			echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
 		} else {
 			echo $submitted;
 		}
-	?>
-	</td>
-</tr>
-<tr>
-<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
-<td class="comment-content">
-	<?php comment_text( $comment ); ?>
+		?>
+		</td>
+	</tr>
+	<tr>
+	<th scope="row"><?php /* translators: field name in comment form */ _ex( 'Comment', 'noun' ); ?></th>
+	<td class="comment-content">
+		<?php comment_text( $comment ); ?>
 	<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
-</td>
-</tr>
-</table>
+	</td>
+	</tr>
+	</table>

-<form action="comment.php" method="get" class="comment-ays-submit">
+	<form action="comment.php" method="get" class="comment-ays-submit">

-<p>
-	<?php submit_button( $button, 'primary', 'submit', false ); ?>
-	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
-</p>
+	<p>
+		<?php submit_button( $button, 'primary', 'submit', false ); ?>
+	<a href="<?php echo admin_url( 'edit-comments.php' ); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
+	</p>

-<?php wp_nonce_field( $nonce_action ); ?>
-<input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
-<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
-<input type="hidden" name="noredir" value="1" />
-</form>
+		<?php wp_nonce_field( $nonce_action ); ?>
+	<input type="hidden" name="action" value="<?php echo esc_attr( $formaction ); ?>" />
+	<input type="hidden" name="c" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
+	<input type="hidden" name="noredir" value="1" />
+	</form>

-</div>
-<?php
-	break;
+	</div>
+		<?php
+		break;

-case 'deletecomment'    :
-case 'trashcomment'     :
-case 'untrashcomment'   :
-case 'spamcomment'      :
-case 'unspamcomment'    :
-case 'approvecomment'   :
-case 'unapprovecomment' :
-	$comment_id = absint( $_REQUEST['c'] );
+	case 'deletecomment':
+	case 'trashcomment':
+	case 'untrashcomment':
+	case 'spamcomment':
+	case 'unspamcomment':
+	case 'approvecomment':
+	case 'unapprovecomment':
+		$comment_id = absint( $_REQUEST['c'] );

-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
-	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+		if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			check_admin_referer( 'approve-comment_' . $comment_id );
+		} else {
+			check_admin_referer( 'delete-comment_' . $comment_id );
+		}

-	$noredir = isset($_REQUEST['noredir']);
+		$noredir = isset( $_REQUEST['noredir'] );

-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'edit-comments.php' ) );
+		}
+		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+		}

-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
-		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-	else
-		$redir = admin_url('edit-comments.php');
+		if ( '' != wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
+			$redir = wp_get_referer();
+		} elseif ( '' != wp_get_original_referer() && ! $noredir ) {
+			$redir = wp_get_original_referer();
+		} elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			$redir = admin_url( 'edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+		} else {
+			$redir = admin_url( 'edit-comments.php' );
+		}

-	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+		$redir = remove_query_arg( array( 'spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved' ), $redir );

-	switch ( $action ) {
-		case 'deletecomment' :
-			wp_delete_comment( $comment );
-			$redir = add_query_arg( array('deleted' => '1'), $redir );
-			break;
-		case 'trashcomment' :
-			wp_trash_comment( $comment );
-			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
-			break;
-		case 'untrashcomment' :
-			wp_untrash_comment( $comment );
-			$redir = add_query_arg( array('untrashed' => '1'), $redir );
-			break;
-		case 'spamcomment' :
-			wp_spam_comment( $comment );
-			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
-			break;
-		case 'unspamcomment' :
-			wp_unspam_comment( $comment );
-			$redir = add_query_arg( array('unspammed' => '1'), $redir );
-			break;
-		case 'approvecomment' :
-			wp_set_comment_status( $comment, 'approve' );
-			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
-			break;
-		case 'unapprovecomment' :
-			wp_set_comment_status( $comment, 'hold' );
-			$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
-			break;
-	}
+		switch ( $action ) {
+			case 'deletecomment':
+				wp_delete_comment( $comment );
+				$redir = add_query_arg( array( 'deleted' => '1' ), $redir );
+				break;
+			case 'trashcomment':
+				wp_trash_comment( $comment );
+				$redir = add_query_arg(
+					array(
+						'trashed' => '1',
+						'ids'     => $comment_id,
+					),
+					$redir
+				);
+				break;
+			case 'untrashcomment':
+				wp_untrash_comment( $comment );
+				$redir = add_query_arg( array( 'untrashed' => '1' ), $redir );
+				break;
+			case 'spamcomment':
+				wp_spam_comment( $comment );
+				$redir = add_query_arg(
+					array(
+						'spammed' => '1',
+						'ids'     => $comment_id,
+					),
+					$redir
+				);
+				break;
+			case 'unspamcomment':
+				wp_unspam_comment( $comment );
+				$redir = add_query_arg( array( 'unspammed' => '1' ), $redir );
+				break;
+			case 'approvecomment':
+				wp_set_comment_status( $comment, 'approve' );
+				$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+				break;
+			case 'unapprovecomment':
+				wp_set_comment_status( $comment, 'hold' );
+				$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+				break;
+		}

-	wp_redirect( $redir );
-	die;
+		wp_redirect( $redir );
+		die;

-case 'editedcomment' :
+	case 'editedcomment':
+		$comment_id      = absint( $_POST['comment_ID'] );
+		$comment_post_id = absint( $_POST['comment_post_ID'] );

-	$comment_id = absint( $_POST['comment_ID'] );
-	$comment_post_id = absint( $_POST['comment_post_ID'] );
+		check_admin_referer( 'update-comment_' . $comment_id );

-	check_admin_referer( 'update-comment_' . $comment_id );
+		edit_comment();

-	edit_comment();
+		$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;

-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+		/**
+		 * Filters the URI the user is redirected to after editing a comment in the admin.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param string $location The URI the user will be redirected to.
+		 * @param int $comment_id The ID of the comment being edited.
+		 */
+		$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+		wp_redirect( $location );

-	/**
-	 * Filters the URI the user is redirected to after editing a comment in the admin.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string $location The URI the user will be redirected to.
-	 * @param int $comment_id The ID of the comment being edited.
-	 */
-	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-	wp_redirect( $location );
+		exit();

-	exit();
-
-default:
-	wp_die( __('Unknown action.') );
+	default:
+		wp_die( __( 'Unknown action.' ) );

 } // end switch

--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -39,7 +39,8 @@ $credits = wp_credits();
 if ( ! $credits ) {
 	echo '<p class="about-description">';
 	/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-	printf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+	printf(
+		__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
 		'https://wordpress.org/about/',
 		__( 'https://make.wordpress.org/' )
 	);
@@ -64,23 +65,26 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
 			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
 			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
 		} elseif ( isset( $group_data['placeholders'] ) ) {
+			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
 		} else {
+			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 			$title = translate( $group_data['name'] );
 		}

 		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
 	}

-	if ( ! empty( $group_data['shuffle'] ) )
+	if ( ! empty( $group_data['shuffle'] ) ) {
 		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	}

 	switch ( $group_data['type'] ) {
-		case 'list' :
+		case 'list':
 			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
 			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
 			break;
-		case 'libraries' :
+		case 'libraries':
 			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
 			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
 			break;
@@ -91,18 +95,20 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
 			foreach ( $group_data['data'] as $person_data ) {
 				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
 				echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
-				$size = 'compact' == $group_data['type'] ? 30 : 60;
-				$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				$size *= 2;
+				$size   = 'compact' == $group_data['type'] ? 30 : 60;
+				$data   = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+				$size  *= 2;
 				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
 				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
 				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
+				if ( ! $compact ) {
+					// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				}
 				echo "</li>\n";
 			}
 			echo "</ul>\n";
-		break;
+			break;
 	}
 }

--- a/wp-admin/css/about-rtl.css
+++ b/wp-admin/css/about-rtl.css
@@ -64,12 +64,12 @@
 	position: absolute;
 	bottom: 0;
 	width: 100%;
-    padding: 40px 10px 15px;
-    overflow: auto;
-    box-sizing: border-box;
-    background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent);
-    font-weight: 600;
-    text-shadow: 0px 0px 5px rgba(0,0,0,.75);
+	padding: 40px 10px 15px;
+	overflow: auto;
+	box-sizing: border-box;
+	background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent);
+	font-weight: 600;
+	text-shadow: 0px 0px 5px rgba(0,0,0,.75);
 }

 .about-wrap .jetpack-video-wrapper {
@@ -149,6 +149,11 @@
 	line-height: 1.5;
 }

+.about-wrap .under-the-hood-header {
+	margin: 40px 0 0;
+	text-align: center;
+}
+
 .about-wrap h4 {
 	color: #23282d;
 }
@@ -160,8 +165,8 @@
 }

 .about-wrap figcaption {
-    font-size: 13px;
-    text-align: center;
+	font-size: 13px;
+	text-align: center;
 	color: white;
 	text-overflow: ellipsis;
 }
@@ -187,11 +192,20 @@
 	flex-wrap: wrap;
 }

-.about-wrap .feature-section.one-col {
+.about-wrap .one-col {
 	margin: 0 auto;
 	max-width: 680px;
 }

+.about-wrap .one-col.is-wide {
+	max-width: 760px;
+}
+
+.about-wrap .under-the-hood {
+	margin: auto;
+	max-width: 1020px;
+}
+
 .about-wrap .inline-svg img {
 	max-width: 100%;
 	width: 100%;
@@ -202,44 +216,31 @@
 	margin-bottom: 120px;
 }

+.about-wrap .under-the-hood .inline-svg {
+	margin-right: 100px;
+}
+
 .about-wrap [class$="-col"] .col {
 	flex: 1;
-}
-
-.about-wrap .two-col .col {
-	min-width: 47%;
-	max-width: 47%;
-}
-
-.about-wrap .three-col,
-.about-wrap .four-col {
-	margin: auto;
-	max-width: 1020px;
-}
-
-.about-wrap .three-col .col {
 	align-self: flex-start;
-	min-width: 31%;
-	max-width: 31%;
 }

-.about-wrap .four-col .col {
-	align-self: flex-start;
-	min-width: 23%;
-	max-width: 23%;
+.about-wrap [class$="-col"] .col + .col {
+	margin-right: 20px;
 }

-.about-wrap .feature-section.eight-col .col {
-	align-self: flex-start;
-	margin-top: 6px;
-	min-width: 12%;
-	max-width: 12%;
+.about-wrap [class$="-col"] .is-span-two {
+	flex: 2;
 }

 .about-wrap .one-col img {
 	margin: 1em 0 2em;
 }

+.about-wrap .one-col .alignright img {
+	margin-top: 0;
+}
+
 .about-wrap .two-col img {
 	margin-bottom: 1.5em;
 }
@@ -256,14 +257,24 @@
 	margin: 1.5em auto;
 }

+.about-wrap .inline-svg.alignright {
+	margin-right: 80px;
+}
+
 .about-wrap .cta {
 	text-align: center;
 }
+
 .about-wrap .cta .button {
 	margin: 0 auto 5px;
 	font-weight: 600;
 }

+.about-wrap .feature-section .button {
+	margin-top: 1.5em;
+	font-weight: 600;
+}
+
 /* 1.3 - Point Releases */

 .about-wrap .point-releases {
@@ -285,6 +296,10 @@

 /* 2.1 - Typography */

+.about-wrap .feature-section-header {
+	margin: 50px 0 0;
+}
+
 .about-wrap .feature-section.two-col h3 {
 	margin-top: 0;
 }
@@ -323,22 +338,8 @@

 /* 2.2 - Structure */

-.about-wrap .headline-feature.feature-video {
-	position: relative;
-	margin: 40px 0;
-	padding-bottom: 56.25%;
-	width: 100%;
-	max-width: 100%;
-	height: 0;
-	text-align: center;
-}
-
-.about-wrap .feature-video embed {
-	position: absolute;
-	top: 0;
-	right: 0;
-	width: 100%;
-	height: 100%;
+.about-wrap .headline-feature {
+	margin-bottom: 40px;
 }

 .about-wrap .featured-image {
@@ -500,32 +501,22 @@
  4.0 - Media Queries
 ------------------------------------------------------------------------------*/

-@media screen and (max-width: 1250px) {
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2) {
-		margin: 0 0 60px;
-	}
-
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin: 0;
-	}
-
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin-right: 60px;
-	}
-}
-
@media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		column-count: 1;
 	}

+	.about-wrap .one-col .alignright {
+		margin-right: 20px;
+		max-width: 150px;
+	}
+
 	.about-wrap .two-col .col,
 	.about-wrap .three-col .col,
 	.about-wrap .four-col .col {
 		min-width: 48% !important;
+		max-width: 48% !important;
+		margin-right: 0 !important;
 	}

 	.about-wrap .eight-col .col {
@@ -549,18 +540,8 @@
 		text-shadow: none;
 	}

-	.about-wrap .floating-header-section {
-		display: block;
-	}
-
-	.about-wrap .floating-header-section .section-header,
-	.about-wrap .floating-header-section .section-content {
-		max-width: 100%;
-	}
-
-	.about-wrap .floating-header-section h2 {
-		position: static;
-		margin-bottom: 60px;
+	.about-wrap .under-the-hood .inline-svg {
+		margin-right: 40px;
 	}
 }

@@ -585,6 +566,10 @@
 		width: 100%;
 	}

+	.about-wrap .one-col .alignright {
+		max-width: 120px;
+	}
+
 	.about-wrap .feature-section .col {
 		margin-top: 1em;
 	}
@@ -616,24 +601,21 @@
 		margin-top: 1.25em;
 	}

-	.about-wrap .floating-header-section {
-		margin-bottom: 60px;
-		grid-gap: 30px 0;
+	.about-wrap .under-the-hood .inline-svg {
+		display: none;
 	}

 	.about-wrap .inline-svg.full-width {
 		margin-bottom: 60px;
 	}
+}

-	.about-wrap .floating-header-section h2 {
-		word-break: break-all;
-		-webkit-hyphens: auto;
-		-ms-hyphens: auto;
-		hyphens: auto;
+@media only screen and (max-width: 320px) {
+	.about-wrap .one-col .alignright {
+		float: none;
+		margin: 0 auto;
 	}
-
-	.about-wrap .floating-header-section .section-content .section-item {
-		max-width: 100%;
-		margin: 0 0 60px;
+	.about-wrap .one-col .alignright img {
+		margin: 0 0 1em;
 	}
 }
--- a/wp-admin/css/about-rtl.min.css
+++ b/wp-admin/css/about-rtl.min.css
--- a/wp-admin/css/about.css
+++ b/wp-admin/css/about.css
@@ -64,12 +64,12 @@
 	position: absolute;
 	bottom: 0;
 	width: 100%;
-    padding: 40px 10px 15px;
-    overflow: auto;
-    box-sizing: border-box;
-    background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent);
-    font-weight: 600;
-    text-shadow: 0px 0px 5px rgba(0,0,0,.75);
+	padding: 40px 10px 15px;
+	overflow: auto;
+	box-sizing: border-box;
+	background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent);
+	font-weight: 600;
+	text-shadow: 0px 0px 5px rgba(0,0,0,.75);
 }

 .about-wrap .jetpack-video-wrapper {
@@ -149,6 +149,11 @@
 	line-height: 1.5;
 }

+.about-wrap .under-the-hood-header {
+	margin: 40px 0 0;
+	text-align: center;
+}
+
 .about-wrap h4 {
 	color: #23282d;
 }
@@ -160,8 +165,8 @@
 }

 .about-wrap figcaption {
-    font-size: 13px;
-    text-align: center;
+	font-size: 13px;
+	text-align: center;
 	color: white;
 	text-overflow: ellipsis;
 }
@@ -187,11 +192,20 @@
 	flex-wrap: wrap;
 }

-.about-wrap .feature-section.one-col {
+.about-wrap .one-col {
 	margin: 0 auto;
 	max-width: 680px;
 }

+.about-wrap .one-col.is-wide {
+	max-width: 760px;
+}
+
+.about-wrap .under-the-hood {
+	margin: auto;
+	max-width: 1020px;
+}
+
 .about-wrap .inline-svg img {
 	max-width: 100%;
 	width: 100%;
@@ -202,44 +216,31 @@
 	margin-bottom: 120px;
 }

+.about-wrap .under-the-hood .inline-svg {
+	margin-left: 100px;
+}
+
 .about-wrap [class$="-col"] .col {
 	flex: 1;
-}
-
-.about-wrap .two-col .col {
-	min-width: 47%;
-	max-width: 47%;
-}
-
-.about-wrap .three-col,
-.about-wrap .four-col {
-	margin: auto;
-	max-width: 1020px;
-}
-
-.about-wrap .three-col .col {
 	align-self: flex-start;
-	min-width: 31%;
-	max-width: 31%;
 }

-.about-wrap .four-col .col {
-	align-self: flex-start;
-	min-width: 23%;
-	max-width: 23%;
+.about-wrap [class$="-col"] .col + .col {
+	margin-left: 20px;
 }

-.about-wrap .feature-section.eight-col .col {
-	align-self: flex-start;
-	margin-top: 6px;
-	min-width: 12%;
-	max-width: 12%;
+.about-wrap [class$="-col"] .is-span-two {
+	flex: 2;
 }

 .about-wrap .one-col img {
 	margin: 1em 0 2em;
 }

+.about-wrap .one-col .alignright img {
+	margin-top: 0;
+}
+
 .about-wrap .two-col img {
 	margin-bottom: 1.5em;
 }
@@ -256,14 +257,24 @@
 	margin: 1.5em auto;
 }

+.about-wrap .inline-svg.alignright {
+	margin-left: 80px;
+}
+
 .about-wrap .cta {
 	text-align: center;
 }
+
 .about-wrap .cta .button {
 	margin: 0 auto 5px;
 	font-weight: 600;
 }

+.about-wrap .feature-section .button {
+	margin-top: 1.5em;
+	font-weight: 600;
+}
+
 /* 1.3 - Point Releases */

 .about-wrap .point-releases {
@@ -285,6 +296,10 @@

 /* 2.1 - Typography */

+.about-wrap .feature-section-header {
+	margin: 50px 0 0;
+}
+
 .about-wrap .feature-section.two-col h3 {
 	margin-top: 0;
 }
@@ -323,22 +338,8 @@

 /* 2.2 - Structure */

-.about-wrap .headline-feature.feature-video {
-	position: relative;
-	margin: 40px 0;
-	padding-bottom: 56.25%;
-	width: 100%;
-	max-width: 100%;
-	height: 0;
-	text-align: center;
-}
-
-.about-wrap .feature-video embed {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
+.about-wrap .headline-feature {
+	margin-bottom: 40px;
 }

 .about-wrap .featured-image {
@@ -500,32 +501,22 @@
  4.0 - Media Queries
 ------------------------------------------------------------------------------*/

-@media screen and (max-width: 1250px) {
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2) {
-		margin: 0 0 60px;
-	}
-
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin: 0;
-	}
-
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin-left: 60px;
-	}
-}
-
@media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		column-count: 1;
 	}

+	.about-wrap .one-col .alignright {
+		margin-left: 20px;
+		max-width: 150px;
+	}
+
 	.about-wrap .two-col .col,
 	.about-wrap .three-col .col,
 	.about-wrap .four-col .col {
 		min-width: 48% !important;
+		max-width: 48% !important;
+		margin-left: 0 !important;
 	}

 	.about-wrap .eight-col .col {
@@ -549,18 +540,8 @@
 		text-shadow: none;
 	}

-	.about-wrap .floating-header-section {
-		display: block;
-	}
-
-	.about-wrap .floating-header-section .section-header,
-	.about-wrap .floating-header-section .section-content {
-		max-width: 100%;
-	}
-
-	.about-wrap .floating-header-section h2 {
-		position: static;
-		margin-bottom: 60px;
+	.about-wrap .under-the-hood .inline-svg {
+		margin-left: 40px;
 	}
 }

@@ -585,6 +566,10 @@
 		width: 100%;
 	}

+	.about-wrap .one-col .alignright {
+		max-width: 120px;
+	}
+
 	.about-wrap .feature-section .col {
 		margin-top: 1em;
 	}
@@ -616,24 +601,21 @@
 		margin-top: 1.25em;
 	}

-	.about-wrap .floating-header-section {
-		margin-bottom: 60px;
-		grid-gap: 30px 0;
+	.about-wrap .under-the-hood .inline-svg {
+		display: none;
 	}

 	.about-wrap .inline-svg.full-width {
 		margin-bottom: 60px;
 	}
+}

-	.about-wrap .floating-header-section h2 {
-		word-break: break-all;
-		-webkit-hyphens: auto;
-		-ms-hyphens: auto;
-		hyphens: auto;
+@media only screen and (max-width: 320px) {
+	.about-wrap .one-col .alignright {
+		float: none;
+		margin: 0 auto;
 	}
-
-	.about-wrap .floating-header-section .section-content .section-item {
-		max-width: 100%;
-		margin: 0 0 60px;
+	.about-wrap .one-col .alignright img {
+		margin: 0 0 1em;
 	}
 }
--- a/wp-admin/css/about.min.css
+++ b/wp-admin/css/about.min.css
--- a/wp-admin/css/admin-menu-rtl.css
+++ b/wp-admin/css/admin-menu-rtl.css
@@ -298,7 +298,8 @@
 .folded #adminmenu .wp-has-current-submenu li > a {
 	padding-left: 16px;
 	padding-right: 14px;
-	transition: all .1s ease-in-out;
+	/* Exclude from the transition the outline for Windows High Contrast mode */
+	transition: all .1s ease-in-out, outline 0s;
 }

 #adminmenu .wp-has-current-submenu ul > li > a,
@@ -330,7 +331,6 @@
 #adminmenu .wp-submenu li {
 	padding: 0;
 	margin: 0;
-	overflow: hidden;
 }

 #adminmenu .wp-menu-image img {
@@ -547,16 +547,20 @@ ul#adminmenu > li.current > a.current:after {
 	padding: 0;
 	position: relative;
 	overflow: visible;
-	line-height: 34px;
 	background: none;
 	color: #aaa;
 	cursor: pointer;
-	outline: 0;
 }

-#collapse-button:hover,
+#collapse-button:hover {
+	color: #00b9eb;
+}
+
 #collapse-button:focus {
 	color: #00b9eb;
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
+	outline-offset: -1px;
 }

 #collapse-button .collapse-button-icon,
@@ -566,7 +570,10 @@ ul#adminmenu > li.current > a.current:after {
 	position: absolute;
 	top: 0;
 	right: 0;
-	line-height: 34px;
+}
+
+#collapse-button .collapse-button-label {
+	top: 8px;
 }

 #collapse-button .collapse-button-icon {
@@ -735,7 +742,7 @@ li#wp-admin-bar-menu-toggle {

 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.auto-fold #wpcontent {
 		position: relative;
 		margin-right: 0;
--- a/wp-admin/css/admin-menu-rtl.min.css
+++ b/wp-admin/css/admin-menu-rtl.min.css
--- a/wp-admin/css/admin-menu.css
+++ b/wp-admin/css/admin-menu.css
@@ -298,7 +298,8 @@
 .folded #adminmenu .wp-has-current-submenu li > a {
 	padding-right: 16px;
 	padding-left: 14px;
-	transition: all .1s ease-in-out;
+	/* Exclude from the transition the outline for Windows High Contrast mode */
+	transition: all .1s ease-in-out, outline 0s;
 }

 #adminmenu .wp-has-current-submenu ul > li > a,
@@ -330,7 +331,6 @@
 #adminmenu .wp-submenu li {
 	padding: 0;
 	margin: 0;
-	overflow: hidden;
 }

 #adminmenu .wp-menu-image img {
@@ -547,16 +547,20 @@ ul#adminmenu > li.current > a.current:after {
 	padding: 0;
 	position: relative;
 	overflow: visible;
-	line-height: 34px;
 	background: none;
 	color: #aaa;
 	cursor: pointer;
-	outline: 0;
 }

-#collapse-button:hover,
+#collapse-button:hover {
+	color: #00b9eb;
+}
+
 #collapse-button:focus {
 	color: #00b9eb;
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
+	outline-offset: -1px;
 }

 #collapse-button .collapse-button-icon,
@@ -566,7 +570,10 @@ ul#adminmenu > li.current > a.current:after {
 	position: absolute;
 	top: 0;
 	left: 0;
-	line-height: 34px;
+}
+
+#collapse-button .collapse-button-label {
+	top: 8px;
 }

 #collapse-button .collapse-button-icon {
@@ -735,7 +742,7 @@ li#wp-admin-bar-menu-toggle {

 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.auto-fold #wpcontent {
 		position: relative;
 		margin-left: 0;
--- a/wp-admin/css/admin-menu.min.css
+++ b/wp-admin/css/admin-menu.min.css
--- a/wp-admin/css/code-editor-rtl.css
+++ b/wp-admin/css/code-editor-rtl.css
@@ -71,6 +71,6 @@
 	text-align: right;
 }

-.wrap .CodeMirror .CodeMirror-linenumber { 
-    color: #666; 
+.wrap .CodeMirror .CodeMirror-linenumber {
+	color: #666;
 }
--- a/wp-admin/css/code-editor.css
+++ b/wp-admin/css/code-editor.css
@@ -71,6 +71,6 @@
 	text-align: left;
 }

-.wrap .CodeMirror .CodeMirror-linenumber { 
-    color: #666; 
+.wrap .CodeMirror .CodeMirror-linenumber {
+	color: #666;
 }
--- a/wp-admin/css/color-picker-rtl.css
+++ b/wp-admin/css/color-picker-rtl.css
@@ -70,7 +70,7 @@

 .wp-picker-input-wrap .button,
 .wp-customizer .wp-picker-input-wrap .button {
- 	margin-right: 6px;
+	margin-right: 6px;
 }

 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -125,7 +125,7 @@
 		0 0 2px 1px rgba(30, 140, 190, .8);
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.wp-picker-container input[type="text"].wp-color-picker {
 		width: 80px;
 		padding: 6px 5px 5px;
@@ -160,7 +160,7 @@
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	.wp-customizer .wp-picker-container .wp-color-result.button {
 		font-size: 14px;
 		line-height: 29px;
--- a/wp-admin/css/color-picker.css
+++ b/wp-admin/css/color-picker.css
@@ -70,7 +70,7 @@

 .wp-picker-input-wrap .button,
 .wp-customizer .wp-picker-input-wrap .button {
- 	margin-left: 6px;
+	margin-left: 6px;
 }

 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -125,7 +125,7 @@
 		0 0 2px 1px rgba(30, 140, 190, .8);
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.wp-picker-container input[type="text"].wp-color-picker {
 		width: 80px;
 		padding: 6px 5px 5px;
@@ -160,7 +160,7 @@
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	.wp-customizer .wp-picker-container .wp-color-result.button {
 		font-size: 14px;
 		line-height: 29px;
--- a/wp-admin/css/colors/_admin.scss
+++ b/wp-admin/css/colors/_admin.scss
@@ -84,9 +84,7 @@ input[type=radio]:checked:before {
 /* List tables */

 .wrap .add-new-h2:hover, /* deprecated */
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
 	color: $menu-text;
 	background-color: $menu-background;
 }
--- a/wp-admin/css/colors/blue/colors-rtl.css
+++ b/wp-admin/css/colors/blue/colors-rtl.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #52accc;
 }
--- a/wp-admin/css/colors/blue/colors-rtl.min.css
+++ b/wp-admin/css/colors/blue/colors-rtl.min.css
--- a/wp-admin/css/colors/blue/colors.css
+++ b/wp-admin/css/colors/blue/colors.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #52accc;
 }
--- a/wp-admin/css/colors/blue/colors.min.css
+++ b/wp-admin/css/colors/blue/colors.min.css
--- a/wp-admin/css/colors/coffee/colors-rtl.css
+++ b/wp-admin/css/colors/coffee/colors-rtl.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #59524c;
 }
--- a/wp-admin/css/colors/coffee/colors-rtl.min.css
+++ b/wp-admin/css/colors/coffee/colors-rtl.min.css
--- a/wp-admin/css/colors/coffee/colors.css
+++ b/wp-admin/css/colors/coffee/colors.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #59524c;
 }
--- a/wp-admin/css/colors/coffee/colors.min.css
+++ b/wp-admin/css/colors/coffee/colors.min.css
--- a/wp-admin/css/colors/ectoplasm/colors-rtl.css
+++ b/wp-admin/css/colors/ectoplasm/colors-rtl.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #523f6d;
 }
--- a/wp-admin/css/colors/ectoplasm/colors-rtl.min.css
+++ b/wp-admin/css/colors/ectoplasm/colors-rtl.min.css
--- a/wp-admin/css/colors/ectoplasm/colors.css
+++ b/wp-admin/css/colors/ectoplasm/colors.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #523f6d;
 }
--- a/wp-admin/css/colors/ectoplasm/colors.min.css
+++ b/wp-admin/css/colors/ectoplasm/colors.min.css
--- a/wp-admin/css/colors/light/colors-rtl.css
+++ b/wp-admin/css/colors/light/colors-rtl.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #333;
  background-color: #e5e5e5;
 }
--- a/wp-admin/css/colors/light/colors-rtl.min.css
+++ b/wp-admin/css/colors/light/colors-rtl.min.css
--- a/wp-admin/css/colors/light/colors.css
+++ b/wp-admin/css/colors/light/colors.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #333;
  background-color: #e5e5e5;
 }
--- a/wp-admin/css/colors/light/colors.min.css
+++ b/wp-admin/css/colors/light/colors.min.css
--- a/wp-admin/css/colors/midnight/colors-rtl.css
+++ b/wp-admin/css/colors/midnight/colors-rtl.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #363b3f;
 }
--- a/wp-admin/css/colors/midnight/colors-rtl.min.css
+++ b/wp-admin/css/colors/midnight/colors-rtl.min.css
--- a/wp-admin/css/colors/midnight/colors.css
+++ b/wp-admin/css/colors/midnight/colors.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #363b3f;
 }
--- a/wp-admin/css/colors/midnight/colors.min.css
+++ b/wp-admin/css/colors/midnight/colors.min.css
--- a/wp-admin/css/colors/ocean/colors-rtl.css
+++ b/wp-admin/css/colors/ocean/colors-rtl.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #738e96;
 }
--- a/wp-admin/css/colors/ocean/colors-rtl.min.css
+++ b/wp-admin/css/colors/ocean/colors-rtl.min.css
--- a/wp-admin/css/colors/ocean/colors.css
+++ b/wp-admin/css/colors/ocean/colors.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #738e96;
 }
--- a/wp-admin/css/colors/ocean/colors.min.css
+++ b/wp-admin/css/colors/ocean/colors.min.css
--- a/wp-admin/css/colors/sunrise/colors-rtl.css
+++ b/wp-admin/css/colors/sunrise/colors-rtl.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #cf4944;
 }
--- a/wp-admin/css/colors/sunrise/colors-rtl.min.css
+++ b/wp-admin/css/colors/sunrise/colors-rtl.min.css
--- a/wp-admin/css/colors/sunrise/colors.css
+++ b/wp-admin/css/colors/sunrise/colors.css
@@ -97,9 +97,7 @@ input[type=radio]:checked:before {

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover,
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
+.wrap .page-title-action:hover {
  color: #fff;
  background-color: #cf4944;
 }
--- a/wp-admin/css/colors/sunrise/colors.min.css
+++ b/wp-admin/css/colors/sunrise/colors.min.css
--- a/wp-admin/css/common-rtl.css
+++ b/wp-admin/css/common-rtl.css
@@ -134,6 +134,10 @@
 	word-wrap: normal !important; /* many screen reader and browser combinations announce broken words as they would appear visually */
 }

+.button .screen-reader-text {
+	height: auto; /* Fixes a Safari+VoiceOver bug, see ticket #42006 */
+}
+
 .screen-reader-shortcut {
 	position: absolute;
 	top: -1000em;
@@ -154,7 +158,9 @@
 	line-height: normal;
 	box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
 	text-decoration: none;
-	outline: none;
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
+	outline-offset: -2px;
 }

 .hidden,
@@ -269,13 +275,21 @@ a:focus .media-icon img,
 	box-shadow:
 		0 0 0 1px #5b9dd9,
 		0 0 2px 1px rgba(30, 140, 190, .8);
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
 }

 .ie8 a:focus {
 	outline: #5b9dd9 solid 1px;
 }

-#adminmenu a:focus,
+#adminmenu a:focus {
+	box-shadow: none;
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
+	outline-offset: -1px;
+}
+
 .screen-reader-text:focus {
 	box-shadow: none;
 	outline: none;
@@ -613,7 +627,6 @@ code {
 	line-height: normal; /* IE8-IE11 need this for buttons */
 	color: #0073aa; /* some of these controls are button elements and don't inherit from links */
 	cursor: pointer;
-	outline: 0;
 }

 .wrap .wp-heading-inline + .page-title-action {
@@ -635,6 +648,8 @@ code {
 .wrap .page-title-action:focus {
 	border-color: #5b9dd9;
 	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 }

 .wrap h1.long-header {
@@ -1518,13 +1533,13 @@ div.error {
 .installed p:before,
 .button.updated-message:before {
 	color: #79ba49;
-	content: '\f147';
+	content: "\f147";
 }

 /* Error icon. */
 .update-message.notice-error p:before {
-	 color: #dc3232;
-	 content: "\f534";
+	color: #dc3232;
+	content: "\f534";
 }

 .wrap .notice p:before,
@@ -1550,6 +1565,15 @@ ul#dismissed-updates {
 	display: none;
 }

+#dismissed-updates li > p {
+	margin-top: 0;
+}
+
+#dismiss,
+#undismiss {
+	margin-right: 0.5em;
+}
+
 form.upgrade {
 	margin-top: 8px;
 }
@@ -1725,7 +1749,7 @@ form.upgrade .hint {
 #contextual-help-wrap h5 {
 	margin: 0;
 	padding: 8px 0;
- 	font-size: 13px;
+	font-size: 13px;
 	font-weight: 600;
 }

@@ -1967,7 +1991,7 @@ html.wp-toolbar {
 	width: 200px;
 	text-align: center;
 	color: #ccc;
-	font-size:18px;
+	font-size: 18px;
 	display: none;
 }

@@ -2052,13 +2076,19 @@ html.wp-toolbar {
 	user-select: none;
 }

-.postbox .inside,
-.stuffbox .inside {
+.postbox .inside {
 	padding: 0 12px 12px;
 	line-height: 1.4em;
 	font-size: 13px;
 }

+.stuffbox .inside {
+	padding: 0;
+	line-height: 1.4em;
+	font-size: 13px;
+	margin-top: 0;
+}
+
 .postbox .inside {
 	margin: 11px 0;
 	position: relative;
@@ -2193,10 +2223,10 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */

 /* Back-compat for plugins. Deprecated. Use .wp-clearfix instead. */
 .nav-tab-wrapper:not(.wp-clearfix):after {
- 	content: "";
- 	display: table;
- 	clear: both;
- }
+	content: "";
+	display: table;
+	clear: both;
+}

 .ie8 .nav-tab-wrapper {
 	/* contain floats establishing a new block formatting context */
@@ -2354,11 +2384,8 @@ body.iframe {
 }

 .edit-comment-author {
-	font-size: 14px;
-	line-height: 1.4;
-	font-weight: 600;
 	color: #222;
-	margin: 2px 9px 0 0;
+	border-bottom: 1px solid #eee;
 }

 #namediv h3 label, /* Back-compat for pre-4.4 */
@@ -2456,7 +2483,7 @@ div.star-holder .star-rating {
 	font-weight: 400;
 	font-style: normal;
 	vertical-align: top;
-	transition: color .1s ease-in 0;
+	transition: color .1s ease-in;
 	text-align: center;
 	color: #ffb900;
 }
@@ -2848,7 +2875,7 @@ div.action-links {
 	margin-left: 1em;
 }

-@media screen and ( max-width: 771px ) {
+@media screen and (max-width: 771px) {
 	#plugin-information-title.with-banner {
 		height: 100px;
 	}
@@ -2965,7 +2992,7 @@ div.action-links {
 }

 /* move plugin install close icon to top on narrow screens */
-@media screen and ( max-width: 830px ) {
+@media screen and (max-width: 830px) {
 	.plugin-details-modal #TB_closeWindowButton {
 		left: 0;
 		top: -30px;
@@ -3135,7 +3162,7 @@ img {

 /* Styles for folder indicators/depth */
 .tree-folder .tree-folder::after {
-	content: ' ';
+	content: "";
 	display: block;
 	position: absolute;
 	right: 2px;
@@ -3144,7 +3171,7 @@ img {
 	bottom: 10px;
 }
 .tree-folder > li::before {
-	content: ' ';
+	content: "";
 	position: absolute;
 	display: block;
 	border-right: 1px solid #ccc;
@@ -3155,7 +3182,7 @@ img {
 	border-bottom: 1px solid #ccc;
 }
 .tree-folder > li::after {
-	content: ' ';
+	content: "";
 	position: absolute;
 	display: block;
 	border-right: 1px solid #ccc;
@@ -3360,7 +3387,8 @@ img {
 .control-section.open .accordion-section-title:after,
 #customize-info.open .accordion-section-title:after,
 .nav-menus-php .menu-item-edit-active .item-edit:before,
-.widget.open .widget-top .widget-action .toggle-indicator:before {
+.widget.open .widget-top .widget-action .toggle-indicator:before,
+.widget.widget-in-question .widget-top .widget-action .toggle-indicator:before {
 	content: "\f142";
 }

@@ -3653,7 +3681,7 @@ img {
 	width: device-width;
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	html.wp-toolbar {
 		padding-top: 46px;
 	}
@@ -3695,8 +3723,6 @@ img {
 	}

 	/* Hidden Elements */
-	#screen-meta,
-	#screen-meta-links,
 	#collapse-menu,
 	.post-format-select {
 		display: none !important;
@@ -3907,6 +3933,41 @@ img {
 		line-height: 26px;
 		height: 28px;
 	}
+
+	/* Fix help tab columns for smaller screens */
+	#screen-meta #contextual-help-wrap {
+		overflow: visible;
+	}
+
+	#screen-meta #contextual-help-back,
+	#screen-meta .contextual-help-sidebar {
+		display: none;
+	}
+
+	#screen-meta .contextual-help-tabs {
+		clear: both;
+		width: 100%;
+		float: none;
+	}
+
+	#screen-meta .contextual-help-tabs ul {
+		margin: 0 0 1em;
+		padding: 1em 0 0;
+	}
+
+	#screen-meta .contextual-help-tabs .active {
+		margin: 0;
+	}
+
+	#screen-meta .contextual-help-tabs-wrap {
+		clear: both;
+		max-width: 100%;
+		float: none;
+	}
+
+	#screen-meta-links {
+		margin-bottom: 60px; /* Add margins beneath links for better spacing between boxes and elements */
+	}
 }

 /* Smartphone */
--- a/wp-admin/css/common-rtl.min.css
+++ b/wp-admin/css/common-rtl.min.css
--- a/wp-admin/css/common.css
+++ b/wp-admin/css/common.css
@@ -134,6 +134,10 @@
 	word-wrap: normal !important; /* many screen reader and browser combinations announce broken words as they would appear visually */
 }

+.button .screen-reader-text {
+	height: auto; /* Fixes a Safari+VoiceOver bug, see ticket #42006 */
+}
+
 .screen-reader-shortcut {
 	position: absolute;
 	top: -1000em;
@@ -154,7 +158,9 @@
 	line-height: normal;
 	box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
 	text-decoration: none;
-	outline: none;
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
+	outline-offset: -2px;
 }

 .hidden,
@@ -269,13 +275,21 @@ a:focus .media-icon img,
 	box-shadow:
 		0 0 0 1px #5b9dd9,
 		0 0 2px 1px rgba(30, 140, 190, .8);
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
 }

 .ie8 a:focus {
 	outline: #5b9dd9 solid 1px;
 }

-#adminmenu a:focus,
+#adminmenu a:focus {
+	box-shadow: none;
+	/* Only visible in Windows High Contrast mode */
+	outline: 1px solid transparent;
+	outline-offset: -1px;
+}
+
 .screen-reader-text:focus {
 	box-shadow: none;
 	outline: none;
@@ -613,7 +627,6 @@ code {
 	line-height: normal; /* IE8-IE11 need this for buttons */
 	color: #0073aa; /* some of these controls are button elements and don't inherit from links */
 	cursor: pointer;
-	outline: 0;
 }

 .wrap .wp-heading-inline + .page-title-action {
@@ -635,6 +648,8 @@ code {
 .wrap .page-title-action:focus {
 	border-color: #5b9dd9;
 	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 }

 .wrap h1.long-header {
@@ -1518,13 +1533,13 @@ div.error {
 .installed p:before,
 .button.updated-message:before {
 	color: #79ba49;
-	content: '\f147';
+	content: "\f147";
 }

 /* Error icon. */
 .update-message.notice-error p:before {
-	 color: #dc3232;
-	 content: "\f534";
+	color: #dc3232;
+	content: "\f534";
 }

 .wrap .notice p:before,
@@ -1550,6 +1565,15 @@ ul#dismissed-updates {
 	display: none;
 }

+#dismissed-updates li > p {
+	margin-top: 0;
+}
+
+#dismiss,
+#undismiss {
+	margin-left: 0.5em;
+}
+
 form.upgrade {
 	margin-top: 8px;
 }
@@ -1725,7 +1749,7 @@ form.upgrade .hint {
 #contextual-help-wrap h5 {
 	margin: 0;
 	padding: 8px 0;
- 	font-size: 13px;
+	font-size: 13px;
 	font-weight: 600;
 }

@@ -1967,7 +1991,7 @@ html.wp-toolbar {
 	width: 200px;
 	text-align: center;
 	color: #ccc;
-	font-size:18px;
+	font-size: 18px;
 	display: none;
 }

@@ -2052,13 +2076,19 @@ html.wp-toolbar {
 	user-select: none;
 }

-.postbox .inside,
-.stuffbox .inside {
+.postbox .inside {
 	padding: 0 12px 12px;
 	line-height: 1.4em;
 	font-size: 13px;
 }

+.stuffbox .inside {
+	padding: 0;
+	line-height: 1.4em;
+	font-size: 13px;
+	margin-top: 0;
+}
+
 .postbox .inside {
 	margin: 11px 0;
 	position: relative;
@@ -2193,10 +2223,10 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */

 /* Back-compat for plugins. Deprecated. Use .wp-clearfix instead. */
 .nav-tab-wrapper:not(.wp-clearfix):after {
- 	content: "";
- 	display: table;
- 	clear: both;
- }
+	content: "";
+	display: table;
+	clear: both;
+}

 .ie8 .nav-tab-wrapper {
 	/* contain floats establishing a new block formatting context */
@@ -2354,11 +2384,8 @@ body.iframe {
 }

 .edit-comment-author {
-	font-size: 14px;
-	line-height: 1.4;
-	font-weight: 600;
 	color: #222;
-	margin: 2px 0 0 9px;
+	border-bottom: 1px solid #eee;
 }

 #namediv h3 label, /* Back-compat for pre-4.4 */
@@ -2456,7 +2483,7 @@ div.star-holder .star-rating {
 	font-weight: 400;
 	font-style: normal;
 	vertical-align: top;
-	transition: color .1s ease-in 0;
+	transition: color .1s ease-in;
 	text-align: center;
 	color: #ffb900;
 }
@@ -2848,7 +2875,7 @@ div.action-links {
 	margin-right: 1em;
 }

-@media screen and ( max-width: 771px ) {
+@media screen and (max-width: 771px) {
 	#plugin-information-title.with-banner {
 		height: 100px;
 	}
@@ -2965,7 +2992,7 @@ div.action-links {
 }

 /* move plugin install close icon to top on narrow screens */
-@media screen and ( max-width: 830px ) {
+@media screen and (max-width: 830px) {
 	.plugin-details-modal #TB_closeWindowButton {
 		right: 0;
 		top: -30px;
@@ -3135,7 +3162,7 @@ img {

 /* Styles for folder indicators/depth */
 .tree-folder .tree-folder::after {
-	content: ' ';
+	content: "";
 	display: block;
 	position: absolute;
 	left: 2px;
@@ -3144,7 +3171,7 @@ img {
 	bottom: 10px;
 }
 .tree-folder > li::before {
-	content: ' ';
+	content: "";
 	position: absolute;
 	display: block;
 	border-left: 1px solid #ccc;
@@ -3155,7 +3182,7 @@ img {
 	border-bottom: 1px solid #ccc;
 }
 .tree-folder > li::after {
-	content: ' ';
+	content: "";
 	position: absolute;
 	display: block;
 	border-left: 1px solid #ccc;
@@ -3360,7 +3387,8 @@ img {
 .control-section.open .accordion-section-title:after,
 #customize-info.open .accordion-section-title:after,
 .nav-menus-php .menu-item-edit-active .item-edit:before,
-.widget.open .widget-top .widget-action .toggle-indicator:before {
+.widget.open .widget-top .widget-action .toggle-indicator:before,
+.widget.widget-in-question .widget-top .widget-action .toggle-indicator:before {
 	content: "\f142";
 }

@@ -3653,7 +3681,7 @@ img {
 	width: device-width;
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	html.wp-toolbar {
 		padding-top: 46px;
 	}
@@ -3695,8 +3723,6 @@ img {
 	}

 	/* Hidden Elements */
-	#screen-meta,
-	#screen-meta-links,
 	#collapse-menu,
 	.post-format-select {
 		display: none !important;
@@ -3907,6 +3933,41 @@ img {
 		line-height: 26px;
 		height: 28px;
 	}
+
+	/* Fix help tab columns for smaller screens */
+	#screen-meta #contextual-help-wrap {
+		overflow: visible;
+	}
+
+	#screen-meta #contextual-help-back,
+	#screen-meta .contextual-help-sidebar {
+		display: none;
+	}
+
+	#screen-meta .contextual-help-tabs {
+		clear: both;
+		width: 100%;
+		float: none;
+	}
+
+	#screen-meta .contextual-help-tabs ul {
+		margin: 0 0 1em;
+		padding: 1em 0 0;
+	}
+
+	#screen-meta .contextual-help-tabs .active {
+		margin: 0;
+	}
+
+	#screen-meta .contextual-help-tabs-wrap {
+		clear: both;
+		max-width: 100%;
+		float: none;
+	}
+
+	#screen-meta-links {
+		margin-bottom: 60px; /* Add margins beneath links for better spacing between boxes and elements */
+	}
 }

 /* Smartphone */
--- a/wp-admin/css/common.min.css
+++ b/wp-admin/css/common.min.css
--- a/wp-admin/css/customize-controls-rtl.css
+++ b/wp-admin/css/customize-controls-rtl.css
@@ -533,9 +533,10 @@ body.trashing #publish-settings {
 	background-color: #fff;
 	border-bottom: 1px solid #ddd;
 	border-right: 4px solid #fff;
-	transition: .15s color ease-in-out,
-	            .15s background-color ease-in-out,
-	            .15s border-color ease-in-out;
+	transition:
+		.15s color ease-in-out,
+		.15s background-color ease-in-out,
+		.15s border-color ease-in-out;
 }

 #customize-controls #customize-theme-controls .customize-themes-panel .accordion-section-title {
@@ -785,9 +786,10 @@ h3.customize-section-title {
 	color: #444;
 	text-align: right;
 	cursor: pointer;
-	transition: color .15s ease-in-out,
-	            border-color .15s ease-in-out,
-	            background .15s ease-in-out;
+	transition:
+		color .15s ease-in-out,
+		border-color .15s ease-in-out,
+		background .15s ease-in-out;
 	box-sizing: content-box;
 }

@@ -805,9 +807,10 @@ h3.customize-section-title {
 	border-right: 4px solid #fff;
 	box-shadow: none;
 	cursor: pointer;
-	transition: color .15s ease-in-out,
-	            border-color .15s ease-in-out,
-	            background .15s ease-in-out;
+	transition:
+		color .15s ease-in-out,
+		border-color .15s ease-in-out,
+		background .15s ease-in-out;
 }

 .customize-section-back {
@@ -1428,7 +1431,7 @@ p.customize-section-description {
 }

 .customize-control-header .header-view.selected:after {
-	content: '';
+	content: "";
 	position: absolute;
 	height: auto;
 	top: 0;
@@ -1624,7 +1627,7 @@ p.customize-section-description {
 	box-shadow: inset 0 1px 0 rgba(0,0,0,0.1);
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	.customize-section-description-container + #customize-control-custom_css:last-child {
 		margin-left: 0;
 	}
@@ -1772,12 +1775,12 @@ p.customize-section-description {
 }

 .themes-filter-bar .feature-filter-toggle:before {
-    content: "\f111";
-    margin: 0 0 0 5px;
-    font: normal 16px/1 dashicons;
-    vertical-align: text-bottom;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+	content: "\f111";
+	margin: 0 0 0 5px;
+	font: normal 16px/1 dashicons;
+	vertical-align: text-bottom;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }

 .themes-filter-bar .feature-filter-toggle.open {
@@ -2078,7 +2081,7 @@ p.customize-section-description {

 /* Unstick the filter bar on short windows/screens. This breakpoint is based on the
   current length of .org feature filters assuming translations do not wrap lines. */
-@media screen and (max-height:540px), screen and (max-width:1018px) {
+@media screen and (max-height: 540px), screen and (max-width: 1018px) {
 	.customize-preview-header.themes-filter-bar {
 		position: relative;
 		right: 0;
@@ -2101,13 +2104,13 @@ p.customize-section-description {
 	}
 }

-@media screen and (max-width:1018px) {
+@media screen and (max-width: 1018px) {
 	.filter-drawer .filter-group {
 		width: calc( (100% - 50px) / 2);
 	}
 }

-@media screen and (max-width:900px) {
+@media screen and (max-width: 900px) {
 	.customize-preview-header.themes-filter-bar {
 		height: 86px;
 		padding-top: 46px;
@@ -2128,7 +2131,7 @@ p.customize-section-description {
 	}
 }

-@media screen and (max-width:792px) {
+@media screen and (max-width: 792px) {
 	.filter-drawer .filter-group {
 		width: calc( 100% - 25px);
 	}
@@ -2139,7 +2142,7 @@ p.customize-section-description {
 }

 /* Mobile - toggle between themes and filters */
-@media screen and (max-width:600px) {
+@media screen and (max-width: 600px) {

 	.filter-drawer {
 		top: 132px;
@@ -2320,7 +2323,7 @@ p.customize-section-description {
 }

 /* Small Screens */
-@media (max-width:850px), (max-height:472px) {
+@media (max-width: 850px), (max-height: 472px) {
 	.wp-customizer .theme-overlay .theme-wrap {
 		right: 0;
 		left: 0;
@@ -2692,9 +2695,10 @@ body.adding-widget .add-new-widget:before,
 	background: #fff;
 	border-bottom: 1px solid #ddd;
 	border-right: 4px solid #fff;
-	transition: .15s color ease-in-out,
-	            .15s background-color ease-in-out,
-	            .15s border-color ease-in-out;
+	transition:
+		.15s color ease-in-out,
+		.15s background-color ease-in-out,
+		.15s border-color ease-in-out;
 	cursor: pointer;
 	display: none;
 }
@@ -2782,7 +2786,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 1200px ) {
+@media screen and (max-width: 1200px) {
 	.outer-section-open .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
 	.adding-menu-items .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
 	.adding-widget .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main {
@@ -2790,7 +2794,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {

 	/* when the sidebar is collapsed and switching to responsive view,
 	   bring it back see ticket #35220 */
@@ -2942,7 +2946,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 600px ) {
+@media screen and (max-width: 600px) {
 	.theme-browser .theme.active .theme-actions,
 	.wp-customizer .theme-browser .theme .theme-actions {
 		padding: 8px 15px;
--- a/wp-admin/css/customize-controls-rtl.min.css
+++ b/wp-admin/css/customize-controls-rtl.min.css
--- a/wp-admin/css/customize-controls.css
+++ b/wp-admin/css/customize-controls.css
@@ -533,9 +533,10 @@ body.trashing #publish-settings {
 	background-color: #fff;
 	border-bottom: 1px solid #ddd;
 	border-left: 4px solid #fff;
-	transition: .15s color ease-in-out,
-	            .15s background-color ease-in-out,
-	            .15s border-color ease-in-out;
+	transition:
+		.15s color ease-in-out,
+		.15s background-color ease-in-out,
+		.15s border-color ease-in-out;
 }

 #customize-controls #customize-theme-controls .customize-themes-panel .accordion-section-title {
@@ -785,9 +786,10 @@ h3.customize-section-title {
 	color: #444;
 	text-align: left;
 	cursor: pointer;
-	transition: color .15s ease-in-out,
-	            border-color .15s ease-in-out,
-	            background .15s ease-in-out;
+	transition:
+		color .15s ease-in-out,
+		border-color .15s ease-in-out,
+		background .15s ease-in-out;
 	box-sizing: content-box;
 }

@@ -805,9 +807,10 @@ h3.customize-section-title {
 	border-left: 4px solid #fff;
 	box-shadow: none;
 	cursor: pointer;
-	transition: color .15s ease-in-out,
-	            border-color .15s ease-in-out,
-	            background .15s ease-in-out;
+	transition:
+		color .15s ease-in-out,
+		border-color .15s ease-in-out,
+		background .15s ease-in-out;
 }

 .customize-section-back {
@@ -1428,7 +1431,7 @@ p.customize-section-description {
 }

 .customize-control-header .header-view.selected:after {
-	content: '';
+	content: "";
 	position: absolute;
 	height: auto;
 	top: 0;
@@ -1624,7 +1627,7 @@ p.customize-section-description {
 	box-shadow: inset 0 1px 0 rgba(0,0,0,0.1);
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	.customize-section-description-container + #customize-control-custom_css:last-child {
 		margin-right: 0;
 	}
@@ -1772,12 +1775,12 @@ p.customize-section-description {
 }

 .themes-filter-bar .feature-filter-toggle:before {
-    content: "\f111";
-    margin: 0 5px 0 0;
-    font: normal 16px/1 dashicons;
-    vertical-align: text-bottom;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+	content: "\f111";
+	margin: 0 5px 0 0;
+	font: normal 16px/1 dashicons;
+	vertical-align: text-bottom;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }

 .themes-filter-bar .feature-filter-toggle.open {
@@ -2078,7 +2081,7 @@ p.customize-section-description {

 /* Unstick the filter bar on short windows/screens. This breakpoint is based on the
   current length of .org feature filters assuming translations do not wrap lines. */
-@media screen and (max-height:540px), screen and (max-width:1018px) {
+@media screen and (max-height: 540px), screen and (max-width: 1018px) {
 	.customize-preview-header.themes-filter-bar {
 		position: relative;
 		left: 0;
@@ -2101,13 +2104,13 @@ p.customize-section-description {
 	}
 }

-@media screen and (max-width:1018px) {
+@media screen and (max-width: 1018px) {
 	.filter-drawer .filter-group {
 		width: calc( (100% - 50px) / 2);
 	}
 }

-@media screen and (max-width:900px) {
+@media screen and (max-width: 900px) {
 	.customize-preview-header.themes-filter-bar {
 		height: 86px;
 		padding-top: 46px;
@@ -2128,7 +2131,7 @@ p.customize-section-description {
 	}
 }

-@media screen and (max-width:792px) {
+@media screen and (max-width: 792px) {
 	.filter-drawer .filter-group {
 		width: calc( 100% - 25px);
 	}
@@ -2139,7 +2142,7 @@ p.customize-section-description {
 }

 /* Mobile - toggle between themes and filters */
-@media screen and (max-width:600px) {
+@media screen and (max-width: 600px) {

 	.filter-drawer {
 		top: 132px;
@@ -2320,7 +2323,7 @@ p.customize-section-description {
 }

 /* Small Screens */
-@media (max-width:850px), (max-height:472px) {
+@media (max-width: 850px), (max-height: 472px) {
 	.wp-customizer .theme-overlay .theme-wrap {
 		left: 0;
 		right: 0;
@@ -2692,9 +2695,10 @@ body.adding-widget .add-new-widget:before,
 	background: #fff;
 	border-bottom: 1px solid #ddd;
 	border-left: 4px solid #fff;
-	transition: .15s color ease-in-out,
-	            .15s background-color ease-in-out,
-	            .15s border-color ease-in-out;
+	transition:
+		.15s color ease-in-out,
+		.15s background-color ease-in-out,
+		.15s border-color ease-in-out;
 	cursor: pointer;
 	display: none;
 }
@@ -2782,7 +2786,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 1200px ) {
+@media screen and (max-width: 1200px) {
 	.outer-section-open .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
 	.adding-menu-items .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
 	.adding-widget .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main {
@@ -2790,7 +2794,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {

 	/* when the sidebar is collapsed and switching to responsive view,
 	   bring it back see ticket #35220 */
@@ -2942,7 +2946,7 @@ body.adding-widget .add-new-widget:before,
 	}
 }

-@media screen and ( max-width: 600px ) {
+@media screen and (max-width: 600px) {
 	.theme-browser .theme.active .theme-actions,
 	.wp-customizer .theme-browser .theme .theme-actions {
 		padding: 8px 15px;
--- a/wp-admin/css/customize-controls.min.css
+++ b/wp-admin/css/customize-controls.min.css
--- a/wp-admin/css/customize-nav-menus-rtl.css
+++ b/wp-admin/css/customize-nav-menus-rtl.css
@@ -794,7 +794,7 @@ body.adding-menu-items #customize-preview iframe {
 }

 #accordion-section-add_menu .customize-add-menu-button {
-	font-weight: normal;
+	font-weight: 400;
 }

 #create-new-menu-submit {
@@ -874,13 +874,13 @@ li.assigned-to-menu-location .add-new-menu-item {
 }


-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	#available-menu-items #available-menu-items-search .accordion-section-content {
 		top: 63px;
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	#available-menu-items #available-menu-items-search .accordion-section-content {
 		top: 130px;
 	}
--- a/wp-admin/css/customize-nav-menus.css
+++ b/wp-admin/css/customize-nav-menus.css
@@ -794,7 +794,7 @@ body.adding-menu-items #customize-preview iframe {
 }

 #accordion-section-add_menu .customize-add-menu-button {
-	font-weight: normal;
+	font-weight: 400;
 }

 #create-new-menu-submit {
@@ -874,13 +874,13 @@ li.assigned-to-menu-location .add-new-menu-item {
 }


-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	#available-menu-items #available-menu-items-search .accordion-section-content {
 		top: 63px;
 	}
 }

-@media screen and ( max-width: 640px ) {
+@media screen and (max-width: 640px) {
 	#available-menu-items #available-menu-items-search .accordion-section-content {
 		top: 130px;
 	}
--- a/wp-admin/css/customize-widgets-rtl.css
+++ b/wp-admin/css/customize-widgets-rtl.css
@@ -235,6 +235,11 @@
 	width: auto !important;
 }

+/* Keep rule that is no longer necessary on widgets.php. */
+#available-widgets .widget-action {
+	display: none;
+}
+
 .ios #available-widgets {
 	transition: right 0s;
 }
--- a/wp-admin/css/customize-widgets-rtl.min.css
+++ b/wp-admin/css/customize-widgets-rtl.min.css
--- a/wp-admin/css/customize-widgets.css
+++ b/wp-admin/css/customize-widgets.css
@@ -235,6 +235,11 @@
 	width: auto !important;
 }

+/* Keep rule that is no longer necessary on widgets.php. */
+#available-widgets .widget-action {
+	display: none;
+}
+
 .ios #available-widgets {
 	transition: left 0s;
 }
--- a/wp-admin/css/customize-widgets.min.css
+++ b/wp-admin/css/customize-widgets.min.css
--- a/wp-admin/css/dashboard-rtl.css
+++ b/wp-admin/css/dashboard-rtl.css
@@ -141,7 +141,6 @@

 .welcome-panel .welcome-panel-close {
 	position: absolute;
-	z-index: 10;
 	top: 10px;
 	left: 10px;
 	padding: 10px 21px 10px 15px;
@@ -166,7 +165,7 @@
 }

 .welcome-panel-content {
-	margin: 0 13px;
+	margin-right: 13px;
 	max-width: 1500px;
 }

@@ -203,7 +202,7 @@
 }

 .welcome-panel .welcome-panel-column ul {
-		margin: 0.8em 0 1em 1em;
+	margin: 0.8em 0 1em 1em;
 }

 .welcome-panel .welcome-panel-column li {
@@ -246,6 +245,11 @@
 	top: -1px;
 }

+.welcome-panel .welcome-setup-home:before {
+	content: "\f102";
+	top: -1px;
+}
+
 .welcome-panel .welcome-view-site:before {
 	content: "\f115";
 	top: -2px;
@@ -390,7 +394,7 @@
 .community-events li {
 	margin: 0;
 	padding: 8px 12px;
-	color: #72777c;
+	color: #32373c;
 }
 .community-events li:first-child {
 	border-top: 1px solid #eee;
@@ -1117,6 +1121,28 @@ a.rsswidget {
 	font-size: 16px;
 }

+/* PHP Nag */
+#dashboard_php_nag .dashicons-warning {
+	color: #ffb900;
+	padding-left: 6px;
+}
+
+#dashboard_php_nag.php-insecure .dashicons-warning {
+	color: #df3232;
+}
+
+#dashboard_php_nag p {
+	margin: 12px 0;
+}
+
+#dashboard_php_nag h3 {
+	font-weight: 600;
+}
+
+#dashboard_php_nag .button .dashicons-external {
+	line-height: 25px;
+}
+
 /* =Media Queries
 -------------------------------------------------------------- */

@@ -1224,9 +1250,10 @@ a.rsswidget {
 	.welcome-panel .welcome-panel-column ul {
 		margin: 0.4em 0 0;
 	}
+
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	#dashboard_recent_comments #the-comment-list .comment-item .avatar {
 		height: 30px;
 		width: 30px;
--- a/wp-admin/css/dashboard-rtl.min.css
+++ b/wp-admin/css/dashboard-rtl.min.css
--- a/wp-admin/css/dashboard.css
+++ b/wp-admin/css/dashboard.css
@@ -141,7 +141,6 @@

 .welcome-panel .welcome-panel-close {
 	position: absolute;
-	z-index: 10;
 	top: 10px;
 	right: 10px;
 	padding: 10px 15px 10px 21px;
@@ -166,7 +165,7 @@
 }

 .welcome-panel-content {
-	margin: 0 13px;
+	margin-left: 13px;
 	max-width: 1500px;
 }

@@ -203,7 +202,7 @@
 }

 .welcome-panel .welcome-panel-column ul {
-		margin: 0.8em 1em 1em 0;
+	margin: 0.8em 1em 1em 0;
 }

 .welcome-panel .welcome-panel-column li {
@@ -246,6 +245,11 @@
 	top: -1px;
 }

+.welcome-panel .welcome-setup-home:before {
+	content: "\f102";
+	top: -1px;
+}
+
 .welcome-panel .welcome-view-site:before {
 	content: "\f115";
 	top: -2px;
@@ -390,7 +394,7 @@
 .community-events li {
 	margin: 0;
 	padding: 8px 12px;
-	color: #72777c;
+	color: #32373c;
 }
 .community-events li:first-child {
 	border-top: 1px solid #eee;
@@ -1117,6 +1121,28 @@ a.rsswidget {
 	font-size: 16px;
 }

+/* PHP Nag */
+#dashboard_php_nag .dashicons-warning {
+	color: #ffb900;
+	padding-right: 6px;
+}
+
+#dashboard_php_nag.php-insecure .dashicons-warning {
+	color: #df3232;
+}
+
+#dashboard_php_nag p {
+	margin: 12px 0;
+}
+
+#dashboard_php_nag h3 {
+	font-weight: 600;
+}
+
+#dashboard_php_nag .button .dashicons-external {
+	line-height: 25px;
+}
+
 /* =Media Queries
 -------------------------------------------------------------- */

@@ -1224,9 +1250,10 @@ a.rsswidget {
 	.welcome-panel .welcome-panel-column ul {
 		margin: 0.4em 0 0;
 	}
+
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	#dashboard_recent_comments #the-comment-list .comment-item .avatar {
 		height: 30px;
 		width: 30px;
--- a/wp-admin/css/dashboard.min.css
+++ b/wp-admin/css/dashboard.min.css
--- a/wp-admin/css/deprecated-media-rtl.css
+++ b/wp-admin/css/deprecated-media-rtl.css
@@ -206,6 +206,22 @@ span.required {
 	margin: 8px 0;
 }

+#media-upload .tablenav-pages a,
+#media-upload .tablenav-pages .current {
+	display: inline-block;
+	padding: 4px 5px 6px;
+	font-size: 16px;
+	line-height: 1;
+	text-align: center;
+	text-decoration: none;
+}
+
+#media-upload .tablenav-pages a {
+	min-width: 17px;
+	border: 1px solid #ccc;
+	background: #f7f7f7;
+}
+
 #filter .tablenav select {
 	border-style: solid;
 	border-width: 1px;
@@ -278,11 +294,11 @@ span.required {
 	border-bottom: 1px solid #ddd;
 }

-h3.media-title  {
+h3.media-title {
 	font-size: 1.6em;
 }

-h4.media-sub-title  {
+h4.media-sub-title {
 	border-bottom: 1px solid #ddd;
 	font-size: 1.3em;
 	margin: 12px;
--- a/wp-admin/css/deprecated-media-rtl.min.css
+++ b/wp-admin/css/deprecated-media-rtl.min.css
--- a/wp-admin/css/deprecated-media.css
+++ b/wp-admin/css/deprecated-media.css
@@ -206,6 +206,22 @@ span.required {
 	margin: 8px 0;
 }

+#media-upload .tablenav-pages a,
+#media-upload .tablenav-pages .current {
+	display: inline-block;
+	padding: 4px 5px 6px;
+	font-size: 16px;
+	line-height: 1;
+	text-align: center;
+	text-decoration: none;
+}
+
+#media-upload .tablenav-pages a {
+	min-width: 17px;
+	border: 1px solid #ccc;
+	background: #f7f7f7;
+}
+
 #filter .tablenav select {
 	border-style: solid;
 	border-width: 1px;
@@ -278,11 +294,11 @@ span.required {
 	border-bottom: 1px solid #ddd;
 }

-h3.media-title  {
+h3.media-title {
 	font-size: 1.6em;
 }

-h4.media-sub-title  {
+h4.media-sub-title {
 	border-bottom: 1px solid #ddd;
 	font-size: 1.3em;
 	margin: 12px;
--- a/wp-admin/css/deprecated-media.min.css
+++ b/wp-admin/css/deprecated-media.min.css
--- a/wp-admin/css/edit-rtl.css
+++ b/wp-admin/css/edit-rtl.css
@@ -167,7 +167,7 @@ body.post-new-php .submitbox .submitdelete {
 	border: 0 none;
 	float: left;
 	padding: 0 12px;
-	margin:0;
+	margin: 0;
 }

 .category-add input[type="text"],
@@ -214,7 +214,7 @@ ul.category-tabs li,

 /* Back-compat for pre-4.4 */
 #category-adder h4 {
-    margin: 0;
+	margin: 0;
 }

 .taxonomy-add-new {
@@ -607,10 +607,18 @@ span.wp-media-buttons-icon:before {
 	line-height: 1.4;
 }

+#poststuff .stuffbox h2 {
+	padding: 8px 10px;
+}
+
 #poststuff .inside {
 	margin: 6px 0 0 0;
 }

+#poststuff .stuffbox .inside {
+	margin: 0;
+}
+
 #poststuff .inside #parent_id,
 #poststuff .inside #page_template {
 	max-width: 100%;
@@ -643,7 +651,7 @@ span.wp-media-buttons-icon:before {

 #post-body-content,
 .edit-form-section {
- 	margin-bottom: 20px;
+	margin-bottom: 20px;
 }

 /* Suggested text for privacy policy */
@@ -1003,11 +1011,11 @@ a.post-state-format.format-link:before {
 }

 div.tabs-panel-active {
-	display:block;
+	display: block;
 }

 div.tabs-panel-inactive {
-	display:none;
+	display: none;
 }

 #front-page-warning,
@@ -1094,8 +1102,12 @@ span.description,
  13.0 - Tags
 ------------------------------------------------------------------------------*/

+#poststuff .tagsdiv .ajaxtag {
+	margin-top: 1em;
+}
+
 #poststuff .tagsdiv .howto {
-	margin: 0 0 6px 0;
+	margin: 1em 0 6px 0;
 }

 .ajaxtag .newtag {
@@ -1187,9 +1199,6 @@ p.popular-tags a {

 .edit-tag-actions {
 	margin-top: 20px;
-	overflow: hidden;
-	padding: 10px;
-	margin-left: 10px;
 }

 /* Comments */
@@ -1209,7 +1218,7 @@ p.popular-tags a {
 }

 .comment-ays .comment-content a[href]:after {
-	content: '(' attr( href ) ')';
+	content: "(" attr( href ) ")";
 	display: inline-block;
 	padding: 0 4px;
 	color: #72777C;
@@ -1222,7 +1231,7 @@ p.popular-tags a {
 }

 .comment-ays .comment-content p.edit-comment a[href]:after {
-	content: '';
+	content: "";
 	padding: 0;
 }

@@ -1246,6 +1255,15 @@ p.popular-tags a {

 .stuffbox .editcomment {
 	clear: none;
+	margin-top: 0;
+}
+
+#namediv.stuffbox .editcomment input {
+	width: 100%;
+}
+
+#namediv.stuffbox .editcomment.form-table td {
+	padding: 10px;
 }

 #comment-status-radio p {
@@ -1426,7 +1444,7 @@ table.links-table {
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.wp-core-ui .edit-tag-actions .button-primary {
 		margin-bottom: 0;
 	}
@@ -1439,12 +1457,20 @@ table.links-table {
 		padding: 10px 10px;
 	}

+	#poststuff .stuffbox .inside {
+		padding: 0 0 4px 2px;
+	}
+
 	#poststuff h3.hndle, /* Back-compat for pre-4.4 */
 	#poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
 	#poststuff h2 {
 		padding: 12px;
 	}

+	#namediv.stuffbox .editcomment.form-table td {
+		padding: 5px 10px;
+	}
+
 	.post-format-options {
 		padding-left: 0;
 	}
@@ -1651,11 +1677,11 @@ table.links-table {
 	.links-table td {
 		padding: 10px 0;
 	}
-	
+
 	.privacy-text-box {
 		width: auto;
 	}
-	
+
 	.privacy-text-box-toc {
 		float: none;
 		width: auto;
--- a/wp-admin/css/edit-rtl.min.css
+++ b/wp-admin/css/edit-rtl.min.css
--- a/wp-admin/css/edit.css
+++ b/wp-admin/css/edit.css
@@ -167,7 +167,7 @@ body.post-new-php .submitbox .submitdelete {
 	border: 0 none;
 	float: right;
 	padding: 0 12px;
-	margin:0;
+	margin: 0;
 }

 .category-add input[type="text"],
@@ -214,7 +214,7 @@ ul.category-tabs li,

 /* Back-compat for pre-4.4 */
 #category-adder h4 {
-    margin: 0;
+	margin: 0;
 }

 .taxonomy-add-new {
@@ -607,10 +607,18 @@ span.wp-media-buttons-icon:before {
 	line-height: 1.4;
 }

+#poststuff .stuffbox h2 {
+	padding: 8px 10px;
+}
+
 #poststuff .inside {
 	margin: 6px 0 0 0;
 }

+#poststuff .stuffbox .inside {
+	margin: 0;
+}
+
 #poststuff .inside #parent_id,
 #poststuff .inside #page_template {
 	max-width: 100%;
@@ -643,7 +651,7 @@ span.wp-media-buttons-icon:before {

 #post-body-content,
 .edit-form-section {
- 	margin-bottom: 20px;
+	margin-bottom: 20px;
 }

 /* Suggested text for privacy policy */
@@ -1003,11 +1011,11 @@ a.post-state-format.format-link:before {
 }

 div.tabs-panel-active {
-	display:block;
+	display: block;
 }

 div.tabs-panel-inactive {
-	display:none;
+	display: none;
 }

 #front-page-warning,
@@ -1094,8 +1102,12 @@ span.description,
  13.0 - Tags
 ------------------------------------------------------------------------------*/

+#poststuff .tagsdiv .ajaxtag {
+	margin-top: 1em;
+}
+
 #poststuff .tagsdiv .howto {
-	margin: 0 0 6px 0;
+	margin: 1em 0 6px 0;
 }

 .ajaxtag .newtag {
@@ -1187,9 +1199,6 @@ p.popular-tags a {

 .edit-tag-actions {
 	margin-top: 20px;
-	overflow: hidden;
-	padding: 10px;
-	margin-right: 10px;
 }

 /* Comments */
@@ -1209,7 +1218,7 @@ p.popular-tags a {
 }

 .comment-ays .comment-content a[href]:after {
-	content: '(' attr( href ) ')';
+	content: "(" attr( href ) ")";
 	display: inline-block;
 	padding: 0 4px;
 	color: #72777C;
@@ -1222,7 +1231,7 @@ p.popular-tags a {
 }

 .comment-ays .comment-content p.edit-comment a[href]:after {
-	content: '';
+	content: "";
 	padding: 0;
 }

@@ -1246,6 +1255,15 @@ p.popular-tags a {

 .stuffbox .editcomment {
 	clear: none;
+	margin-top: 0;
+}
+
+#namediv.stuffbox .editcomment input {
+	width: 100%;
+}
+
+#namediv.stuffbox .editcomment.form-table td {
+	padding: 10px;
 }

 #comment-status-radio p {
@@ -1426,7 +1444,7 @@ table.links-table {
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.wp-core-ui .edit-tag-actions .button-primary {
 		margin-bottom: 0;
 	}
@@ -1439,12 +1457,20 @@ table.links-table {
 		padding: 10px 10px;
 	}

+	#poststuff .stuffbox .inside {
+		padding: 0 2px 4px 0;
+	}
+
 	#poststuff h3.hndle, /* Back-compat for pre-4.4 */
 	#poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
 	#poststuff h2 {
 		padding: 12px;
 	}

+	#namediv.stuffbox .editcomment.form-table td {
+		padding: 5px 10px;
+	}
+
 	.post-format-options {
 		padding-right: 0;
 	}
@@ -1651,11 +1677,11 @@ table.links-table {
 	.links-table td {
 		padding: 10px 0;
 	}
-	
+
 	.privacy-text-box {
 		width: auto;
 	}
-	
+
 	.privacy-text-box-toc {
 		float: none;
 		width: auto;
--- a/wp-admin/css/edit.min.css
+++ b/wp-admin/css/edit.min.css
--- a/wp-admin/css/forms-rtl.css
+++ b/wp-admin/css/forms-rtl.css
@@ -52,6 +52,8 @@ select:focus,
 textarea:focus {
 	border-color: #5b9dd9;
 	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 }

 /* rtl:ignore */
@@ -228,18 +230,20 @@ textarea[readonly] {
 }

 ::-moz-placeholder {
-   color: #72777c;
-   opacity: 1;
+	color: #72777c;
+	opacity: 1;
 }

 :-ms-input-placeholder {
 	color: #72777c;
 }

-.form-invalid input, .form-invalid input:focus,
-.form-invalid select, .form-invalid select:focus {
+.form-invalid input,
+.form-invalid input:focus,
+.form-invalid select,
+.form-invalid select:focus {
 	border-color: #dc3232 !important;
- box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 );
+	box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 );
 }

 .form-table .form-required.form-invalid td:after {
@@ -252,11 +256,11 @@ textarea[readonly] {

 /* Adjust error indicator for password layout */
 .form-table .form-required.user-pass1-wrap.form-invalid td:after {
-	content: '';
+	content: "";
 }

 .form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after {
-	content: '\f534';
+	content: "\f534";
 	font: normal 20px/1 dashicons;
 	color: #dc3232;
 	margin: 0 -29px 0 6px;
@@ -504,7 +508,7 @@ fieldset label,
 }

 .pw-weak {
-	display:none;
+	display: none;
 }

 .indicator-hint {
@@ -972,8 +976,8 @@ table.form-table td .updated p {
 }

 #request-filesystem-credentials-title {
-    font-size: 1.3em;
-    margin: 1em 0;
+	font-size: 1.3em;
+	margin: 1em 0;
 }

 .request-filesystem-credentials-form legend {
@@ -1155,18 +1159,18 @@ table.form-table td .updated p {
 }

 .status-label {
-	font-weight: bold;
+	font-weight: 600;
 }

 .status-label.status-request-pending {
-	font-weight: normal;
+	font-weight: 400;
 	font-style: italic;
 	color: #6c7781;
 }

 .status-label.status-request-failed {
 	color: #aa0000;
-	font-weight: bold;
+	font-weight: 600;
 }

 .wp-privacy-request-form {
@@ -1178,7 +1182,7 @@ table.form-table td .updated p {
 }

 .wp-privacy-request-form label {
-	font-weight: bold;
+	font-weight: 600;
 	line-height: 1.5;
 	padding-bottom: .5em;
 	display: block;
@@ -1214,7 +1218,7 @@ table.form-table td .updated p {
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	/* Input Elements */
 	textarea {
 		-webkit-appearance: none;
@@ -1490,21 +1494,21 @@ table.form-table td .updated p {

 	/* Privacy Policy settings screen */
 	.tools-privacy-policy-page form.wp-create-privacy-page {
-	    margin-bottom: 1em;
+		margin-bottom: 1em;
 	}

- 	.tools-privacy-policy-page input#set-page,
+	.tools-privacy-policy-page input#set-page,
 	.tools-privacy-policy-page select {
 		margin: 10px 0 0;
 	}

 	.tools-privacy-policy-page .wp-create-privacy-page span {
-	    display: block;
-	    margin-bottom: 1em;
+		display: block;
+		margin-bottom: 1em;
 	}

 	.tools-privacy-policy-page .wp-create-privacy-page .button {
-	    margin-right: 0;
+		margin-right: 0;
 	}

 	.wp-list-table.privacy_requests tr:not(.inline-edit-row):not(.no-items) td.column-primary:not(.check-column) {
@@ -1527,7 +1531,7 @@ table.form-table td .updated p {
 	}

 	.form-wrap .form-field {
-		padding:0;
+		padding: 0;
 	}

 	/* users */
@@ -1538,7 +1542,7 @@ table.form-table td .updated p {
 }

@media only screen and (max-height: 480px), screen and (max-width: 450px) {
-	/*  Request Credentials / File Editor Warning */
+	/* Request Credentials / File Editor Warning */
 	.request-filesystem-credentials-dialog .notification-dialog,
 	.file-editor-warning .notification-dialog {
 		width: 100%;
--- a/wp-admin/css/forms-rtl.min.css
+++ b/wp-admin/css/forms-rtl.min.css
--- a/wp-admin/css/forms.css
+++ b/wp-admin/css/forms.css
@@ -52,6 +52,8 @@ select:focus,
 textarea:focus {
 	border-color: #5b9dd9;
 	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 }

 /* rtl:ignore */
@@ -228,18 +230,20 @@ textarea[readonly] {
 }

 ::-moz-placeholder {
-   color: #72777c;
-   opacity: 1;
+	color: #72777c;
+	opacity: 1;
 }

 :-ms-input-placeholder {
 	color: #72777c;
 }

-.form-invalid input, .form-invalid input:focus,
-.form-invalid select, .form-invalid select:focus {
+.form-invalid input,
+.form-invalid input:focus,
+.form-invalid select,
+.form-invalid select:focus {
 	border-color: #dc3232 !important;
- box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 );
+	box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 );
 }

 .form-table .form-required.form-invalid td:after {
@@ -252,11 +256,11 @@ textarea[readonly] {

 /* Adjust error indicator for password layout */
 .form-table .form-required.user-pass1-wrap.form-invalid td:after {
-	content: '';
+	content: "";
 }

 .form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after {
-	content: '\f534';
+	content: "\f534";
 	font: normal 20px/1 dashicons;
 	color: #dc3232;
 	margin: 0 6px 0 -29px;
@@ -504,7 +508,7 @@ fieldset label,
 }

 .pw-weak {
-	display:none;
+	display: none;
 }

 .indicator-hint {
@@ -972,8 +976,8 @@ table.form-table td .updated p {
 }

 #request-filesystem-credentials-title {
-    font-size: 1.3em;
-    margin: 1em 0;
+	font-size: 1.3em;
+	margin: 1em 0;
 }

 .request-filesystem-credentials-form legend {
@@ -1155,18 +1159,18 @@ table.form-table td .updated p {
 }

 .status-label {
-	font-weight: bold;
+	font-weight: 600;
 }

 .status-label.status-request-pending {
-	font-weight: normal;
+	font-weight: 400;
 	font-style: italic;
 	color: #6c7781;
 }

 .status-label.status-request-failed {
 	color: #aa0000;
-	font-weight: bold;
+	font-weight: 600;
 }

 .wp-privacy-request-form {
@@ -1178,7 +1182,7 @@ table.form-table td .updated p {
 }

 .wp-privacy-request-form label {
-	font-weight: bold;
+	font-weight: 600;
 	line-height: 1.5;
 	padding-bottom: .5em;
 	display: block;
@@ -1214,7 +1218,7 @@ table.form-table td .updated p {
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	/* Input Elements */
 	textarea {
 		-webkit-appearance: none;
@@ -1490,21 +1494,21 @@ table.form-table td .updated p {

 	/* Privacy Policy settings screen */
 	.tools-privacy-policy-page form.wp-create-privacy-page {
-	    margin-bottom: 1em;
+		margin-bottom: 1em;
 	}

- 	.tools-privacy-policy-page input#set-page,
+	.tools-privacy-policy-page input#set-page,
 	.tools-privacy-policy-page select {
 		margin: 10px 0 0;
 	}

 	.tools-privacy-policy-page .wp-create-privacy-page span {
-	    display: block;
-	    margin-bottom: 1em;
+		display: block;
+		margin-bottom: 1em;
 	}

 	.tools-privacy-policy-page .wp-create-privacy-page .button {
-	    margin-left: 0;
+		margin-left: 0;
 	}

 	.wp-list-table.privacy_requests tr:not(.inline-edit-row):not(.no-items) td.column-primary:not(.check-column) {
@@ -1527,7 +1531,7 @@ table.form-table td .updated p {
 	}

 	.form-wrap .form-field {
-		padding:0;
+		padding: 0;
 	}

 	/* users */
@@ -1538,7 +1542,7 @@ table.form-table td .updated p {
 }

@media only screen and (max-height: 480px), screen and (max-width: 450px) {
-	/*  Request Credentials / File Editor Warning */
+	/* Request Credentials / File Editor Warning */
 	.request-filesystem-credentials-dialog .notification-dialog,
 	.file-editor-warning .notification-dialog {
 		width: 100%;
--- a/wp-admin/css/forms.min.css
+++ b/wp-admin/css/forms.min.css
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -558,7 +558,7 @@ table.ie-fixed {
 }

 #update-nav-menu #post-body {
-	overflow:hidden;
+	overflow: hidden;
 }

 .menu li {
@@ -639,7 +639,7 @@ input[type="password"],
 .mce-btn i.mce-i-wp_page,
 .mce-btn i.mce-i-hr,
 .mce-close {
-	font-family: 'tinymce', Arial;
+	font-family: tinymce, Arial;
 	font-style: normal;
 	font-weight: 400;
 	font-variant: normal;
@@ -650,12 +650,12 @@ input[type="password"],

 .mce-btn i.mce-i-wp_fullscreen,
 .qt-fullscreen {
-	-ie7-icon: '\e023';
+	-ie7-icon: "\e023";
 }

 .mce-btn i.mce-i-wp_more,
 .mce-btn i.mce-i-wp_page {
-	-ie7-icon: '\e027';
+	-ie7-icon: "\e027";
 }

 .mce-btn i.mce-i-wp_adv {
@@ -664,7 +664,7 @@ input[type="password"],

 .mce-btn i.mce-i-help,
 .mce-btn i.mce-i-wp_help {
-	-ie7-icon: '\e016';
+	-ie7-icon: "\e016";
 }


--- a/wp-admin/css/ie-rtl.min.css
+++ b/wp-admin/css/ie-rtl.min.css
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -558,7 +558,7 @@ table.ie-fixed {
 }

 #update-nav-menu #post-body {
-	overflow:hidden;
+	overflow: hidden;
 }

 .menu li {
@@ -639,7 +639,7 @@ input[type="password"],
 .mce-btn i.mce-i-wp_page,
 .mce-btn i.mce-i-hr,
 .mce-close {
-	font-family: 'tinymce', Arial;
+	font-family: tinymce, Arial;
 	font-style: normal;
 	font-weight: 400;
 	font-variant: normal;
@@ -650,12 +650,12 @@ input[type="password"],

 .mce-btn i.mce-i-wp_fullscreen,
 .qt-fullscreen {
-	-ie7-icon: '\e023';
+	-ie7-icon: "\e023";
 }

 .mce-btn i.mce-i-wp_more,
 .mce-btn i.mce-i-wp_page {
-	-ie7-icon: '\e027';
+	-ie7-icon: "\e027";
 }

 .mce-btn i.mce-i-wp_adv {
@@ -664,7 +664,7 @@ input[type="password"],

 .mce-btn i.mce-i-help,
 .mce-btn i.mce-i-wp_help {
-	-ie7-icon: '\e016';
+	-ie7-icon: "\e016";
 }


--- a/wp-admin/css/ie.min.css
+++ b/wp-admin/css/ie.min.css
--- a/wp-admin/css/install-rtl.css
+++ b/wp-admin/css/install-rtl.css
@@ -63,7 +63,7 @@ ul, ol, dl {
 }

 a img {
-	border:0
+	border: 0
 }
 abbr {
 	border: 0;
@@ -84,7 +84,7 @@ label {
 	margin: 6px 0 14px 0;
 	padding: 0 0 7px 0;
 	border-bottom: none;
-	text-align:center
+	text-align: center
 }
 #logo a {
 	background-image: url(../images/w-logo-blue.png?ver=20131202);
@@ -107,10 +107,6 @@ label {
 	display: block;
 }

-#logo a:focus {
-	box-shadow: none;
-}
-
 .step {
 	margin: 20px 0 15px;
 }
@@ -334,7 +330,7 @@ body.rtl,
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {

 	.form-table {
 		margin-top: 0;
--- a/wp-admin/css/install-rtl.min.css
+++ b/wp-admin/css/install-rtl.min.css
--- a/wp-admin/css/install.css
+++ b/wp-admin/css/install.css
@@ -63,7 +63,7 @@ ul, ol, dl {
 }

 a img {
-	border:0
+	border: 0
 }
 abbr {
 	border: 0;
@@ -84,7 +84,7 @@ label {
 	margin: 6px 0 14px 0;
 	padding: 0 0 7px 0;
 	border-bottom: none;
-	text-align:center
+	text-align: center
 }
 #logo a {
 	background-image: url(../images/w-logo-blue.png?ver=20131202);
@@ -107,10 +107,6 @@ label {
 	display: block;
 }

-#logo a:focus {
-	box-shadow: none;
-}
-
 .step {
 	margin: 20px 0 15px;
 }
@@ -334,7 +330,7 @@ body.rtl,
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {

 	.form-table {
 		margin-top: 0;
--- a/wp-admin/css/install.min.css
+++ b/wp-admin/css/install.min.css
--- a/wp-admin/css/list-tables-rtl.css
+++ b/wp-admin/css/list-tables-rtl.css
@@ -243,12 +243,12 @@

 #the-comment-list tr:last-child th,
 #the-comment-list tr:last-child td {
-    box-shadow: none;
+	box-shadow: none;
 }

 #the-comment-list tr.unapproved + tr.approved th,
 #the-comment-list tr.unapproved + tr.approved td {
-    border-top: 1px solid rgba(0, 0, 0, 0.03);
+	border-top: 1px solid rgba(0, 0, 0, 0.03);
 }

 /* table vim shortcuts */
@@ -351,7 +351,7 @@ td.plugin-title p {
 table.media .column-title .media-icon {
 	float: right;
 	min-height: 60px;
- 	margin: 0 0 0 9px;
+	margin: 0 0 0 9px;
 }

 table.media .column-title .media-icon img {
@@ -393,7 +393,7 @@ table.media .column-title .filename {
 }

 #commentsdiv .inside .row-actions {
-	line-height:18px;
+	line-height: 18px;
 }

 #commentsdiv .inside .column-author {
@@ -495,8 +495,8 @@ th.asc a:focus span.sorting-indicator:before {
 }

 .wp-list-table .toggle-row:focus:before {
-    box-shadow:
-    	0 0 0 1px #5b9dd9,
+	box-shadow:
+		0 0 0 1px #5b9dd9,
 		0 0 2px 1px rgba(30, 140, 190, .8);
 }

@@ -610,15 +610,9 @@ th.asc a:focus span.sorting-indicator {
 	visibility: visible;
 }

-/* Bulk Actions */
-.tablenav-pages a,
-.tablenav-pages-navspan {
-	font-weight: 600;
-	padding: 0 2px;
-}
-
 .tablenav-pages .current-page {
 	margin: 0 0 0 2px;
+	padding-top: 5px;
 	padding-bottom: 5px;
 	font-size: 13px;
 	text-align: center;
@@ -632,12 +626,6 @@ th.asc a:focus span.sorting-indicator {
 	margin-right: 2px;
 }

-.tablenav a.button,
-.tablenav a.button-secondary {
-	display: block;
-	margin: 3px 0 0 8px;
-}
-
 .tablenav {
 	clear: both;
 	height: 30px;
@@ -651,10 +639,7 @@ th.asc a:focus span.sorting-indicator {

 .tablenav .tablenav-pages {
 	float: left;
-	height: 28px;
-	margin-top: 3px;
-	cursor: default;
-	color: #555;
+	margin: 3px 0 9px;
 }

 .tablenav .no-pages,
@@ -662,49 +647,26 @@ th.asc a:focus span.sorting-indicator {
 	display: none;
 }

-.tablenav .tablenav-pages a,
-.tablenav-pages span.current  {
-	text-decoration: none;
-	padding: 3px 6px;
-}
-
-.tablenav .tablenav-pages a,
-.tablenav-pages-navspan {
+.tablenav .tablenav-pages .button,
+.tablenav .tablenav-pages .tablenav-pages-navspan {
 	display: inline-block;
-	min-width: 17px;
-	border: 1px solid #ccc; /* same color as buttons border */
-	padding: 3px 5px 7px;
-	background: #e5e5e5;
+	vertical-align: baseline;
+	min-width: 28px;
+	min-height: 28px;
+	margin: 0;
+	padding: 0 4px;
 	font-size: 16px;
-	line-height: 1;
-	font-weight: 400;
+	line-height: 1.5;
 	text-align: center;
 }

-.tablenav-pages-navspan {
-	height: 16px;
-	border-color: #ddd; /* same as disabled buttons */
-	background: #f7f7f7; /* same as disabled buttons */
-	color: #a0a5aa; /* same as disabled buttons */
-}
-
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
-	border-color: #5b9dd9;
-	color: #fff;
-	background: #00a0d2;
-	box-shadow: none;
-	outline: none; /* IE8 */
-}
-
 .tablenav .displaying-num {
 	margin-left: 7px;
 }

 .tablenav .one-page .displaying-num {
 	display: inline-block;
-	margin-top: 5px;
-	margin-left: 0;
+	margin: 5px 0;
 }

 .tablenav .actions {
@@ -721,24 +683,7 @@ th.asc a:focus span.sorting-indicator {
 	margin-left: 20px;
 }

-/* @todo: unclear if the following tablenav rules are actually used.
-classes exist in paginate_links() but not seen in list table output. */
-.tablenav .dots {
-	border-color: transparent;
-}
-
-.tablenav .next,
-.tablenav .prev {
-	border-color: transparent;
-	color: #0073aa;
-}
-
-.tablenav .next:hover,
-.tablenav .prev:hover {
-	border-color: transparent;
-	color: #00a0d2;
-}
-
+/* This view-switcher is still used on multisite. */
 .tablenav .view-switch {
 	float: left;
 	margin: 0 5px;
@@ -1350,6 +1295,12 @@ ul.cat-checklist {
 	margin: 0.5em 0;
 }

+.plugins .plugin-description a,
+.plugins .plugin-update a,
+.updates-table .plugin-title a {
+	text-decoration: underline;
+}
+
 .plugin-card .update-now:before {
 	color: #f56e28;
 	content: "\f463";
@@ -1422,7 +1373,7 @@ ul.cat-checklist {
 	margin-left: 0;
 }

-@media screen and ( min-width: 1600px ) {
+@media screen and (min-width: 1600px) and ( max-width: 2299px ) {
 	.plugin-card {
 		width: 30%;
 		width: calc( 33.1% - 8px );
@@ -1447,6 +1398,31 @@ ul.cat-checklist {
 	}
 }

+@media screen and (min-width: 2300px) {
+	.plugin-card {
+		width: 25%;
+		width: calc( 25% - 12px );
+	}
+
+	.plugin-card:nth-child(odd) {
+		clear: none;
+		margin-right: 8px;
+	}
+
+	.plugin-card:nth-child(even) {
+		margin-left: 8px;
+	}
+
+	.plugin-card:nth-child(4n+1) {
+		clear: both;
+		margin-right: 0;
+	}
+
+	.plugin-card:nth-child(4n) {
+		margin-left: 0;
+	}
+}
+
 .plugin-card-top {
 	position: relative;
 	padding: 20px 20px 10px;
@@ -1555,12 +1531,18 @@ div.action-links,
 	color: #444;
 }

-.plugin-card .compatibility-incompatible:before {
+.plugin-card .column-compatibility .compatibility-incompatible:before {
 	content: "\f158";
+	color: #c62d2d;
 }

-.plugin-card .compatibility-compatible:before {
+.plugin-card .column-compatibility .compatibility-compatible:before {
 	content: "\f147";
+	color: #31843f;
+}
+
+.plugin-card .notice {
+	margin: 20px 20px 0 20px;
 }

 .plugin-icon {
@@ -1612,7 +1594,7 @@ div.action-links,
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 1100px ) and ( min-width: 782px ), ( max-width: 480px ) {
+@media screen and (max-width: 1100px) and (min-width: 782px), (max-width: 480px) {
 	.plugin-card .action-links {
 		position: static;
 		margin-right: 148px;
@@ -1648,7 +1630,7 @@ div.action-links,
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	/* WP List Table Options & Filters */
 	.tablenav {
 		height: auto;
@@ -1697,7 +1679,6 @@ div.action-links,

 	.tablenav .tablenav-pages {
 		width: 100%;
-		height: auto;
 		text-align: center;
 		margin: 0 0 25px;
 	}
@@ -1719,19 +1700,19 @@ div.action-links,
 		font-size: 16px;
 	}

-	.tablenav-pages .pagination-links a,
-	.tablenav-pages-navspan {
-		padding: 9px 11px 12px;
+	.tablenav .tablenav-pages .button,
+	.tablenav .tablenav-pages .tablenav-pages-navspan {
+		min-width: 44px;
+		padding: 12px 8px;
 		font-size: 18px;
-	}
-
-	.tablenav-pages-navspan {
-		height: 18px;
+		line-height: 1;
 	}

 	.tablenav-pages .pagination-links .current-page {
-		padding: 8px 9px 9px;
+		min-width: 44px;
+		padding: 12px 6px;
 		font-size: 16px;
+		line-height: 18px;
 	}

 	/* WP List Table Adjustments: General */
@@ -1808,6 +1789,11 @@ div.action-links,
 		display: block;
 	}

+	/* Comment author hidden via Screen Options */
+	.fixed .column-author.hidden ~ .column-comment .comment-author {
+		display: none;
+	}
+
 	#the-comment-list .is-expanded td {
 		box-shadow: none;
 	}
@@ -1885,6 +1871,30 @@ div.action-links,
 		word-wrap: normal;
 	}

+	/* Make row actions more easy to select on mobile */
+	body:not(.plugins-php) .row-actions {
+		display: -ms-grid;
+		display: grid;
+		-ms-grid-columns: auto auto auto;
+		grid-template-columns: auto auto auto;
+		color: transparent;
+	}
+
+	.row-actions span {
+		padding: 4px 0;
+	}
+
+	.row-actions span a,
+	.row-actions span .button-link {
+		display: inline-block;
+		padding: 4px 0;
+	}
+
+	.row-actions span.approve:before,
+	.row-actions span.unapprove:before {
+		content: "| ";
+	}
+
 	/* Quick Edit and Bulk Edit */
 	#wpbody-content .quick-edit-row-post .inline-edit-col-left,
 	#wpbody-content .quick-edit-row-post .inline-edit-col-right,
@@ -2004,6 +2014,11 @@ div.action-links,
 		padding: 10px 9px; /* reset from other list tables that have a label at this width */
 	}

+	/* Plugin description hidden via Screen Options */
+	#wpbody-content .wp-list-table.plugins .desc.hidden {
+		display: none;
+	}
+
 	#wpbody-content .wp-list-table.plugins .column-description {
 		padding-top: 2px;
 	}
@@ -2118,11 +2133,17 @@ div.action-links,
 	}
 }

-@media screen and ( max-width: 480px ) {
+@media screen and (max-width: 480px) {
 	.tablenav-pages .current-page {
 		margin: 0;
 	}

+	/* Drop row actions to two columns on a small screen */
+	.row-actions:not(.plugins-php) {
+		-ms-grid-columns: auto auto;
+		grid-template-columns: auto auto;
+	}
+
 	.tablenav-pages .tablenav-paging-text {
 		float: right;
 		width: 100%;
--- a/wp-admin/css/list-tables-rtl.min.css
+++ b/wp-admin/css/list-tables-rtl.min.css
--- a/wp-admin/css/list-tables.css
+++ b/wp-admin/css/list-tables.css
@@ -243,12 +243,12 @@

 #the-comment-list tr:last-child th,
 #the-comment-list tr:last-child td {
-    box-shadow: none;
+	box-shadow: none;
 }

 #the-comment-list tr.unapproved + tr.approved th,
 #the-comment-list tr.unapproved + tr.approved td {
-    border-top: 1px solid rgba(0, 0, 0, 0.03);
+	border-top: 1px solid rgba(0, 0, 0, 0.03);
 }

 /* table vim shortcuts */
@@ -351,7 +351,7 @@ td.plugin-title p {
 table.media .column-title .media-icon {
 	float: left;
 	min-height: 60px;
- 	margin: 0 9px 0 0;
+	margin: 0 9px 0 0;
 }

 table.media .column-title .media-icon img {
@@ -393,7 +393,7 @@ table.media .column-title .filename {
 }

 #commentsdiv .inside .row-actions {
-	line-height:18px;
+	line-height: 18px;
 }

 #commentsdiv .inside .column-author {
@@ -495,8 +495,8 @@ th.asc a:focus span.sorting-indicator:before {
 }

 .wp-list-table .toggle-row:focus:before {
-    box-shadow:
-    	0 0 0 1px #5b9dd9,
+	box-shadow:
+		0 0 0 1px #5b9dd9,
 		0 0 2px 1px rgba(30, 140, 190, .8);
 }

@@ -610,15 +610,9 @@ th.asc a:focus span.sorting-indicator {
 	visibility: visible;
 }

-/* Bulk Actions */
-.tablenav-pages a,
-.tablenav-pages-navspan {
-	font-weight: 600;
-	padding: 0 2px;
-}
-
 .tablenav-pages .current-page {
 	margin: 0 2px 0 0;
+	padding-top: 5px;
 	padding-bottom: 5px;
 	font-size: 13px;
 	text-align: center;
@@ -632,12 +626,6 @@ th.asc a:focus span.sorting-indicator {
 	margin-left: 2px;
 }

-.tablenav a.button,
-.tablenav a.button-secondary {
-	display: block;
-	margin: 3px 8px 0 0;
-}
-
 .tablenav {
 	clear: both;
 	height: 30px;
@@ -651,10 +639,7 @@ th.asc a:focus span.sorting-indicator {

 .tablenav .tablenav-pages {
 	float: right;
-	height: 28px;
-	margin-top: 3px;
-	cursor: default;
-	color: #555;
+	margin: 3px 0 9px;
 }

 .tablenav .no-pages,
@@ -662,49 +647,26 @@ th.asc a:focus span.sorting-indicator {
 	display: none;
 }

-.tablenav .tablenav-pages a,
-.tablenav-pages span.current  {
-	text-decoration: none;
-	padding: 3px 6px;
-}
-
-.tablenav .tablenav-pages a,
-.tablenav-pages-navspan {
+.tablenav .tablenav-pages .button,
+.tablenav .tablenav-pages .tablenav-pages-navspan {
 	display: inline-block;
-	min-width: 17px;
-	border: 1px solid #ccc; /* same color as buttons border */
-	padding: 3px 5px 7px;
-	background: #e5e5e5;
+	vertical-align: baseline;
+	min-width: 28px;
+	min-height: 28px;
+	margin: 0;
+	padding: 0 4px;
 	font-size: 16px;
-	line-height: 1;
-	font-weight: 400;
+	line-height: 1.5;
 	text-align: center;
 }

-.tablenav-pages-navspan {
-	height: 16px;
-	border-color: #ddd; /* same as disabled buttons */
-	background: #f7f7f7; /* same as disabled buttons */
-	color: #a0a5aa; /* same as disabled buttons */
-}
-
-.tablenav .tablenav-pages a:hover,
-.tablenav .tablenav-pages a:focus {
-	border-color: #5b9dd9;
-	color: #fff;
-	background: #00a0d2;
-	box-shadow: none;
-	outline: none; /* IE8 */
-}
-
 .tablenav .displaying-num {
 	margin-right: 7px;
 }

 .tablenav .one-page .displaying-num {
 	display: inline-block;
-	margin-top: 5px;
-	margin-right: 0;
+	margin: 5px 0;
 }

 .tablenav .actions {
@@ -721,24 +683,7 @@ th.asc a:focus span.sorting-indicator {
 	margin-right: 20px;
 }

-/* @todo: unclear if the following tablenav rules are actually used.
-classes exist in paginate_links() but not seen in list table output. */
-.tablenav .dots {
-	border-color: transparent;
-}
-
-.tablenav .next,
-.tablenav .prev {
-	border-color: transparent;
-	color: #0073aa;
-}
-
-.tablenav .next:hover,
-.tablenav .prev:hover {
-	border-color: transparent;
-	color: #00a0d2;
-}
-
+/* This view-switcher is still used on multisite. */
 .tablenav .view-switch {
 	float: right;
 	margin: 0 5px;
@@ -1350,6 +1295,12 @@ ul.cat-checklist {
 	margin: 0.5em 0;
 }

+.plugins .plugin-description a,
+.plugins .plugin-update a,
+.updates-table .plugin-title a {
+	text-decoration: underline;
+}
+
 .plugin-card .update-now:before {
 	color: #f56e28;
 	content: "\f463";
@@ -1422,7 +1373,7 @@ ul.cat-checklist {
 	margin-right: 0;
 }

-@media screen and ( min-width: 1600px ) {
+@media screen and (min-width: 1600px) and ( max-width: 2299px ) {
 	.plugin-card {
 		width: 30%;
 		width: calc( 33.1% - 8px );
@@ -1447,6 +1398,31 @@ ul.cat-checklist {
 	}
 }

+@media screen and (min-width: 2300px) {
+	.plugin-card {
+		width: 25%;
+		width: calc( 25% - 12px );
+	}
+
+	.plugin-card:nth-child(odd) {
+		clear: none;
+		margin-left: 8px;
+	}
+
+	.plugin-card:nth-child(even) {
+		margin-right: 8px;
+	}
+
+	.plugin-card:nth-child(4n+1) {
+		clear: both;
+		margin-left: 0;
+	}
+
+	.plugin-card:nth-child(4n) {
+		margin-right: 0;
+	}
+}
+
 .plugin-card-top {
 	position: relative;
 	padding: 20px 20px 10px;
@@ -1555,12 +1531,18 @@ div.action-links,
 	color: #444;
 }

-.plugin-card .compatibility-incompatible:before {
+.plugin-card .column-compatibility .compatibility-incompatible:before {
 	content: "\f158";
+	color: #c62d2d;
 }

-.plugin-card .compatibility-compatible:before {
+.plugin-card .column-compatibility .compatibility-compatible:before {
 	content: "\f147";
+	color: #31843f;
+}
+
+.plugin-card .notice {
+	margin: 20px 20px 0 20px;
 }

 .plugin-icon {
@@ -1612,7 +1594,7 @@ div.action-links,
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 1100px ) and ( min-width: 782px ), ( max-width: 480px ) {
+@media screen and (max-width: 1100px) and (min-width: 782px), (max-width: 480px) {
 	.plugin-card .action-links {
 		position: static;
 		margin-left: 148px;
@@ -1648,7 +1630,7 @@ div.action-links,
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	/* WP List Table Options & Filters */
 	.tablenav {
 		height: auto;
@@ -1697,7 +1679,6 @@ div.action-links,

 	.tablenav .tablenav-pages {
 		width: 100%;
-		height: auto;
 		text-align: center;
 		margin: 0 0 25px;
 	}
@@ -1719,19 +1700,19 @@ div.action-links,
 		font-size: 16px;
 	}

-	.tablenav-pages .pagination-links a,
-	.tablenav-pages-navspan {
-		padding: 9px 11px 12px;
+	.tablenav .tablenav-pages .button,
+	.tablenav .tablenav-pages .tablenav-pages-navspan {
+		min-width: 44px;
+		padding: 12px 8px;
 		font-size: 18px;
-	}
-
-	.tablenav-pages-navspan {
-		height: 18px;
+		line-height: 1;
 	}

 	.tablenav-pages .pagination-links .current-page {
-		padding: 8px 9px 9px;
+		min-width: 44px;
+		padding: 12px 6px;
 		font-size: 16px;
+		line-height: 18px;
 	}

 	/* WP List Table Adjustments: General */
@@ -1808,6 +1789,11 @@ div.action-links,
 		display: block;
 	}

+	/* Comment author hidden via Screen Options */
+	.fixed .column-author.hidden ~ .column-comment .comment-author {
+		display: none;
+	}
+
 	#the-comment-list .is-expanded td {
 		box-shadow: none;
 	}
@@ -1885,6 +1871,30 @@ div.action-links,
 		word-wrap: normal;
 	}

+	/* Make row actions more easy to select on mobile */
+	body:not(.plugins-php) .row-actions {
+		display: -ms-grid;
+		display: grid;
+		-ms-grid-columns: auto auto auto;
+		grid-template-columns: auto auto auto;
+		color: transparent;
+	}
+
+	.row-actions span {
+		padding: 4px 0;
+	}
+
+	.row-actions span a,
+	.row-actions span .button-link {
+		display: inline-block;
+		padding: 4px 0;
+	}
+
+	.row-actions span.approve:before,
+	.row-actions span.unapprove:before {
+		content: "| ";
+	}
+
 	/* Quick Edit and Bulk Edit */
 	#wpbody-content .quick-edit-row-post .inline-edit-col-left,
 	#wpbody-content .quick-edit-row-post .inline-edit-col-right,
@@ -2004,6 +2014,11 @@ div.action-links,
 		padding: 10px 9px; /* reset from other list tables that have a label at this width */
 	}

+	/* Plugin description hidden via Screen Options */
+	#wpbody-content .wp-list-table.plugins .desc.hidden {
+		display: none;
+	}
+
 	#wpbody-content .wp-list-table.plugins .column-description {
 		padding-top: 2px;
 	}
@@ -2118,11 +2133,17 @@ div.action-links,
 	}
 }

-@media screen and ( max-width: 480px ) {
+@media screen and (max-width: 480px) {
 	.tablenav-pages .current-page {
 		margin: 0;
 	}

+	/* Drop row actions to two columns on a small screen */
+	.row-actions:not(.plugins-php) {
+		-ms-grid-columns: auto auto;
+		grid-template-columns: auto auto;
+	}
+
 	.tablenav-pages .tablenav-paging-text {
 		float: left;
 		width: 100%;
--- a/wp-admin/css/list-tables.min.css
+++ b/wp-admin/css/list-tables.min.css
--- a/wp-admin/css/login-rtl.css
+++ b/wp-admin/css/login-rtl.css
@@ -79,22 +79,22 @@ p {
 }

 .login .password-input-wrapper {
-    display: table;
+	display: table;
 }

 .login .input.password-input {
-    display: table-cell;
-    margin: 0;
+	display: table-cell;
+	margin: 0;
 }

 .login .pw-weak {
-    margin-bottom: 15px;
+	margin-bottom: 15px;
 }

 .login .button.button-secondary {
-    display: table-cell;
-    border-radius: 0;
-    vertical-align: middle;
+	display: table-cell;
+	border-radius: 0;
+	vertical-align: middle;
 }

 .login form {
@@ -263,13 +263,13 @@ body.interim-login {
 	width: device-width;
 }

-@media screen and ( max-height: 550px ) {
+@media screen and (max-height: 550px) {
 	#login {
 		padding: 20px 0;
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.interim-login input[type=checkbox] {
 		height: 16px;
 		width: 16px;
--- a/wp-admin/css/login-rtl.min.css
+++ b/wp-admin/css/login-rtl.min.css
--- a/wp-admin/css/login.css
+++ b/wp-admin/css/login.css
@@ -79,22 +79,22 @@ p {
 }

 .login .password-input-wrapper {
-    display: table;
+	display: table;
 }

 .login .input.password-input {
-    display: table-cell;
-    margin: 0;
+	display: table-cell;
+	margin: 0;
 }

 .login .pw-weak {
-    margin-bottom: 15px;
+	margin-bottom: 15px;
 }

 .login .button.button-secondary {
-    display: table-cell;
-    border-radius: 0;
-    vertical-align: middle;
+	display: table-cell;
+	border-radius: 0;
+	vertical-align: middle;
 }

 .login form {
@@ -263,13 +263,13 @@ body.interim-login {
 	width: device-width;
 }

-@media screen and ( max-height: 550px ) {
+@media screen and (max-height: 550px) {
 	#login {
 		padding: 20px 0;
 	}
 }

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 782px) {
 	.interim-login input[type=checkbox] {
 		height: 16px;
 		width: 16px;
--- a/wp-admin/css/login.min.css
+++ b/wp-admin/css/login.min.css
--- a/Show More
+++ b/Show More