Tag 4.5.21

Built from https://develop.svn.wordpress.org/tags/4.5.21@47716 git-svn-id: http://core.svn.wordpress.org/tags/4.5.21@47493 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Update the About page for WordPress 4.5.21
2020-04-29 18:51:07 +00:00 · 2020-04-29 18:32:21 +00:00 · 2020-04-29 18:02:27 +00:00 · 2020-04-29 16:43:22 +00:00 · 2020-04-29 16:26:23 +00:00 · 2019-12-12 20:30:20 +00:00
1926 changed files with 129553 additions and 695628 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/license.txt
+++ b/license.txt
@@ -1,6 +1,6 @@
 WordPress - Web publishing software

-Copyright 2011-2019 by the contributors
+Copyright 2011-2018 by the contributors

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/readme.html
+++ b/readme.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <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 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/forums/">WordPress 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 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><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>
@@ -48,20 +48,19 @@
 </ol>

 <h2>Migrating from other systems</h2>
-<p>WordPress can <a href="https://wordpress.org/support/article/importing-content/">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php">our import tools</a>.</p>
+<p>WordPress can <a href="https://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php" title="Import to WordPress">our import tools</a>.</p>

 <h2>System Requirements</h2>
 <ul>
-	<li><a href="https://secure.php.net/">PHP</a> version <strong>5.6.20</strong> or higher.</li>
-	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or higher.</li>
+	<li><a href="http://php.net/">PHP</a> version <strong>5.2.4</strong> or higher.</li>
+	<li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or higher.</li>
 </ul>

 <h3>Recommendations</h3>
 <ul>
-	<li><a href="https://secure.php.net/">PHP</a> version <strong>7.3</strong> or higher.</li>
-	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.6</strong> or higher.</li>
-	<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
-	<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
+	<li><a href="http://php.net/">PHP</a> version <strong>5.6</strong> or higher.</li>
+	<li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.6</strong> or higher.</li>
+	<li>The <a href="http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
 	<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
 </ul>

@@ -74,25 +73,25 @@
 		<dd>This is where you&#8217;ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.</dd>
 	<dt><a href="https://planet.wordpress.org/">WordPress Planet</a></dt>
 		<dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.</dd>
-	<dt><a href="https://wordpress.org/support/forums/">WordPress Support Forums</a></dt>
+	<dt><a href="https://wordpress.org/support/">WordPress Support Forums</a></dt>
 		<dd>If you&#8217;ve looked everywhere and still can&#8217;t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
-	<dt><a href="https://codex.wordpress.org/IRC">WordPress <abbr>IRC</abbr> (Internet Relay Chat) Channel</a></dt>
+	<dt><a href="https://codex.wordpress.org/IRC">WordPress <abbr title="Internet Relay Chat">IRC</abbr> Channel</a></dt>
 		<dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
 </dl>

 <h2>Final Notes</h2>
 <ul>
-	<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="https://wordpress.org/support/forums/">Support Forums</a>.</li>
-	<li>WordPress has a robust plugin <abbr>API</abbr> (Application Programming Interface) that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="https://developer.wordpress.org/plugins/">Plugin Developer Handbook</a>. You shouldn&#8217;t modify any of the core code.</li>
+	<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="https://wordpress.org/support/">Support Forums</a>.</li>
+	<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="https://codex.wordpress.org/Plugin_API" title="WordPress plugin API">plugin documentation in the Codex</a>. You shouldn&#8217;t modify any of the core code.</li>
 </ul>

 <h2>Share the Love</h2>
 <p>WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better&#8212;you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgable than yourself, or writing the author of a media article that overlooks us.</p>

-<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="https://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="https://wordpress.org/donate/">donating</a>.</p>
+<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="https://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="https://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>

 <h2>License</h2>
-<p>WordPress is free software, and is released under the terms of the <abbr>GPL</abbr> (GNU General Public License) version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
+<p>WordPress is free software, and is released under the terms of the <abbr title="GNU General Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>

 </body>
 </html>
--- 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;
@@ -62,11 +62,8 @@ 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;
@@ -79,28 +76,24 @@ $wp_query->is_404 = false;
 do_action( 'activate_header' );

 /**
- * Adds an action hook specific to this page.
+ * Adds an action hook specific to this page that fires on wp_head
 *
- * Fires on {@see 'wp_head'}.
- *
- * @since MU (3.0.0)
+ * @since MU
 */
 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' );
+    /**
+     * Fires before the Site Activation page is loaded, but on the wp_head action.
+     *
+     * @since 3.0.0
+     */
+    do_action( 'activate_wp_head' );
 }
 add_action( 'wp_head', 'do_activate_header' );

 /**
 * Loads styles specific to this page.
 *
- * @since MU (3.0.0)
+ * @since MU
 */
 function wpmu_activate_stylesheet() {
 	?>
@@ -109,7 +102,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: 600; }
+		span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: bold; }
 	</style>
 	<?php
 }
@@ -123,84 +116,57 @@ 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();
 			?>
-			<h2><?php _e( 'Your account is now active!' ); ?></h2>
+			<h2><?php _e('Your account is now active!'); ?></h2>
 			<?php
 			echo '<p class="lead-in">';
 			if ( $signup->domain . $signup->path == '' ) {
-				printf(
-					/* translators: 1: Login URL, 2: Username, 3: User email address, 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,
-					$signup->user_email,
-					wp_lostpassword_url()
-				);
+				printf( __('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, $signup->user_email, wp_lostpassword_url() );
 			} else {
-				printf(
-					/* translators: 1: Site URL, 2: Username, 3: User email address, 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,
-					$signup->user_email,
-					wp_lostpassword_url()
-				);
+				printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$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="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() );
 			}
 			echo '</p>';
 		} elseif ( $result === null || is_wp_error( $result ) ) {
 			?>
-			<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
-			<?php if ( is_wp_error( $result ) ) : ?>
-				<p><?php echo $result->get_error_message(); ?></p>
-			<?php endif; ?>
+			<h2><?php _e('An error occurred during the activation'); ?></h2>
+			<?php if ( is_wp_error( $result ) ) {
+				echo '<p>' . $result->get_error_message() . '</p>';
+			} ?>
 			<?php
 		} else {
-			$url  = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+			$url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (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
-					/* 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
-					/* 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 class="view"><?php 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 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;
 		}
 	}
 	?>
@@ -210,5 +176,4 @@ 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
@@ -9,568 +9,337 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

-/* translators: Page title of the About WordPress page in the admin. */
-$title = _x( 'About', 'page title' );
+if ( current_user_can( 'customize' ) ) {
+	wp_enqueue_script( 'customize-loader' );
+}

-list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+$video_url = 'https://videopress.com/embed/scFdjVo6?hd=true';
+$locale    = str_replace( '_', '-', get_locale() );
+list( $locale ) = explode( '-', $locale );
+if ( 'en' !== $locale ) {
+	$video_url = add_query_arg( 'defaultLangCode', $locale, $video_url );
+}
+
+$title = __( 'About' );
+
+list( $display_version ) = explode( '-', $wp_version );

 include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
-	<div class="wrap about__container">
+	<div class="wrap about-wrap">
+		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>

-		<div class="about__header">
-			<div class="about__header-title">
-				<h1>
-					<span><?php echo $display_version; ?></span>
-					<?php _e( 'WordPress' ); ?>
-				</h1>
-			</div>
+		<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s streamlines your workflow, whether you&#8217;re writing or building your site.' ), $display_version ); ?></div>
+		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

-			<div class="about__header-badge"></div>
+		<h2 class="nav-tab-wrapper wp-clearfix">
+			<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
+			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+		</h2>

-			<div class="about__header-text">
-				<p>
-					<?php
-					printf(
-						/* translators: %s: The current WordPress version number. */
-						__( 'Introducing our most refined user experience with the improved block editor in WordPress %s!' ),
-						$display_version
-					);
-					?>
-				</p>
-			</div>
-
-			<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-				<a href="about.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'What&#8217;s New' ); ?></a>
-				<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-				<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-				<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-			</nav>
-		</div>
-
-		<div class="about__section changelog">
-			<div class="column">
-				<h2><?php _e( 'Maintenance and Security Releases' ); ?></h2>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.16'
-					);
-					?>
-					<?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.3.16' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.15'
-					);
-					?>
-					<?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.3.15' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.14'
-					);
-					?>
-					<?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.3.14' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.13'
-					);
-					?>
-					<?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.3.13' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed one security issue.' ),
-						'5.3.12'
-					);
-					?>
-					<?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.3.12' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.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.3.11' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed one security issue.' ),
-						'5.3.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.3.10' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.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.3.9' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.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.3.8' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed one security issue.' ),
-						'5.3.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.3.8' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.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.3.7' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?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.',
-							1
-						),
-						'5.3.6',
-						number_format_i18n( 1 )
-					);
-					?>
-					<?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.3.6' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.3.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.3.5' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-						_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.',
-							2
-						),
-						'5.3.4',
-						number_format_i18n( 2 )
-					);
-					?>
-					<?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.3.4' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-						_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.',
-							10
-						),
-						'5.3.3',
-						number_format_i18n( 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.3.3' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-						_n(
-							'<strong>Version %1$s</strong> addressed %2$s bug.',
-							'<strong>Version %1$s</strong> addressed %2$s bugs.',
-							5
-						),
-						'5.3.2',
-						number_format_i18n( 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.3.2' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-						_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.',
-							46
-						),
-						'5.3.1',
-						number_format_i18n( 46 )
-					);
-					?>
-					<?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.3.1' )
-						)
-					);
-					?>
-				</p>
-			</div>
-		</div>
-
-		<hr />
-
-		<div class="about__section is-feature">
+		<div class="changelog point-releases">
+			<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
 			<p>
-				<?php _e( '5.3 expands and refines the block editor introduced in WordPress 5.0 with a new block, more intuitive interactions, and improved accessibility. New features in the editor increase design freedoms, provide additional layout options and style variations to allow designers complete control over the look of a site. This release also introduces the Twenty Twenty theme giving the user more design flexibility and integration with the block editor. Creating beautiful web pages and advanced layouts has never been easier.' ); ?>
+				<?php
+				printf(
+					/* translators: %s: WordPress version number */
+					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					'4.5.21'
+				);
+				?>
+				<?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( '4.5.21' )
+					)
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: %s: WordPress version number */
+					__( '<strong>Version %s</strong> addressed one security issue.' ),
+					'4.5.20'
+				);
+				?>
+				<?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( '4.5.20' )
+					)
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: %s: WordPress version number */
+					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					'4.5.19'
+				);
+				?>
+				<?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( '4.5.19' )
+					)
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+				/* translators: %s: WordPress version number */
+					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					'4.5.18'
+				);
+				?>
+				<?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( '4.5.18' )
+					)
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: %s: WordPress version number */
+					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					'4.5.17'
+				);
+				?>
+				<?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( '4.5.17' )
+					)
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				/* translators: %s: WordPress version number */
+				printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.16' );
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.16' );
+				?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed one security issue.' ), '4.5.15' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.15' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.14' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.14' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed one security issue.' ), '4.5.13' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.13' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.12' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.12' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed one security issue.' ), '4.5.11' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.11' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.10' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.10' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.9' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.9' ); ?>
+			</p>
+			<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
+					'<strong>Version %1$s</strong> addressed %2$s bugs.', 1 ), '4.5.8', number_format_i18n( 1 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.8' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.7' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.7' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.6' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.6' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.5' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.5' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.4' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.4' ); ?>
+			</p>
+			<p><?php printf( _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.', 17 ), '4.5.3', number_format_i18n( 17 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.3' ); ?>
+			</p>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.5.2' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.2' ); ?>
+			</p>
+			<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
+				'<strong>Version %1$s</strong> addressed %2$s bugs.', 12 ), '4.5.1', number_format_i18n( 12 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.5.1' ); ?>
 			</p>
 		</div>

-		<hr />
-
-		<div class="about__section has-2-columns">
-			<div class="column is-edge-to-edge has-accent-background-color">
-				<div class="about__image aligncenter">
-					<img src="data:image/svg+xml;charset=utf8,%3Csvg width='660' height='818' viewbox='0 0 660 818' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='99' y='178' width='132' height='132' fill='%23F4EFE1'/%3E%3Crect x='231' y='310' width='99' height='99' fill='%2344141E'/%3E%3Crect x='330' y='409' width='132' height='132' fill='%23F4EFE1'/%3E%3Crect x='462' y='541' width='99' height='99' fill='%2344141E'/%3E%3C/svg%3E" alt="" />
-				</div>
-			</div>
-			<div class="column is-vertically-aligned-center">
-				<h2><?php _e( 'Block Editor Improvements' ); ?></h2>
-				<p>
-					<?php _e( 'This enhancement-focused update introduces over 150 new features and usability improvements, including improved large image support for uploading non-optimized, high-resolution pictures taken from your smartphone or other high-quality cameras. Combined with larger default image sizes, pictures always look their best.' ); ?>
-				</p>
-
-				<p>
-					<?php _e( 'Accessibility improvements include the integration of block editor styles in the admin interface. These improved styles fix many accessibility issues: color contrast on form fields and buttons, consistency between editor and admin interfaces, new snackbar notices, standardizing to the default WordPress color scheme, and the introduction of Motion to make interacting with your blocks feel swift and natural. For people who use a keyboard to navigate the dashboard, the block editor now has a Navigation mode. This lets you jump from block to block without tabbing through every part of the block controls.' ); ?>
-				</p>
-			</div>
+		<div class="headline-feature feature-video" style="background-color:#191E23;">
+			<iframe width="1050" height="591" src="<?php echo esc_url( $video_url ); ?>" frameborder="0" allowfullscreen></iframe>
+			<script src="https://videopress.com/videopress-iframe.js"></script>
 		</div>

-		<div class="about__section has-2-columns">
-			<div class="column is-vertically-aligned-center">
-				<h2><?php _e( 'Expanded Design Flexibility' ); ?></h2>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: The current WordPress version number. */
-						__( 'WordPress %s adds even more robust tools for creating amazing designs.' ),
-						$display_version
-					);
-					?>
-				</p>
-				<ul>
-					<li><?php _e( 'The new Group block lets you easily divide your page into colorful sections' ); ?></li>
-					<li><?php _e( 'The Columns block now supports fixed column widths' ); ?></li>
-					<li><?php _e( 'The new Predefined layouts make it a cinch to arrange content into advanced designs' ); ?></li>
-					<li><?php _e( 'Heading blocks now offer controls for text color' ); ?></li>
-					<li><?php _e( 'Additional style options allow you to set your preferred style for any block that supports this feature' ); ?></li>
-				</ul>
-			</div>
-			<div class="column is-edge-to-edge has-accent-background-color">
-				<div class="about__image aligncenter">
-					<img src="data:image/svg+xml;charset=utf8,%3Csvg width='500' height='500' viewbox='0 0 500 500' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='75' y='200' width='150' height='75' fill='%2344141E'/%3E%3Crect x='175' y='75' width='50' height='100' fill='%2385273B'/%3E%3Crect x='75' y='75' width='75' height='100' fill='%23F4EFE1'/%3E%3Crect x='250' y='200' width='175' height='75' fill='%2344141E'/%3E%3Crect x='350' y='75' width='75' height='100' fill='%2385273B'/%3E%3Crect x='250' y='75' width='75' height='100' fill='%23F4EFE1'/%3E%3Crect x='75' y='375' width='150' height='50' fill='%2344141E'/%3E%3Crect x='175' y='300' width='50' height='50' fill='%2385273B'/%3E%3Crect x='75' y='300' width='75' height='50' fill='%23F4EFE1'/%3E%3Crect x='250' y='372.5' width='175' height='52.5' fill='%2344141E'/%3E%3Crect x='350' y='300' width='75' height='50' fill='%2385273B'/%3E%3Crect x='250' y='300' width='75' height='50' fill='%23F4EFE1'/%3E%3C/svg%3E%0A" alt="">
-				</div>
-			</div>
-		</div>
+		<hr>

-		<div class="about__section has-2-columns has-subtle-background-color">
-			<div class="column is-vertically-aligned-center">
-				<h2><?php _e( 'Introducing Twenty Twenty' ); ?></h2>
-				<p><?php _e( 'As the block editor celebrates its first birthday, we are proud that Twenty Twenty is designed with flexibility at its core. Show off your services or products with a combination of columns, groups, and media blocks. Set your content to wide or full alignment for dynamic and engaging layouts. Or let your thoughts be the star with a centered content column!' ); ?></p>
-
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to the Inter font website. */
-						__( 'As befits a theme called Twenty Twenty, clarity and readability is also a big focus. The theme includes the typeface <a href="%s">Inter</a>, designed by Rasmus Andersson. Inter comes in a Variable Font version, a first for default themes, which keeps load times short by containing all weights and styles of Inter in just two font files.' ),
-						'https://rsms.me/inter/'
-					);
-					?>
-				</p>
+		<div class="feature-section two-col">
+			<h2><?php _e( 'Editing Improvements' ); ?></h2>
+			<div class="col">
+				<img src="https://s.w.org/images/core/4.5/link-edit-560.png" alt="" srcset="https://s.w.org/images/core/4.5/link-edit-1000.png 1000w, https://s.w.org/images/core/4.5/link-edit-800.png 800w, https://s.w.org/images/core/4.5/link-edit-680.png 680w, https://s.w.org/images/core/4.5/link-edit-560.png 560w, https://s.w.org/images/core/4.5/link-edit-400.png 400w, https://s.w.org/images/core/4.5/link-edit-280.png 280w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px"/>
+				<h3><?php _e( 'Inline Linking' ); ?></h3>
+				<p><?php _e( 'Stay focused on your writing with a less distracting interface that keeps you in place and allows you to easily link to your content.' ); ?></p>
 			</div>
-			<div class="column is-edge-to-edge">
-				<div class="about__image aligncenter">
-					<img src="https://s.w.org/images/core/5.3/twentytwenty-mobile.png" alt="" />
-				</div>
-			</div>
-		</div>
-
-		<div class="about__section has-subtle-background-color">
-			<div class="column is-edge-to-edge">
-				<div class="about__image aligncenter">
-					<img src="https://s.w.org/images/core/5.3/twentytwenty-desktop.png" alt="" />
-				</div>
+			<div class="col">
+				<img src="https://s.w.org/images/core/4.5/formatting-560.png" alt="" srcset="https://s.w.org/images/core/4.5/formatting-1000.png 1000w, https://s.w.org/images/core/4.5/formatting-800.png 800w, https://s.w.org/images/core/4.5/formatting-680.png 680w, https://s.w.org/images/core/4.5/formatting-560.png 560w, https://s.w.org/images/core/4.5/formatting-400.png 400w, https://s.w.org/images/core/4.5/formatting-280.png 280w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px"/>
+				<h3><?php _e( 'Formatting Shortcuts' ); ?></h3>
+				<p><?php _e( 'Do you enjoy using formatting shortcuts for lists and headings? Now they&#8217;re even more useful, with horizontal lines and <code>&lt;code&gt;</code>.' ); ?></p>
 			</div>
 		</div>

 		<hr />

-		<div class="about__section has-3-columns">
-			<h2 class="is-section-header"><?php _e( 'Improvements for Everyone' ); ?></h2>
-
-			<div class="column">
-				<h3><?php _e( 'Automatic Image Rotation' ); ?></h3>
-				<p><?php _e( 'Your images will be correctly rotated upon upload according to the embedded orientation data. This feature was first proposed nine years ago and made possible through the perserverance of many dedicated contributors.' ); ?></p>
+		<div class="feature-section two-col">
+			<h2><?php _e( 'Customization Improvements' ); ?></h2>
+			<div class="col">
+				<img src="https://s.w.org/images/core/4.5/preview-icons-560.png" alt="" srcset="https://s.w.org/images/core/4.5/preview-icons-1000.png 1000w, https://s.w.org/images/core/4.5/preview-icons-800.png 800w, https://s.w.org/images/core/4.5/preview-icons-680.png 680w, https://s.w.org/images/core/4.5/preview-icons-560.png 560w, https://s.w.org/images/core/4.5/preview-icons-400.png 400w, https://s.w.org/images/core/4.5/preview-icons-280.png 280w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px"/>
+				<h3><?php _e( 'Live Responsive Previews' ); ?></h3>
+				<p><?php _e( 'Make sure your site looks great on all screens!' ); ?>
+					<?php
+					if ( current_user_can( 'customize' ) ) {
+						$customize_url = admin_url( 'customize.php' );
+						printf(
+							/* translators: %s: URL to customizer */
+							__( 'Preview mobile, tablet, and desktop views directly in the <a href="%s" class="load-customize">customizer</a>.' ),
+							esc_url( $customize_url )
+						);
+					} else {
+						_e( 'Preview mobile, tablet, and desktop views directly in the customizer.' );
+					}
+				?></p>
 			</div>
-			<div class="column">
-				<h3><?php _e( 'Site Health Checks' ); ?></h3>
-				<p><?php _e( 'The improvements introduced in 5.3 make it even easier to identify issues. Expanded recommendations highlight areas that may need troubleshooting on your site from the Health Check screen.' ); ?></p>
-			</div>
-			<div class="column">
-				<h3><?php _e( 'Admin Email Verification' ); ?></h3>
-				<p><?php _e( 'You’ll now be periodically asked to confirm that your admin email address is up to date when you log in as an administrator. This reduces the chance of getting locked out of your site if you change your email address.' ); ?></p>
+			<div class="col">
+				<img src="https://s.w.org/images/core/4.5/custom-logos-560.png" alt="" srcset="https://s.w.org/images/core/4.5/custom-logos-1000.png 1000w, https://s.w.org/images/core/4.5/custom-logos-800.png 800w, https://s.w.org/images/core/4.5/custom-logos-680.png 680w, https://s.w.org/images/core/4.5/custom-logos-560.png 560w, https://s.w.org/images/core/4.5/custom-logos-400.png 400w, https://s.w.org/images/core/4.5/custom-logos-280.png 280w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px"/>
+				<h3><?php _e( 'Custom Logos' ); ?></h3>
+				<p><?php _e( 'Themes can now support logos for your business or brand.' ); ?>
+					<?php
+					if ( current_theme_supports( 'custom-logo' ) && current_user_can( 'customize' ) ) {
+						printf(
+							/* translators: %s: URL to Site Identity section of the customizer */
+							__( 'Your theme supports custom logos! Try it out right now in the <a href="%s" class="load-customize">Site Identity</a> section of the customizer.' ),
+							esc_url( add_query_arg( array( 'autofocus' => array( 'section' => 'title_tagline' ) ), $customize_url ) )
+						);
+					} else {
+						_e( 'The Twenty Fifteen and Twenty Sixteen themes have been updated to support custom logos, which can be found in the Site Identity section of the customizer.' );
+					}
+					?></p>
 			</div>
 		</div>

-		<div class="about__section">
-			<div class="column is-edge-to-edge">
-				<div class="about__image aligncenter">
-					<img src="data:image/svg+xml;charset=utf8,%3Csvg width='1000' height='498' viewbox='0 0 1000 498' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='865.463' y='36.8596' width='133.8' height='132.326' fill='%23942F44'/%3E%3Crect x='865.463' y='180.98' width='133.8' height='132.326' fill='%23942F44'/%3E%3Crect x='866.2' y='328.05' width='133.8' height='132.694' fill='%23942F44'/%3E%3Crect y='331.736' width='405.455' height='134.169' fill='%234E1521'/%3E%3Crect y='36.8596' width='405.455' height='129.008' fill='%234E1521'/%3E%3Crect y='184.298' width='387.025' height='133.8' fill='%234E1521'/%3E%3Crect x='719.13' y='34.6479' width='133.8' height='428.677' fill='%23BD3854'/%3E%3Crect x='571.323' y='18.4297' width='133.8' height='423.885' fill='%23BD3854'/%3E%3Crect x='423.516' y='35.0164' width='133.8' height='425.728' fill='%23BD3854'/%3E%3C/svg%3E" alt="" />
+		<hr />
+
+		<div class="changelog">
+			<h2><?php _e( 'Under the Hood' ); ?></h2>
+
+			<div class="under-the-hood three-col">
+				<div class="col">
+					<h3><?php _e( 'Selective Refresh' ); ?></h3>
+					<p><?php
+						printf(
+							/* translators: %s: URL to the development post of the new feature */
+							__( 'The customizer now supports a <a href="%s">comprehensive framework</a> for rendering parts of the preview without rewriting your PHP code in JavaScript.' ),
+							'https://make.wordpress.org/core/2016/02/16/selective-refresh-in-the-customizer/'
+						);
+						if ( current_user_can( 'customize' ) && current_user_can( 'edit_theme_options' ) ) {
+							if ( current_theme_supports( 'menus' ) && ! current_theme_supports( 'customize-selective-refresh-widgets' ) ) {
+								printf(
+									/* translators: %s: URL to Menus section of the customizer  */
+									' ' . __( 'See it in action with <a href="%s" class="load-customize">Menus</a>.' ),
+									esc_url( add_query_arg( array( 'autofocus' => array( 'panel' => 'nav_menus' ) ), $customize_url ) )
+								);
+							} elseif ( current_theme_supports( 'customize-selective-refresh-widgets' ) ) { // If widgets are supported, menus are also because of the menus widget.
+								printf(
+									/* translators: 1: URL to Menus section of the customizer, 2: URL to Widgets section of the customizer */
+									' ' . __( 'See it in action with <a href="%1$s" class="load-customize">Menus</a> or <a href="%2$s" class="load-customize">Widgets</a>.' ),
+									esc_url( add_query_arg( array( 'autofocus' => array( 'panel' => 'nav_menus' ) ), $customize_url ) ),
+									esc_url( add_query_arg( array( 'autofocus' => array( 'panel' => 'widgets' ) ), $customize_url ) )
+								);
+							}
+						}
+					?></p>
+				</div>
+				<div class="col">
+					<h3><?php _e( 'Smart Image Resizing' ); ?></h3>
+					<p><?php
+						printf(
+							/* translators: %s: URL to the development post of the new feature */
+							__( 'Generated images now load up to 50&#37; faster with no noticeable quality loss. <a href="%s">It&#8217;s really cool</a>.' ),
+							'https://make.wordpress.org/core/2016/03/12/performance-improvements-for-images-in-wordpress-4-5/'
+						);
+					?></p>
+				</div>
+				<div class="col">
+					<h3><?php _e( 'JavaScript Library Updates' ); ?></h3>
+					<p><?php _e( 'jQuery 1.12.3, jQuery Migrate 1.4.0, Backbone 1.2.3, and Underscore 1.8.3 are bundled.' ); ?></p>
 				</div>
 			</div>
-		</div>

-		<hr />
-
-		<div class="about__section has-2-columns has-subtle-background-color">
-			<h2 class="is-section-header"><?php _e( 'For Developers' ); ?></h2>
-
-			<div class="column">
-				<h3><?php _e( 'Date/Time Component Fixes' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to the date/time developer notes. */
-						__( 'Developers can now work with <a href="%s">dates and timezones</a> in a more reliable way. Date and time functionality has received a number of new API functions for unified timezone retrieval and PHP interoperability, as well as many bug fixes.' ),
-						'https://make.wordpress.org/core/2019/09/23/date-time-improvements-wp-5-3/'
-					);
-					?>
-				</p>
+			<div class="under-the-hood two-col">
+				<div class="col">
+					<h3><?php _e( 'Script Loader Improvements' ); ?></h3>
+					<p><?php
+						printf(
+							/* translators: %s: wp_add_inline_script() */
+							__( 'Better support has been added for script header/footer dependencies. New %s enables adding extra code to registered scripts.' ),
+							'<code><a href="https://make.wordpress.org/core/2016/03/08/enhanced-script-loader-in-wordpress-4-5/">wp_add_inline_script()</a></code>'
+						);
+					?></p>
+				</div>
+				<div class="col">
+					<h3><?php _e( 'Better Embed Templates' ); ?></h3>
+					<p><?php
+						printf(
+							/* translators: %s: URL to the development post of the new feature */
+							__( 'Embed templates have been split into parts and can be <a href="%s">directly overridden by themes</a> via the template hierarchy.' ),
+							'https://make.wordpress.org/core/2016/03/11/embeds-changes-in-wordpress-4-5/'
+						);
+					?></p>
+				</div>
 			</div>
-			<div class="column">
-				<h3><?php _e( 'PHP 7.4 Compatibility' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to the PHP 7 developer notes. */
-						__( 'WordPress 5.3 aims to fully support PHP 7.4. This release contains <a href="%s">multiple changes</a> to remove deprecated functionality and ensure compatibility. WordPress continues to encourage all users to run the latest and greatest versions of PHP.' ),
-						'https://make.wordpress.org/core/2019/10/11/wordpress-and-php-7-4/'
-					);
-					?>
-				</p>
+
+			<div class="return-to-dashboard">
+				<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
+					<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
+						<?php is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' ); ?>
+					</a> |
+				<?php endif; ?>
+				<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>

-		<hr />
-
-		<div class="return-to-dashboard">
-			<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
-				<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
-					<?php is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' ); ?>
-				</a> |
-			<?php endif; ?>
-			<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>
 <?php
@@ -589,40 +358,22 @@ __( 'Security Releases' );
 __( 'Maintenance and Security Release' );
 __( 'Maintenance and Security Releases' );

-/* translators: %s: WordPress version number. */
+/* translators: %s: WordPress version number */
 __( '<strong>Version %s</strong> addressed one security issue.' );
-/* translators: %s: WordPress version number. */
+/* translators: %s: WordPress version number */
 __( '<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.'
-);
+/* 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.' );

-/* 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.'
-);
+/* 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.' );

-/* 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.'
-);
+/* 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.' );

-/* translators: %s: Documentation URL. */
+/* translators: %s: Codex URL */
 __( 'For more information, see <a href="%s">the release notes</a>.' );
-
-/* translators: 1: WordPress version number, 2: Link to update WordPress */
-__( 'Important! Your version of WordPress (%1$s) is no longer supported, you will not receive any security updates for your website. To keep your site secure, please <a href="%2$s">update to the latest version of WordPress</a>.' );
-
-/* translators: 1: WordPress version number, 2: Link to update WordPress */
-__( 'Important! Your version of WordPress (%1$s) will stop receiving security updates in the near future. To keep your site secure, please <a href="%2$s">update to the latest version of WordPress</a>.' );
-
-/* translators: %s: The major version of WordPress for this branch. */
-__( 'This is the final release of WordPress %s' );
-
-/* translators: The localized WordPress download URL. */
-__( 'https://wordpress.org/download/' );
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WordPress Ajax Process Execution
+ * WordPress AJAX Process Execution.
 *
 * @package WordPress
 * @subpackage Administration
@@ -9,7 +9,7 @@
 */

 /**
- * Executing Ajax process.
+ * Executing AJAX process.
 *
 * @since 2.1.0
 */
@@ -24,13 +24,9 @@ require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 /** Allow for cross-domain requests (from the front end). */
 send_origin_headers();

-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-header( 'X-Robots-Tag: noindex' );
-
 // Require an action parameter
-if ( empty( $_REQUEST['action'] ) ) {
-	wp_die( '0', 400 );
-}
+if ( empty( $_REQUEST['action'] ) )
+	die( '0' );

 /** Load WordPress Administration APIs */
 require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -38,6 +34,9 @@ require_once( ABSPATH . 'wp-admin/includes/admin.php' );
 /** Load Ajax Handlers for WordPress Core */
 require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

+@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+@header( 'X-Robots-Tag: noindex' );
+
 send_nosniff_header();
 nocache_headers();

@@ -45,149 +44,59 @@ 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',
-	'rest-nonce',
+	'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',
-	'media-create-image-subsizes',
-	'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',
-	'health-check-site-status-result',
-	'health-check-dotorg-communication',
-	'health-check-is-in-debug-mode',
-	'health-check-background-updates',
-	'health-check-loopback-requests',
-	'health-check-get-sizes',
+	'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', 'press-this-save-post',
+	'press-this-add-category', 'crop-image', 'generate-password', 'save-wporg-username',
 );

 // 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[] = 'wp-fullscreen-save-post';

 // 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_{$action}" ) ) {
-		wp_die( '0', 400 );
-	}
-
 	/**
-	 * Fires authenticated Ajax actions for logged-in users.
+	 * Fires authenticated AJAX actions for logged-in users.
 	 *
-	 * The dynamic portion of the hook name, `$action`, refers
-	 * to the name of the Ajax action callback being fired.
+	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
+	 * refers to the name of the AJAX action callback being fired.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( "wp_ajax_{$action}" );
+	do_action( 'wp_ajax_' . $_REQUEST['action'] );
 } else {
-	// If no action is registered, return a Bad Request response.
-	if ( ! has_action( "wp_ajax_nopriv_{$action}" ) ) {
-		wp_die( '0', 400 );
-	}
-
 	/**
-	 * Fires non-authenticated Ajax actions for logged-out users.
+	 * Fires non-authenticated AJAX actions for logged-out users.
 	 *
-	 * The dynamic portion of the hook name, `$action`, refers
-	 * to the name of the Ajax action callback being fired.
+	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
+	 * refers to the name of the AJAX action callback being fired.
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( "wp_ajax_nopriv_{$action}" );
+	do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
 }
 // Default status
-wp_die( '0' );
+die( '0' );
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -7,14 +7,8 @@
 */

 // don't load directly
-if ( ! defined( 'ABSPATH' ) ) {
-	die( '-1' );
-}
-
-/**
- * @global string $hook_suffix
- */
-global $hook_suffix;
+if ( !defined('ABSPATH') )
+	die('-1');
 ?>

 <div class="clear"></div></div><!-- wpbody-content -->
@@ -32,14 +26,9 @@ global $hook_suffix;
 	?>
 	<p id="footer-left" class="alignleft">
 		<?php
-		$text = sprintf(
-			/* translators: %s: https://wordpress.org/ */
-			__( 'Thank you for creating with <a href="%s">WordPress</a>.' ),
-			__( 'https://wordpress.org/' )
-		);
-
+		$text = sprintf( __( 'Thank you for creating with <a href="%s">WordPress</a>.' ), __( 'https://wordpress.org/' ) );
 		/**
-		 * Filters the "Thank you" text displayed in the admin footer.
+		 * Filter the "Thank you" text displayed in the admin footer.
 		 *
 		 * @since 2.8.0
 		 *
@@ -51,7 +40,7 @@ global $hook_suffix;
 	<p id="footer-upgrade" class="alignright">
 		<?php
 		/**
-		 * Filters the version/update text displayed in the admin footer.
+		 * Filter the version/update text displayed in the admin footer.
 		 *
 		 * WordPress prints the current version and update information,
 		 * using core_update_footer() at priority 10.
@@ -69,7 +58,7 @@ global $hook_suffix;
 </div>
 <?php
 /**
- * Prints scripts or data before the default footer scripts.
+ * Print scripts or data before the default footer scripts.
 *
 * @since 1.2.0
 *
@@ -77,16 +66,6 @@ global $hook_suffix;
 */
 do_action( 'admin_footer', '' );

-/**
- * Prints scripts and data queued for the footer.
- *
- * The dynamic portion of the hook name, `$hook_suffix`,
- * refers to the global hook suffix of the current page.
- *
- * @since 4.6.0
- */
-do_action( "admin_print_footer_scripts-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-
 /**
 * Prints any scripts and data queued for the footer.
 *
@@ -95,20 +74,22 @@ do_action( "admin_print_footer_scripts-{$hook_suffix}" ); // phpcs:ignore WordPr
 do_action( 'admin_print_footer_scripts' );

 /**
- * Prints scripts or data after the default footer scripts.
+ * Print scripts or data after the default footer scripts.
 *
- * The dynamic portion of the hook name, `$hook_suffix`,
+ * The dynamic portion of the hook name, `$GLOBALS['hook_suffix']`,
 * refers to the global hook suffix of the current page.
 *
 * @since 2.8.0
+ *
+ * @global string $hook_suffix
+ * @param string $hook_suffix The current admin page.
 */
-do_action( "admin_footer-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+do_action( "admin_footer-" . $GLOBALS['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', '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,59 +6,47 @@
 * @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.
 *
 * @global string    $title
 * @global string    $hook_suffix
- * @global WP_Screen $current_screen     WordPress current screen object.
- * @global WP_Locale $wp_locale          WordPress date and time locale object.
+ * @global WP_Screen $current_screen
+ * @global WP_Locale $wp_locale
 * @global string    $pagenow
+ * @global string    $wp_version
 * @global string    $update_title
 * @global int       $total_update_count
 * @global string    $parent_file
 */
-global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
+global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version,
 	$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. %s: Network title. */
-	$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
-} elseif ( is_user_admin() ) {
-	/* translators: User dashboard screen title. %s: Network title. */
-	$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
-} else {
+if ( is_network_admin() )
+	$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
+elseif ( is_user_admin() )
+	$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
+else
 	$admin_title = get_bloginfo( 'name' );
-}

-if ( $admin_title == $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. */
+if ( $admin_title == $title )
+	$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
+else
 	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
-}
-
-if ( wp_is_recovery_mode() ) {
-	/* translators: %s: Admin screen title. */
-	$admin_title = sprintf( __( 'Recovery Mode &#8212; %s' ), $admin_title );
-}

 /**
- * Filters the title tag content for an admin page.
+ * Filter the title tag content for an admin page.
 *
 * @since 3.1.0
 *
@@ -76,19 +64,19 @@ _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();}}};
-var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
-	pagenow = '<?php echo esc_js( $current_screen->id ); ?>',
-	typenow = '<?php echo esc_js( $current_screen->post_type ); ?>',
-	adminpage = '<?php echo esc_js( $admin_body_class ); ?>',
-	thousandsSeparator = '<?php echo esc_js( $wp_locale->number_format['thousands_sep'] ); ?>',
-	decimalPoint = '<?php echo esc_js( $wp_locale->number_format['decimal_point'] ); ?>',
+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();}}};
+var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
+	pagenow = '<?php echo $current_screen->id; ?>',
+	typenow = '<?php echo $current_screen->post_type; ?>',
+	adminpage = '<?php echo $admin_body_class; ?>',
+	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
 	isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
 <meta name="viewport" content="width=device-width,initial-scale=1.0">
@@ -108,7 +96,7 @@ do_action( 'admin_enqueue_scripts', $hook_suffix );
 *
 * @since 2.6.0
 */
-do_action( "admin_print_styles-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+do_action( "admin_print_styles-$hook_suffix" );

 /**
 * Fires when styles are printed for all admin pages.
@@ -122,7 +110,7 @@ do_action( 'admin_print_styles' );
 *
 * @since 2.1.0
 */
-do_action( "admin_print_scripts-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+do_action( "admin_print_scripts-$hook_suffix" );

 /**
 * Fires when scripts are printed for all admin pages.
@@ -139,7 +127,7 @@ do_action( 'admin_print_scripts' );
 *
 * @since 2.1.0
 */
-do_action( "admin_head-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+do_action( "admin_head-$hook_suffix" );

 /**
 * Fires in head section for all admin pages.
@@ -148,63 +136,45 @@ do_action( "admin_head-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConven
 */
 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 .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
+$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_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() ) ) );
+$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_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';

-if ( $current_screen->is_block_editor() ) {
-	// Default to is-fullscreen-mode to avoid jumps in the UI.
-	$admin_body_class .= ' block-editor-page is-fullscreen-mode wp-embed-responsive';
-
-	if ( current_theme_supports( 'editor-styles' ) && current_theme_supports( 'dark-editor-style' ) ) {
-		$admin_body_class .= ' is-dark-theme';
-	}
-}
-
 ?>
 </head>
 <?php
 /**
- * Filters the CSS classes for the body tag in the admin.
+ * Filter the CSS classes for the body tag in the admin.
 *
 * This filter differs from the {@see 'post_class'} and {@see 'body_class'} filters
 * in two important ways:
@@ -218,9 +188,8 @@ 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; ?>">
+<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
 <script type="text/javascript">
 	document.body.className = document.body.className.replace('no-js','js');
 </script>
@@ -233,7 +202,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
@@ -247,34 +216,34 @@ do_action( 'in_admin_header' );

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

 $current_screen->set_parentage( $parent_file );

 ?>

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

 $current_screen->render_screen_meta();

 if ( is_network_admin() ) {
 	/**
-	 * Prints network admin screen notices.
+	 * Print network admin screen notices.
 	 *
 	 * @since 3.1.0
 	 */
 	do_action( 'network_admin_notices' );
 } elseif ( is_user_admin() ) {
 	/**
-	 * Prints user admin screen notices.
+	 * Print user admin screen notices.
 	 *
 	 * @since 3.1.0
 	 */
 	do_action( 'user_admin_notices' );
 } else {
 	/**
-	 * Prints admin screen notices.
+	 * Print admin screen notices.
 	 *
 	 * @since 3.1.0
 	 */
@@ -282,12 +251,11 @@ if ( is_network_admin() ) {
 }

 /**
- * Prints generic admin screen notices.
+ * Print generic admin screen notices.
 *
 * @since 3.1.0
 */
 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,16 +13,15 @@ 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();

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

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

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

-if ( ! defined( 'WP_NETWORK_ADMIN' ) ) {
-	define( 'WP_NETWORK_ADMIN', false );
-}
+if ( ! defined('WP_NETWORK_ADMIN') )
+	define('WP_NETWORK_ADMIN', false);

-if ( ! defined( 'WP_USER_ADMIN' ) ) {
-	define( 'WP_USER_ADMIN', false );
-}
+if ( ! defined('WP_USER_ADMIN') )
+	define('WP_USER_ADMIN', false);

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

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

-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+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.
@@ -45,14 +42,13 @@ 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.
+	 * Filter 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
@@ -61,47 +57,35 @@ if ( get_option( 'db_upgraded' ) ) {
 	 * If the network is 50 sites or less, it will run every time. Otherwise,
 	 * it will throttle itself to reduce load.
 	 *
-	 * @since MU (3.0.0)
+	 * @since 3.0.0
 	 *
 	 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
 	 */
-	if ( apply_filters( 'do_mu_upgrade', true ) ) {
+	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
 		$c = get_blog_count();

 		/*
 		 * 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' );
-}
-
-// Schedule Transient cleanup.
-if ( ! wp_next_scheduled( 'delete_expired_transients' ) && ! wp_installing() ) {
-	wp_schedule_event( time(), 'daily', 'delete_expired_transients' );
-}
+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
+	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');

 set_screen_options();

@@ -110,6 +94,9 @@ $time_format = __( 'g:i a' );

 wp_enqueue_script( 'common' );

+
+
+
 /**
 * $pagenow is set in vars.php
 * $wp_importers is sometimes set in wp-admin/includes/import.php
@@ -128,33 +115,44 @@ $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' );
+	/**
+	 * Filter the maximum memory limit available for administration screens.
+	 *
+	 * This only applies to administrators, who may require more memory for tasks like updates.
+	 * Memory limits when processing images (uploaded or edited by users of any role) are
+	 * handled separately.
+	 *
+	 * The WP_MAX_MEMORY_LIMIT constant specifically defines the maximum memory limit available
+	 * when in the administration back end. The default is 256M, or 256 megabytes of memory.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param string 'WP_MAX_MEMORY_LIMIT' The maximum WordPress memory limit. Default 256M.
+	 */
+	@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 }

 /**
@@ -163,36 +161,32 @@ if ( current_user_can( 'manage_options' ) ) {
 * Note, this does not just run on user-facing admin screens.
 * It runs on admin-ajax.php and admin-post.php as well.
 *
- * This is roughly analogous to the more general {@see 'init'} hook, which fires earlier.
+ * This is roughly analogous to the more general 'init' hook, which fires earlier.
 *
 * @since 2.5.0
 */
 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' ) ) {
+		// Backwards compatibility for plugins using add_management_page().
+		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 = '';
@@ -207,7 +201,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.
@@ -229,38 +223,23 @@ if ( isset( $plugin_page ) ) {
 		 *
 		 * @since 2.1.0
 		 */
-		do_action( "load-{$page_hook}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! isset( $_GET['noheader'] ) ) {
-			require_once( ABSPATH . 'wp-admin/admin-header.php' );
-		}
+		do_action( 'load-' . $page_hook );
+		if (! isset($_GET['noheader']))
+			require_once(ABSPATH . 'wp-admin/admin-header.php');

 		/**
 		 * Used to call the registered callback for a plugin screen.
 		 *
-		 * 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()
-		 *
+		 * @ignore
 		 * @since 1.5.0
 		 */
 		do_action( $page_hook );
 	} else {
-		if ( validate_file( $plugin_page ) ) {
-			wp_die( __( 'Invalid plugin page.' ) );
-		}
+		if ( validate_file($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" ) ) ) {
-			/* translators: %s: Admin page generated by a plugin. */
-			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.
@@ -274,36 +253,33 @@ if ( isset( $plugin_page ) ) {
 		 *
 		 * @since 1.5.0
 		 */
-		do_action( "load-{$plugin_page}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+		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'] ) ) {

 	$importer = $_GET['import'];

-	if ( ! current_user_can( 'import' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to import content into this site.' ) );
-	}
+	if ( ! current_user_can('import') )
+		wp_die(__('You are not allowed to import.'));

-	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;
 	}
@@ -315,19 +291,18 @@ if ( isset( $plugin_page ) ) {
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( "load-importer-{$importer}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+	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.
@@ -343,12 +318,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 {
@@ -364,39 +339,35 @@ if ( isset( $plugin_page ) ) {
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( "load-{$pagenow}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+	do_action( 'load-' . $pagenow );

 	/*
 	 * The following hooks are fired to ensure backward compatibility.
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
 	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' ) {
-			do_action( 'load-page-new.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		} elseif ( $pagenow == 'post.php' ) {
-			do_action( 'load-page.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		}
-	} elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' ) {
-			do_action( 'load-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		} elseif ( $taxnow == 'link_category' ) {
-			do_action( 'load-edit-link-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		}
-	} elseif ( 'term.php' === $pagenow ) {
-		do_action( 'load-edit-tags.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+		if ( $pagenow == 'post-new.php' )
+			do_action( 'load-page-new.php' );
+		elseif ( $pagenow == 'post.php' )
+			do_action( 'load-page.php' );
+	}  elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' )
+			do_action( 'load-categories.php' );
+		elseif ( $taxnow == 'link_category' )
+			do_action( 'load-edit-link-categories.php' );
+	} 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, `$action`, refers to
-	 * the action derived from the `GET` or `POST` request.
+	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
+	 * refers to the action derived from the `GET` or `POST` request.
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( "admin_action_{$action}" );
+	do_action( 'admin_action_' . $_REQUEST['action'] );
 }
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Server-side file upload handler from wp-plupload or other asynchronous upload methods.
+ * Server-side file upload handler from wp-plupload, swfupload or other asynchronous upload methods.
 *
 * @package WordPress
 * @subpackage Administration
@@ -14,10 +14,20 @@ 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' );
+
+if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
+	// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
+	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+		$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+	elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+		$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
+		$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
+	unset($current_user);
 }

 require_once( ABSPATH . 'wp-admin/admin.php' );
@@ -35,76 +45,55 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
 }

 if ( ! current_user_can( 'upload_files' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+	wp_die( __( 'You do not have permission to upload files.' ) );
 }

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

 	switch ( $_REQUEST['fetch'] ) {
-		case 3:
-			$thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true );
-			if ( $thumb_url ) {
+		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 ) ) {
-	printf(
-		'<div class="error-div error">%s <strong>%s</strong><br />%s</div>',
-		sprintf(
-			'<button type="button" class="dismiss button-link" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">%s</button>',
-			__( 'Dismiss' )
-		),
-		sprintf(
-			/* translators: %s: Name of the file that failed to upload. */
-			__( '&#8220;%s&#8221; has failed to upload.' ),
-			esc_html( $_FILES['async-upload']['name'] )
-		),
-		esc_html( $id->get_error_message() )
-	);
+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>';
 	exit;
 }

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

 	/**
-	 * Filters the returned ID of an uploaded attachment.
+	 * Filter the returned ID of an uploaded attachment.
 	 *
 	 * The dynamic portion of the hook name, `$type`, refers to the attachment type,
 	 * such as 'image', 'audio', 'video', 'file', etc.
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -9,178 +9,169 @@
 /** 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" target="_blank">Documentation on Comments</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">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( __('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 '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://wordpress.org/support/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
-		);
-
-		wp_enqueue_script( 'comment' );
-		require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
-		$comment_id = absint( $_GET['c'] );
-
-		$comment = get_comment( $comment_id );
-		if ( ! $comment ) {
-			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' );
-
+	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;
+}

-	case 'delete':
-	case 'approve':
-	case 'trash':
-	case 'spam':
-		$title = __( 'Moderate Comment' );
-
-		$comment_id = absint( $_GET['c'] );
-
-		$comment = get_comment( $comment_id );
-		if ( ! $comment ) {
-			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>';
-			}
-		}
-		?>
+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>
+	<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 ) );
@@ -192,168 +183,150 @@ switch ( $action ) {
 			$parent_link = esc_url( get_comment_link( $parent ) );
 			$name        = get_comment_author( $parent );
 			printf(
-				/* translators: %s: Comment link. */
+				/* translators: %s: comment link */
 				' | ' . __( 'In reply to %s.' ),
 				'<a href="' . $parent_link . '">' . $name . '</a>'
 			);
 		}
-		?>
+	?>
 	</td>
-	</tr>
-	<tr>
+</tr>
+<tr>
 	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
 	<td>
-		<?php
-		$submitted = sprintf(
-			/* translators: 1: Comment date, 2: Comment time. */
-			__( '%1$s at %2$s' ),
-			/* translators: Comment date format. See https://secure.php.net/date */
+	<?php
+		/* translators: 1: comment date, 2: comment time */
+		$submitted = sprintf( __( '%1$s at %2$s' ),
+			/* translators: comment date format. See http://php.net/date */
 			get_comment_date( __( 'Y/m/d' ), $comment ),
-			/* translators: Comment time format. See https://secure.php.net/date */
 			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 ); ?>
-	<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>
+</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_attr_e( 'Edit' ); ?></a></p>
+</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_attr_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']);

-		$comment = get_comment( $comment_id );
-		if ( ! $comment ) {
-			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( __('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':
-		$comment_id      = absint( $_POST['comment_ID'] );
-		$comment_post_id = absint( $_POST['comment_post_ID'] );
+case 'editedcomment' :

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

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

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

-		/**
-		 * 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 );
+	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;

-		exit();
+	/**
+	 * Filter 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 );

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

 } // end switch

--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -12,120 +12,98 @@ require_once( dirname( __FILE__ ) . '/includes/credits.php' );

 $title = __( 'Credits' );

-list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+list( $display_version ) = explode( '-', $wp_version );

 include( ABSPATH . 'wp-admin/admin-header.php' );
-
-$credits = wp_credits();
 ?>
-<div class="wrap about__container">
+<div class="wrap about-wrap">

-	<div class="about__header">
-		<div class="about__header-title">
-			<h1>
-				<span><?php echo $display_version; ?></span>
-				<?php _e( 'WordPress' ); ?>
-			</h1>
-		</div>
+<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

-		<div class="about__header-badge"></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s streamlines your workflow, whether you&#8217;re writing or building your site.' ), $display_version ); ?></div>

-		<div class="about__header-text">
-			<p>
-				<?php
-				printf(
-					/* translators: %s: The current WordPress version number. */
-					__( 'Introducing our most refined user experience with the improved block editor in WordPress %s!' ),
-					$display_version
-				);
-				?>
-			</p>
-		</div>
+<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

-		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-			<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-		</nav>
-	</div>
-
-	<div class="about__section">
-		<div class="column">
-			<h2><?php _e( 'WordPress is created by a worldwide team of passionate individuals.' ); ?></h2>
-
-			<p>
-				<?php
-				if ( ! $credits ) {
-					printf(
-						/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-						__( '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/' )
-					);
-				} else {
-					printf(
-						/* translators: %s: https://make.wordpress.org/ */
-						__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-						__( 'https://make.wordpress.org/' )
-					);
-				}
-				?>
-			</p>
-		</div>
-
-		<div class="about__image aligncenter">
-			<img src="data:image/svg+xml;charset=utf8,%3Csvg width='1320' height='350' viewbox='0 0 1320 350' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 61 220)' fill='%23321017'/%3E%3Crect width='72' height='250' transform='matrix(1 0 0 -1 166 300)' fill='%23BD3854'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 272 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 378 220)' fill='%235F1B29'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 483 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 587 220)' fill='%235F1B29'/%3E%3Crect width='71.28' height='250' transform='matrix(1 0 0 -1 689 300)' fill='%23BD3854'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 884 220)' fill='%235F1B29'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 789 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 985 220)' fill='%23321017'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 1084 220)' fill='%235F1B29'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 1179 220)' fill='%233D0F19'/%3E%3C/svg%3E%0A" alt="" />
-		</div>
-	</div>
+<h2 class="nav-tab-wrapper wp-clearfix">
+	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
+	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
+	<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+</h2>

 <?php
+
+$credits = wp_credits();
+
 if ( ! $credits ) {
-	echo '</div>';
+	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>.' ),
+		'https://wordpress.org/about/',
+		__( 'https://make.wordpress.org/' )
+	);
+	echo '</p>';
 	include( ABSPATH . 'wp-admin/admin-footer.php' );
 	exit;
 }
+
+echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
+
+foreach ( $credits['groups'] as $group_slug => $group_data ) {
+	if ( $group_data['name'] ) {
+		if ( 'Translators' == $group_data['name'] ) {
+			// 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'] ) ) {
+			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+		} else {
+			$title = translate( $group_data['name'] );
+		}
+
+		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
+	}
+
+	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' :
+			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' :
+			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;
+		default:
+			$compact = 'compact' == $group_data['type'];
+			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
+			echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
+			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;
+				$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 )
+					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				echo "</li>\n";
+			}
+			echo "</ul>\n";
+		break;
+	}
+}
+
 ?>
+<p class="clear"><?php
+	/* translators: %s: https://make.wordpress.org/ */
+	printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
+		__( 'https://make.wordpress.org/' )
+	);
+?></p>

-	<hr />
-
-	<div class="about__section">
-		<div class="column has-subtle-background-color">
-			<?php wp_credits_section_title( $credits['groups']['core-developers'] ); ?>
-			<?php wp_credits_section_list( $credits, 'core-developers' ); ?>
-			<?php wp_credits_section_list( $credits, 'contributing-developers' ); ?>
-		</div>
-	</div>
-
-	<hr />
-
-	<div class="about__section">
-		<div class="column">
-			<?php wp_credits_section_title( $credits['groups']['props'] ); ?>
-			<?php wp_credits_section_list( $credits, 'props' ); ?>
-		</div>
-	</div>
-
-	<hr />
-
-	<?php if ( isset( $credits['groups']['translators'] ) || isset( $credits['groups']['validators'] ) ) : ?>
-	<div class="about__section">
-		<div class="column">
-			<?php wp_credits_section_title( $credits['groups']['validators'] ); ?>
-			<?php wp_credits_section_list( $credits, 'validators' ); ?>
-			<?php wp_credits_section_list( $credits, 'translators' ); ?>
-		</div>
-	</div>
-
-	<hr />
-	<?php endif; ?>
-
-	<div class="about__section">
-		<div class="column">
-			<?php wp_credits_section_title( $credits['groups']['libraries'] ); ?>
-			<?php wp_credits_section_list( $credits, 'libraries' ); ?>
-		</div>
-	</div>
 </div>
 <?php

@@ -135,9 +113,8 @@ return;

 // These are strings returned by the API that we want to be translatable
 __( 'Project Leaders' );
-/* translators: %s: The current WordPress version number. */
 __( 'Core Contributors to WordPress %s' );
-__( 'Noteworthy Contributors' );
+__( 'Contributing Developers' );
 __( 'Cofounder, Project Lead' );
 __( 'Lead Developer' );
 __( 'Release Lead' );
--- a/wp-admin/css/about-rtl.css
+++ b/wp-admin/css/about-rtl.css
--- 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
--- 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
@@ -47,6 +47,7 @@
 	display: inline-block;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
+	-webkit-transition: all .1s ease-in-out;
 	transition: all .1s ease-in-out;
 }

@@ -96,7 +97,7 @@
 }

 .icon16.icon-site:before {
-	content: "\f541";
+	content: "\f112";
 }

 .icon16.icon-generic:before {
@@ -159,18 +160,14 @@

 #adminmenu a {
 	display: block;
-	line-height: 1.3;
+	line-height: 18px;
 	padding: 2px 5px;
 	color: #eee;
 }

 #adminmenu .wp-submenu a {
 	color: #b4b9be;
-	color: rgba(240, 245, 250, 0.7);
-	font-size: 13px;
-	line-height: 1.4;
-	margin: 0;
-	padding: 5px 0;
+	color: rgba(240,245,250,0.7);
 }

 #adminmenu .wp-submenu a:hover,
@@ -206,7 +203,8 @@
 	padding: 7px 0 8px;
 	z-index: 9999;
 	background-color: #32373c;
-	box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: 0 3px 5px rgba(0,0,0,0.2);
+	box-shadow: 0 3px 5px rgba(0,0,0,0.2);
 }

 .js #adminmenu .sub-open,
@@ -229,6 +227,7 @@
 	bottom: auto;
 	border: 0 none;
 	margin-top: 0;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	background-color: #32373c;
 }
@@ -265,7 +264,7 @@
 .folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
 .folded #adminmenu a.menu-top:focus + .wp-submenu,
 .folded #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu,
-.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu {
+.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu  {
 	top: 0;
 	right: 36px;
 }
@@ -282,6 +281,13 @@
 	width: auto;
 }

+#adminmenu .wp-submenu a {
+	font-size: 13px;
+	line-height: 1.2;
+	margin: 0;
+	padding: 6px 0;
+}
+
 #adminmenu .wp-submenu li.current,
 #adminmenu .wp-submenu li.current a,
 #adminmenu .opensub .wp-submenu li.current a,
@@ -295,20 +301,20 @@
 .folded #adminmenu .wp-has-current-submenu li > a {
 	padding-left: 16px;
 	padding-right: 14px;
-	/* Exclude from the transition the outline for Windows High Contrast mode */
-	transition: all .1s ease-in-out, outline 0s;
+	-webkit-transition: all .1s ease-in-out;
+	transition: all .1s ease-in-out;
 }

 #adminmenu .wp-has-current-submenu ul > li > a,
 .folded #adminmenu li.menu-top .wp-submenu > li > a {
-	padding: 5px 12px;
+	padding: 6px 12px;
 }

 #adminmenu a.menu-top,
 #adminmenu .wp-submenu-head {
 	font-size: 14px;
 	font-weight: 400;
-	line-height: 1.3;
+	line-height: 18px;
 	padding: 0;
 }

@@ -328,6 +334,7 @@
 #adminmenu .wp-submenu li {
 	padding: 0;
 	margin: 0;
+	overflow: hidden;
 }

 #adminmenu .wp-menu-image img {
@@ -351,19 +358,21 @@
 #adminmenu div.wp-menu-image.svg {
 	background-repeat: no-repeat;
 	background-position: center;
+	-webkit-background-size: 20px auto;
 	background-size: 20px auto;
 }

 div.wp-menu-image:before {
 	color: #a0a5aa;
-	color: rgba(240, 245, 250, 0.6);
+	color: rgba(240,245,250,0.6);
 	padding: 7px 0;
+	-webkit-transition: all .1s ease-in-out;
 	transition: all .1s ease-in-out;
 }

 #adminmenu div.wp-menu-image:before {
 	color: #a0a5aa;
-	color: rgba(240, 245, 250, 0.6);
+	color: rgba(240,245,250,0.6);
 }

 #adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before,
@@ -507,28 +516,30 @@ ul#adminmenu > li.current > a.current:after {
 	border: 0 none;
 }

-/* @todo: consider to use a single rule for these counters and the list table comments counters. */
 #adminmenu .awaiting-mod,
 #adminmenu .update-plugins {
 	display: inline-block;
-	vertical-align: top;
-	box-sizing: border-box;
-	margin: 1px 2px -1px 0;
-	padding: 0 5px;
-	min-width: 18px;
-	height: 18px;
-	border-radius: 9px;
-	background-color: #ca4a1f;
+	background-color: #d54e21;
 	color: #fff;
-	font-size: 11px;
-	line-height: 1.6;
-	text-align: center;
+	font-size: 9px;
+	line-height: 17px;
+	font-weight: 600;
+	margin: 1px 2px 0 0;
+	vertical-align: top;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
 	z-index: 26;
 }

+#adminmenu li .awaiting-mod span,
+#adminmenu li span.update-plugins span {
+	display: block;
+	padding: 0 6px;
+}
+
 #adminmenu li.current a .awaiting-mod,
-#adminmenu li a.wp-has-current-submenu .update-plugins {
-	background-color: #ca4a1f;
+#adminmenu	li a.wp-has-current-submenu .update-plugins {
+	background-color: #00b9eb;
 	color: #fff;
 }

@@ -536,84 +547,79 @@ ul#adminmenu > li.current > a.current:after {
 	display: none;
 }

-#collapse-button {
-	display: block;
-	width: 100%;
-	height: 34px;
-	margin: 0;
-	border: none;
-	padding: 0;
-	position: relative;
-	overflow: visible;
-	background: none;
-	color: #aaa;
-	cursor: pointer;
+#collapse-menu {
+	font-size: 13px;
+	line-height: 34px;
+	margin-top: 10px;
+	color: #a0a5aa;
+	color: rgba(240,245,250,0.6);
+	-webkit-transition: all .1s ease-in-out;
+	transition: all .1s ease-in-out;
 }

-#collapse-button:hover {
+#collapse-menu:hover,
+#collapse-menu:hover #collapse-button div:after {
 	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,
-#collapse-button .collapse-button-label {
-	/* absolutely positioned to avoid 1px shift in IE when button is pressed */
-	display: block;
-	position: absolute;
-	top: 0;
-	right: 0;
-}
-
-#collapse-button .collapse-button-label {
-	top: 8px;
-}
-
-#collapse-button .collapse-button-icon {
-	width: 36px;
-	height: 34px;
-}
-
-#collapse-button .collapse-button-label {
-	padding: 0 36px 0 0;
-}
-
-.folded #collapse-button .collapse-button-label {
+.folded #collapse-menu span {
 	display: none;
 }

-#collapse-button .collapse-button-icon:after {
+#collapse-button,
+#collapse-button div {
+	width: 15px;
+	height: 15px;
+}
+
+#collapse-button {
+	float: right;
+	height: 15px;
+	margin: 10px 11px 10px 8px;
+	width: 15px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+
+#wpwrap #collapse-button div {
+	padding: 0;
+}
+
+#collapse-button div:after {
 	content: "\f148";
 	display: block;
-	position: relative;
-	top: 7px;
-	text-align: center;
+	line-height: 15px;
+	right: -3px;
+	top: -3px;
+	color: #a0a5aa;
+	color: rgba(240,245,250,0.6);
 	font: normal 20px/1 dashicons !important;
 	speak: none;
+	margin: 0 auto;
+	padding: 0 !important;
+	position: relative;
+	text-align: center;
+	width: 20px;
+	-webkit-transition: all .1s ease-in-out;
+	transition: all .1s ease-in-out;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

 /* rtl:ignore */
-.folded #collapse-button .collapse-button-icon:after,
-.rtl #collapse-button .collapse-button-icon:after {
+.folded #collapse-button div:after,
+.rtl #collapse-button div:after {
+	-webkit-transform: rotate(180deg);
+	-ms-transform: rotate(180deg);
 	transform: rotate(180deg);
 }

-.rtl.folded #collapse-button .collapse-button-icon:after {
+.rtl.folded #collapse-button div:after {
+	-webkit-transform: none;
+	-ms-transform: none;
 	transform: none;
 }

-#collapse-button .collapse-button-icon:after,
-#collapse-button .collapse-button-label {
-	transition: all .1s ease-in-out;
-}
-
 /**
 * Toolbar menu toggle
 */
@@ -646,7 +652,7 @@ li#wp-admin-bar-menu-toggle {
 	.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,
 	.auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
 	.auto-fold #adminmenu a.menu-top:focus + .wp-submenu,
-	.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu {
+	.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu  {
 		top: 0px;
 		right: 36px;
 	}
@@ -725,22 +731,30 @@ li#wp-admin-bar-menu-toggle {
 		z-index: 10000;
 	}

-	.auto-fold #collapse-menu .collapse-button-label {
+	.auto-fold #collapse-menu span {
 		display: none;
 	}

+	.auto-fold #collapse-button div {
+		background: none;
+	}
+
 	/* rtl:ignore */
-	.auto-fold #collapse-button .collapse-button-icon:after {
+	.auto-fold #collapse-button div:after {
+		-webkit-transform: rotate(180deg);
+		-ms-transform: rotate(180deg);
 		transform: rotate(180deg);
 	}

-	.rtl.auto-fold #collapse-button .collapse-button-icon:after {
+	.rtl.auto-fold #collapse-button div:after {
+		-webkit-transform: none;
+		-ms-transform: none;
 		transform: none;
 	}

 }

-@media screen and (max-width: 782px) {
+@media screen and ( max-width: 782px ) {
 	.auto-fold #wpcontent {
 		position: relative;
 		margin-right: 0;
@@ -762,10 +776,6 @@ li#wp-admin-bar-menu-toggle {
 		z-index: 100;
 	}

-	.auto-fold #adminmenuback {
-		position: fixed;
-	}
-
 	.auto-fold #adminmenuback,
 	.auto-fold #adminmenuwrap {
 		display: none;
@@ -819,6 +829,7 @@ li#wp-admin-bar-menu-toggle {
 		display: block;
 		top: 0;
 		right: -1px;
+		-webkit-box-shadow: none;
 		box-shadow: none;
 	}

@@ -860,6 +871,8 @@ li#wp-admin-bar-menu-toggle {
 		padding-left: 10px;
 		z-index: 99999;
 		border: none;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
 		box-sizing: border-box;
 	}

@@ -903,6 +916,8 @@ li#wp-admin-bar-menu-toggle {
 		border: none;
 		text-align: center;
 		text-decoration: none;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
 		box-sizing: border-box;
 	}

--- 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
@@ -47,6 +47,7 @@
 	display: inline-block;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
+	-webkit-transition: all .1s ease-in-out;
 	transition: all .1s ease-in-out;
 }

@@ -96,7 +97,7 @@
 }

 .icon16.icon-site:before {
-	content: "\f541";
+	content: "\f112";
 }

 .icon16.icon-generic:before {
@@ -159,18 +160,14 @@

 #adminmenu a {
 	display: block;
-	line-height: 1.3;
+	line-height: 18px;
 	padding: 2px 5px;
 	color: #eee;
 }

 #adminmenu .wp-submenu a {
 	color: #b4b9be;
-	color: rgba(240, 245, 250, 0.7);
-	font-size: 13px;
-	line-height: 1.4;
-	margin: 0;
-	padding: 5px 0;
+	color: rgba(240,245,250,0.7);
 }

 #adminmenu .wp-submenu a:hover,
@@ -206,7 +203,8 @@
 	padding: 7px 0 8px;
 	z-index: 9999;
 	background-color: #32373c;
-	box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: 0 3px 5px rgba(0,0,0,0.2);
+	box-shadow: 0 3px 5px rgba(0,0,0,0.2);
 }

 .js #adminmenu .sub-open,
@@ -229,6 +227,7 @@
 	bottom: auto;
 	border: 0 none;
 	margin-top: 0;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	background-color: #32373c;
 }
@@ -265,7 +264,7 @@
 .folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
 .folded #adminmenu a.menu-top:focus + .wp-submenu,
 .folded #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu,
-.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu {
+.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu  {
 	top: 0;
 	left: 36px;
 }
@@ -282,6 +281,13 @@
 	width: auto;
 }

+#adminmenu .wp-submenu a {
+	font-size: 13px;
+	line-height: 1.2;
+	margin: 0;
+	padding: 6px 0;
+}
+
 #adminmenu .wp-submenu li.current,
 #adminmenu .wp-submenu li.current a,
 #adminmenu .opensub .wp-submenu li.current a,
@@ -295,20 +301,20 @@
 .folded #adminmenu .wp-has-current-submenu li > a {
 	padding-right: 16px;
 	padding-left: 14px;
-	/* Exclude from the transition the outline for Windows High Contrast mode */
-	transition: all .1s ease-in-out, outline 0s;
+	-webkit-transition: all .1s ease-in-out;
+	transition: all .1s ease-in-out;
 }

 #adminmenu .wp-has-current-submenu ul > li > a,
 .folded #adminmenu li.menu-top .wp-submenu > li > a {
-	padding: 5px 12px;
+	padding: 6px 12px;
 }

 #adminmenu a.menu-top,
 #adminmenu .wp-submenu-head {
 	font-size: 14px;
 	font-weight: 400;
-	line-height: 1.3;
+	line-height: 18px;
 	padding: 0;
 }

@@ -328,6 +334,7 @@
 #adminmenu .wp-submenu li {
 	padding: 0;
 	margin: 0;
+	overflow: hidden;
 }

 #adminmenu .wp-menu-image img {
@@ -351,19 +358,21 @@
 #adminmenu div.wp-menu-image.svg {
 	background-repeat: no-repeat;
 	background-position: center;
+	-webkit-background-size: 20px auto;
 	background-size: 20px auto;
 }

 div.wp-menu-image:before {
 	color: #a0a5aa;
-	color: rgba(240, 245, 250, 0.6);
+	color: rgba(240,245,250,0.6);
 	padding: 7px 0;
+	-webkit-transition: all .1s ease-in-out;
 	transition: all .1s ease-in-out;
 }

 #adminmenu div.wp-menu-image:before {
 	color: #a0a5aa;
-	color: rgba(240, 245, 250, 0.6);
+	color: rgba(240,245,250,0.6);
 }

 #adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before,
@@ -507,28 +516,30 @@ ul#adminmenu > li.current > a.current:after {
 	border: 0 none;
 }

-/* @todo: consider to use a single rule for these counters and the list table comments counters. */
 #adminmenu .awaiting-mod,
 #adminmenu .update-plugins {
 	display: inline-block;
-	vertical-align: top;
-	box-sizing: border-box;
-	margin: 1px 0 -1px 2px;
-	padding: 0 5px;
-	min-width: 18px;
-	height: 18px;
-	border-radius: 9px;
-	background-color: #ca4a1f;
+	background-color: #d54e21;
 	color: #fff;
-	font-size: 11px;
-	line-height: 1.6;
-	text-align: center;
+	font-size: 9px;
+	line-height: 17px;
+	font-weight: 600;
+	margin: 1px 0 0 2px;
+	vertical-align: top;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
 	z-index: 26;
 }

+#adminmenu li .awaiting-mod span,
+#adminmenu li span.update-plugins span {
+	display: block;
+	padding: 0 6px;
+}
+
 #adminmenu li.current a .awaiting-mod,
-#adminmenu li a.wp-has-current-submenu .update-plugins {
-	background-color: #ca4a1f;
+#adminmenu	li a.wp-has-current-submenu .update-plugins {
+	background-color: #00b9eb;
 	color: #fff;
 }

@@ -536,84 +547,79 @@ ul#adminmenu > li.current > a.current:after {
 	display: none;
 }

-#collapse-button {
-	display: block;
-	width: 100%;
-	height: 34px;
-	margin: 0;
-	border: none;
-	padding: 0;
-	position: relative;
-	overflow: visible;
-	background: none;
-	color: #aaa;
-	cursor: pointer;
+#collapse-menu {
+	font-size: 13px;
+	line-height: 34px;
+	margin-top: 10px;
+	color: #a0a5aa;
+	color: rgba(240,245,250,0.6);
+	-webkit-transition: all .1s ease-in-out;
+	transition: all .1s ease-in-out;
 }

-#collapse-button:hover {
+#collapse-menu:hover,
+#collapse-menu:hover #collapse-button div:after {
 	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,
-#collapse-button .collapse-button-label {
-	/* absolutely positioned to avoid 1px shift in IE when button is pressed */
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-
-#collapse-button .collapse-button-label {
-	top: 8px;
-}
-
-#collapse-button .collapse-button-icon {
-	width: 36px;
-	height: 34px;
-}
-
-#collapse-button .collapse-button-label {
-	padding: 0 0 0 36px;
-}
-
-.folded #collapse-button .collapse-button-label {
+.folded #collapse-menu span {
 	display: none;
 }

-#collapse-button .collapse-button-icon:after {
+#collapse-button,
+#collapse-button div {
+	width: 15px;
+	height: 15px;
+}
+
+#collapse-button {
+	float: left;
+	height: 15px;
+	margin: 10px 8px 10px 11px;
+	width: 15px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+
+#wpwrap #collapse-button div {
+	padding: 0;
+}
+
+#collapse-button div:after {
 	content: "\f148";
 	display: block;
-	position: relative;
-	top: 7px;
-	text-align: center;
+	line-height: 15px;
+	left: -3px;
+	top: -3px;
+	color: #a0a5aa;
+	color: rgba(240,245,250,0.6);
 	font: normal 20px/1 dashicons !important;
 	speak: none;
+	margin: 0 auto;
+	padding: 0 !important;
+	position: relative;
+	text-align: center;
+	width: 20px;
+	-webkit-transition: all .1s ease-in-out;
+	transition: all .1s ease-in-out;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

 /* rtl:ignore */
-.folded #collapse-button .collapse-button-icon:after,
-.rtl #collapse-button .collapse-button-icon:after {
+.folded #collapse-button div:after,
+.rtl #collapse-button div:after {
+	-webkit-transform: rotate(180deg);
+	-ms-transform: rotate(180deg);
 	transform: rotate(180deg);
 }

-.rtl.folded #collapse-button .collapse-button-icon:after {
+.rtl.folded #collapse-button div:after {
+	-webkit-transform: none;
+	-ms-transform: none;
 	transform: none;
 }

-#collapse-button .collapse-button-icon:after,
-#collapse-button .collapse-button-label {
-	transition: all .1s ease-in-out;
-}
-
 /**
 * Toolbar menu toggle
 */
@@ -646,7 +652,7 @@ li#wp-admin-bar-menu-toggle {
 	.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,
 	.auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
 	.auto-fold #adminmenu a.menu-top:focus + .wp-submenu,
-	.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu {
+	.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu  {
 		top: 0px;
 		left: 36px;
 	}
@@ -725,22 +731,30 @@ li#wp-admin-bar-menu-toggle {
 		z-index: 10000;
 	}

-	.auto-fold #collapse-menu .collapse-button-label {
+	.auto-fold #collapse-menu span {
 		display: none;
 	}

+	.auto-fold #collapse-button div {
+		background: none;
+	}
+
 	/* rtl:ignore */
-	.auto-fold #collapse-button .collapse-button-icon:after {
+	.auto-fold #collapse-button div:after {
+		-webkit-transform: rotate(180deg);
+		-ms-transform: rotate(180deg);
 		transform: rotate(180deg);
 	}

-	.rtl.auto-fold #collapse-button .collapse-button-icon:after {
+	.rtl.auto-fold #collapse-button div:after {
+		-webkit-transform: none;
+		-ms-transform: none;
 		transform: none;
 	}

 }

-@media screen and (max-width: 782px) {
+@media screen and ( max-width: 782px ) {
 	.auto-fold #wpcontent {
 		position: relative;
 		margin-left: 0;
@@ -762,10 +776,6 @@ li#wp-admin-bar-menu-toggle {
 		z-index: 100;
 	}

-	.auto-fold #adminmenuback {
-		position: fixed;
-	}
-
 	.auto-fold #adminmenuback,
 	.auto-fold #adminmenuwrap {
 		display: none;
@@ -819,6 +829,7 @@ li#wp-admin-bar-menu-toggle {
 		display: block;
 		top: 0;
 		left: -1px;
+		-webkit-box-shadow: none;
 		box-shadow: none;
 	}

@@ -860,6 +871,8 @@ li#wp-admin-bar-menu-toggle {
 		padding-right: 10px;
 		z-index: 99999;
 		border: none;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
 		box-sizing: border-box;
 	}

@@ -903,6 +916,8 @@ li#wp-admin-bar-menu-toggle {
 		border: none;
 		text-align: center;
 		text-decoration: none;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
 		box-sizing: border-box;
 	}

--- 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
@@ -1,76 +0,0 @@
-.wrap [class*="CodeMirror-lint-marker"],
-.wp-core-ui [class*="CodeMirror-lint-message"],
-.wrap .CodeMirror-lint-marker-multiple {
-	background-image: none;
-}
-
-.wp-core-ui .CodeMirror-lint-marker-error,
-.wp-core-ui .CodeMirror-lint-marker-warning {
-	cursor: help;
-}
-
-.wrap .CodeMirror-lint-marker-multiple {
-	position: absolute;
-	top: 0;
-}
-
-.wrap [class*="CodeMirror-lint-marker"]:before {
-	font: normal 18px/1 dashicons;
-	position: relative;
-	top: -2px;
-}
-
-.wp-core-ui [class*="CodeMirror-lint-message"]:before {
-	font: normal 16px/1 dashicons;
-	right: 16px;
-	position: absolute;
-}
-
-.wp-core-ui .CodeMirror-lint-message-error,
-.wp-core-ui .CodeMirror-lint-message-warning {
-	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
-	margin: 5px 0 2px;
-	padding: 3px 28px 3px 12px;
-}
-
-.wp-core-ui .CodeMirror-lint-message-warning {
-	background-color: #fff8e5;
-	border-right: 4px solid #ffb900;
-}
-
-.wrap .CodeMirror-lint-marker-warning:before,
-.wp-core-ui .CodeMirror-lint-message-warning:before {
-	content: "\f534";
-	color: #f6a306;
-}
-
-.wp-core-ui .CodeMirror-lint-message-error {
-	background-color: #fbeaea;
-	border-right: 4px solid #dc3232;
-}
-
-.wrap .CodeMirror-lint-marker-error:before,
-.wp-core-ui .CodeMirror-lint-message-error:before {
-	content: "\f153";
-	color: #dc3232;
-}
-
-.wp-core-ui .CodeMirror-lint-tooltip {
-	background: none;
-	border: none;
-	border-radius: 0;
-	direction: rtl;
-}
-
-.wrap .CodeMirror .CodeMirror-matchingbracket {
-	background: rgba(255, 150, 0, 0.3);
-	color: inherit;
-}
-
-.CodeMirror {
-	text-align: right;
-}
-
-.wrap .CodeMirror .CodeMirror-linenumber {
-	color: #666;
-}
--- a/wp-admin/css/code-editor-rtl.min.css
+++ b/wp-admin/css/code-editor-rtl.min.css
@@ -1,2 +0,0 @@
-/*! This file is auto-generated */
-.wp-core-ui [class*=CodeMirror-lint-message],.wrap .CodeMirror-lint-marker-multiple,.wrap [class*=CodeMirror-lint-marker]{background-image:none}.wp-core-ui .CodeMirror-lint-marker-error,.wp-core-ui .CodeMirror-lint-marker-warning{cursor:help}.wrap .CodeMirror-lint-marker-multiple{position:absolute;top:0}.wrap [class*=CodeMirror-lint-marker]:before{font:normal 18px/1 dashicons;position:relative;top:-2px}.wp-core-ui [class*=CodeMirror-lint-message]:before{font:normal 16px/1 dashicons;right:16px;position:absolute}.wp-core-ui .CodeMirror-lint-message-error,.wp-core-ui .CodeMirror-lint-message-warning{box-shadow:0 1px 1px 0 rgba(0,0,0,.1);margin:5px 0 2px;padding:3px 28px 3px 12px}.wp-core-ui .CodeMirror-lint-message-warning{background-color:#fff8e5;border-right:4px solid #ffb900}.wp-core-ui .CodeMirror-lint-message-warning:before,.wrap .CodeMirror-lint-marker-warning:before{content:"\f534";color:#f6a306}.wp-core-ui .CodeMirror-lint-message-error{background-color:#fbeaea;border-right:4px solid #dc3232}.wp-core-ui .CodeMirror-lint-message-error:before,.wrap .CodeMirror-lint-marker-error:before{content:"\f153";color:#dc3232}.wp-core-ui .CodeMirror-lint-tooltip{background:0 0;border:none;border-radius:0;direction:rtl}.wrap .CodeMirror .CodeMirror-matchingbracket{background:rgba(255,150,0,.3);color:inherit}.CodeMirror{text-align:right}.wrap .CodeMirror .CodeMirror-linenumber{color:#666}
--- a/wp-admin/css/code-editor.css
+++ b/wp-admin/css/code-editor.css
@@ -1,76 +0,0 @@
-.wrap [class*="CodeMirror-lint-marker"],
-.wp-core-ui [class*="CodeMirror-lint-message"],
-.wrap .CodeMirror-lint-marker-multiple {
-	background-image: none;
-}
-
-.wp-core-ui .CodeMirror-lint-marker-error,
-.wp-core-ui .CodeMirror-lint-marker-warning {
-	cursor: help;
-}
-
-.wrap .CodeMirror-lint-marker-multiple {
-	position: absolute;
-	top: 0;
-}
-
-.wrap [class*="CodeMirror-lint-marker"]:before {
-	font: normal 18px/1 dashicons;
-	position: relative;
-	top: -2px;
-}
-
-.wp-core-ui [class*="CodeMirror-lint-message"]:before {
-	font: normal 16px/1 dashicons;
-	left: 16px;
-	position: absolute;
-}
-
-.wp-core-ui .CodeMirror-lint-message-error,
-.wp-core-ui .CodeMirror-lint-message-warning {
-	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
-	margin: 5px 0 2px;
-	padding: 3px 12px 3px 28px;
-}
-
-.wp-core-ui .CodeMirror-lint-message-warning {
-	background-color: #fff8e5;
-	border-left: 4px solid #ffb900;
-}
-
-.wrap .CodeMirror-lint-marker-warning:before,
-.wp-core-ui .CodeMirror-lint-message-warning:before {
-	content: "\f534";
-	color: #f6a306;
-}
-
-.wp-core-ui .CodeMirror-lint-message-error {
-	background-color: #fbeaea;
-	border-left: 4px solid #dc3232;
-}
-
-.wrap .CodeMirror-lint-marker-error:before,
-.wp-core-ui .CodeMirror-lint-message-error:before {
-	content: "\f153";
-	color: #dc3232;
-}
-
-.wp-core-ui .CodeMirror-lint-tooltip {
-	background: none;
-	border: none;
-	border-radius: 0;
-	direction: ltr;
-}
-
-.wrap .CodeMirror .CodeMirror-matchingbracket {
-	background: rgba(255, 150, 0, 0.3);
-	color: inherit;
-}
-
-.CodeMirror {
-	text-align: left;
-}
-
-.wrap .CodeMirror .CodeMirror-linenumber {
-	color: #666;
-}
--- a/wp-admin/css/code-editor.min.css
+++ b/wp-admin/css/code-editor.min.css
@@ -1,2 +0,0 @@
-/*! This file is auto-generated */
-.wp-core-ui [class*=CodeMirror-lint-message],.wrap .CodeMirror-lint-marker-multiple,.wrap [class*=CodeMirror-lint-marker]{background-image:none}.wp-core-ui .CodeMirror-lint-marker-error,.wp-core-ui .CodeMirror-lint-marker-warning{cursor:help}.wrap .CodeMirror-lint-marker-multiple{position:absolute;top:0}.wrap [class*=CodeMirror-lint-marker]:before{font:normal 18px/1 dashicons;position:relative;top:-2px}.wp-core-ui [class*=CodeMirror-lint-message]:before{font:normal 16px/1 dashicons;left:16px;position:absolute}.wp-core-ui .CodeMirror-lint-message-error,.wp-core-ui .CodeMirror-lint-message-warning{box-shadow:0 1px 1px 0 rgba(0,0,0,.1);margin:5px 0 2px;padding:3px 12px 3px 28px}.wp-core-ui .CodeMirror-lint-message-warning{background-color:#fff8e5;border-left:4px solid #ffb900}.wp-core-ui .CodeMirror-lint-message-warning:before,.wrap .CodeMirror-lint-marker-warning:before{content:"\f534";color:#f6a306}.wp-core-ui .CodeMirror-lint-message-error{background-color:#fbeaea;border-left:4px solid #dc3232}.wp-core-ui .CodeMirror-lint-message-error:before,.wrap .CodeMirror-lint-marker-error:before{content:"\f153";color:#dc3232}.wp-core-ui .CodeMirror-lint-tooltip{background:0 0;border:none;border-radius:0;direction:ltr}.wrap .CodeMirror .CodeMirror-matchingbracket{background:rgba(255,150,0,.3);color:inherit}.CodeMirror{text-align:left}.wrap .CodeMirror .CodeMirror-linenumber{color:#666}
--- a/wp-admin/css/color-picker-rtl.css
+++ b/wp-admin/css/color-picker-rtl.css
@@ -1,30 +1,48 @@
-/* rtl:ignore */
 .wp-color-picker {
 	width: 80px;
-	direction: ltr;
 }

 .wp-picker-container .hidden {
 	display: none;
 }

-/* Needs higher specificiity. */
-.wp-picker-container .wp-color-result.button {
-	min-height: 30px;
+.wp-color-result {
+	background-color: #f7f7f7;
+	border: 1px solid #ccc;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	cursor: pointer;
+	display: inline-block;
+	height: 22px;
 	margin: 0 0px 6px 6px;
-	padding: 0 30px 0 0;
-	font-size: 11px;
+	position: relative;
+	top: 1px;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	vertical-align: bottom;
+	display: inline-block;
+	padding-right: 30px;
+	-webkit-box-shadow: 0 1px 0 #ccc;
+	box-shadow: 0 1px 0 #ccc;
 }

-.wp-color-result-text {
+.wp-color-result:after {
 	background: #f7f7f7;
+	-webkit-border-radius: 2px 0 0 2px;
 	border-radius: 2px 0 0 2px;
 	border-right: 1px solid #ccc;
 	color: #555;
+	content: attr( title );
 	display: block;
-	line-height: 2.54545455; /* 28px */
+	font-size: 11px;
+	line-height: 22px;
 	padding: 0 6px;
+	position: relative;
+	left: 0;
 	text-align: center;
+	top: 0;
 }

 .wp-color-result:hover,
@@ -41,18 +59,23 @@
 	border-right: 1px solid #999;
 }

-.wp-picker-container {
+.wp-color-result {
+	top: 0;
+}
+
+.wp-color-result.wp-picker-open:after {
+	content: attr( data-current );
+}
+
+.wp-picker-container, .wp-picker-container:active {
 	display: inline-block;
+	outline: 0;
 }

 .wp-color-result:focus {
 	border-color: #5b9dd9;
-	box-shadow: 0 0 3px rgba(0, 115, 170, 0.8);
-}
-
-.wp-color-result:active {
-	/* See Trac ticket #39662 */
-	transform: none !important;
+	-webkit-box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
+	box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
 }

 .wp-picker-open + .wp-picker-input-wrap {
@@ -60,22 +83,8 @@
 	vertical-align: top;
 }

-.wp-picker-input-wrap label {
-	display: inline-block;
-	vertical-align: top;
-}
-
-/* For the old `custom-background` page, to override the inline-block and margins from `.form-table td fieldset label`. */
-.form-table .wp-picker-input-wrap label {
-	margin: 0 !important;
-}
-
-.wp-picker-input-wrap .button.wp-picker-default,
-.wp-customizer .wp-picker-input-wrap .button.wp-picker-default {
+.wp-picker-container .button {
 	margin-right: 6px;
-	padding: 0 8px;
-	line-height: 2.54545455; /* 28px */
-	min-height: 30px;
 }

 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -83,20 +92,18 @@
 }

 .wp-picker-container .iris-picker {
+	-webkit-border-radius: 0;
 	border-radius: 0;
 	border-color: #ddd;
 	margin-top: 6px;
 }

 .wp-picker-container input[type="text"].wp-color-picker {
-	width: 4rem;
+	width: 65px;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 2.33333333; /* 28px */
+	line-height: 16px;
 	margin: 0;
-	padding: 0 5px;
-	vertical-align: top;
-	min-height: 30px;
 }

 .wp-color-picker::-webkit-input-placeholder {
@@ -117,64 +124,3 @@
 	border-color: #c00;
 	color: #000;
 }
-
-.iris-picker .ui-square-handle:focus,
-.iris-picker .iris-strip .ui-slider-handle:focus {
-	box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
-}
-
-.iris-picker .iris-palette:focus {
-	box-shadow:
-		inset 0 0 5px rgba(0, 0, 0, 0.4),
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
-}
-
-@media screen and (max-width: 782px) {
-	.wp-picker-container input[type="text"].wp-color-picker {
-		width: 5rem;
-		font-size: 16px;
-		line-height: 1.875; /* 30px */
-		min-height: 32px;
-	}
-
-	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
-		padding: 0 5px;
-	}
-
-	.wp-picker-input-wrap .button.wp-picker-default {
-		padding: 0 8px;
-		line-height: 2.14285714; /* 30px */
-		min-height: 32px;
-	}
-
-	.wp-customizer .wp-picker-input-wrap .button.wp-picker-default {
-		padding: 0 8px;
-		font-size: 14px;
-		line-height: 2.14285714; /* 30px */
-		min-height: 32px;
-	}
-
-	.wp-picker-container .wp-color-result.button {
-		padding: 0 40px 0 0;
-		font-size: 14px;
-		line-height: 2.14285714; /* 30px */
-	}
-
-	.wp-customizer .wp-picker-container .wp-color-result.button {
-		font-size: 14px;
-		line-height: 2.14285714; /* 30px */
-	}
-
-	.wp-picker-container .wp-color-result-text {
-		padding: 0 14px;
-		font-size: inherit;
-		line-height: inherit;
-	}
-
-	.wp-customizer .wp-picker-container .wp-color-result-text {
-		padding: 0 10px;
-	}
-}
--- a/wp-admin/css/color-picker-rtl.min.css
+++ b/wp-admin/css/color-picker-rtl.min.css
@@ -1,2 +1 @@
-/*! This file is auto-generated */
-.wp-color-picker{width:80px;direction:ltr}.wp-picker-container .hidden{display:none}.wp-picker-container .wp-color-result.button{min-height:30px;margin:0 0 6px 6px;padding:0 30px 0 0;font-size:11px}.wp-color-result-text{background:#f7f7f7;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;display:block;line-height:2.54545455;padding:0 6px;text-align:center}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-right:1px solid #999}.wp-picker-container{display:inline-block}.wp-color-result:focus{border-color:#5b9dd9;box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-color-result:active{transform:none!important}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-input-wrap label{display:inline-block;vertical-align:top}.form-table .wp-picker-input-wrap label{margin:0!important}.wp-customizer .wp-picker-input-wrap .button.wp-picker-default,.wp-picker-input-wrap .button.wp-picker-default{margin-right:6px;padding:0 8px;line-height:2.54545455;min-height:30px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:4rem;font-size:12px;font-family:monospace;line-height:2.33333333;margin:0;padding:0 5px;vertical-align:top;min-height:30px}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}.iris-picker .iris-strip .ui-slider-handle:focus,.iris-picker .ui-square-handle:focus{box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.iris-picker .iris-palette:focus{box-shadow:inset 0 0 5px rgba(0,0,0,.4),0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}@media screen and (max-width:782px){.wp-picker-container input[type=text].wp-color-picker{width:5rem;font-size:16px;line-height:1.875;min-height:32px}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:0 5px}.wp-picker-input-wrap .button.wp-picker-default{padding:0 8px;line-height:2.14285714;min-height:32px}.wp-customizer .wp-picker-input-wrap .button.wp-picker-default{padding:0 8px;font-size:14px;line-height:2.14285714;min-height:32px}.wp-picker-container .wp-color-result.button{padding:0 40px 0 0;font-size:14px;line-height:2.14285714}.wp-customizer .wp-picker-container .wp-color-result.button{font-size:14px;line-height:2.14285714}.wp-picker-container .wp-color-result-text{padding:0 14px;font-size:inherit;line-height:inherit}.wp-customizer .wp-picker-container .wp-color-result-text{padding:0 10px}}
+.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 0 6px 6px;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-right:30px;-webkit-box-shadow:0 1px 0 #ccc;box-shadow:0 1px 0 #ccc;top:0}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;left:0;text-align:center;top:0}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-right:1px solid #999}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 3px rgba(0,115,170,.8);box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-right:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{-webkit-border-radius:0;border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;line-height:16px;margin:0}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}
--- a/wp-admin/css/color-picker.css
+++ b/wp-admin/css/color-picker.css
@@ -1,30 +1,48 @@
-/* rtl:ignore */
 .wp-color-picker {
 	width: 80px;
-	direction: ltr;
 }

 .wp-picker-container .hidden {
 	display: none;
 }

-/* Needs higher specificiity. */
-.wp-picker-container .wp-color-result.button {
-	min-height: 30px;
+.wp-color-result {
+	background-color: #f7f7f7;
+	border: 1px solid #ccc;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	cursor: pointer;
+	display: inline-block;
+	height: 22px;
 	margin: 0 6px 6px 0px;
-	padding: 0 0 0 30px;
-	font-size: 11px;
+	position: relative;
+	top: 1px;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	vertical-align: bottom;
+	display: inline-block;
+	padding-left: 30px;
+	-webkit-box-shadow: 0 1px 0 #ccc;
+	box-shadow: 0 1px 0 #ccc;
 }

-.wp-color-result-text {
+.wp-color-result:after {
 	background: #f7f7f7;
+	-webkit-border-radius: 0 2px 2px 0;
 	border-radius: 0 2px 2px 0;
 	border-left: 1px solid #ccc;
 	color: #555;
+	content: attr( title );
 	display: block;
-	line-height: 2.54545455; /* 28px */
+	font-size: 11px;
+	line-height: 22px;
 	padding: 0 6px;
+	position: relative;
+	right: 0;
 	text-align: center;
+	top: 0;
 }

 .wp-color-result:hover,
@@ -41,18 +59,23 @@
 	border-left: 1px solid #999;
 }

-.wp-picker-container {
+.wp-color-result {
+	top: 0;
+}
+
+.wp-color-result.wp-picker-open:after {
+	content: attr( data-current );
+}
+
+.wp-picker-container, .wp-picker-container:active {
 	display: inline-block;
+	outline: 0;
 }

 .wp-color-result:focus {
 	border-color: #5b9dd9;
-	box-shadow: 0 0 3px rgba(0, 115, 170, 0.8);
-}
-
-.wp-color-result:active {
-	/* See Trac ticket #39662 */
-	transform: none !important;
+	-webkit-box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
+	box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
 }

 .wp-picker-open + .wp-picker-input-wrap {
@@ -60,22 +83,8 @@
 	vertical-align: top;
 }

-.wp-picker-input-wrap label {
-	display: inline-block;
-	vertical-align: top;
-}
-
-/* For the old `custom-background` page, to override the inline-block and margins from `.form-table td fieldset label`. */
-.form-table .wp-picker-input-wrap label {
-	margin: 0 !important;
-}
-
-.wp-picker-input-wrap .button.wp-picker-default,
-.wp-customizer .wp-picker-input-wrap .button.wp-picker-default {
+.wp-picker-container .button {
 	margin-left: 6px;
-	padding: 0 8px;
-	line-height: 2.54545455; /* 28px */
-	min-height: 30px;
 }

 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -83,20 +92,18 @@
 }

 .wp-picker-container .iris-picker {
+	-webkit-border-radius: 0;
 	border-radius: 0;
 	border-color: #ddd;
 	margin-top: 6px;
 }

 .wp-picker-container input[type="text"].wp-color-picker {
-	width: 4rem;
+	width: 65px;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 2.33333333; /* 28px */
+	line-height: 16px;
 	margin: 0;
-	padding: 0 5px;
-	vertical-align: top;
-	min-height: 30px;
 }

 .wp-color-picker::-webkit-input-placeholder {
@@ -117,64 +124,3 @@
 	border-color: #c00;
 	color: #000;
 }
-
-.iris-picker .ui-square-handle:focus,
-.iris-picker .iris-strip .ui-slider-handle:focus {
-	box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
-}
-
-.iris-picker .iris-palette:focus {
-	box-shadow:
-		inset 0 0 5px rgba(0, 0, 0, 0.4),
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
-}
-
-@media screen and (max-width: 782px) {
-	.wp-picker-container input[type="text"].wp-color-picker {
-		width: 5rem;
-		font-size: 16px;
-		line-height: 1.875; /* 30px */
-		min-height: 32px;
-	}
-
-	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
-		padding: 0 5px;
-	}
-
-	.wp-picker-input-wrap .button.wp-picker-default {
-		padding: 0 8px;
-		line-height: 2.14285714; /* 30px */
-		min-height: 32px;
-	}
-
-	.wp-customizer .wp-picker-input-wrap .button.wp-picker-default {
-		padding: 0 8px;
-		font-size: 14px;
-		line-height: 2.14285714; /* 30px */
-		min-height: 32px;
-	}
-
-	.wp-picker-container .wp-color-result.button {
-		padding: 0 0 0 40px;
-		font-size: 14px;
-		line-height: 2.14285714; /* 30px */
-	}
-
-	.wp-customizer .wp-picker-container .wp-color-result.button {
-		font-size: 14px;
-		line-height: 2.14285714; /* 30px */
-	}
-
-	.wp-picker-container .wp-color-result-text {
-		padding: 0 14px;
-		font-size: inherit;
-		line-height: inherit;
-	}
-
-	.wp-customizer .wp-picker-container .wp-color-result-text {
-		padding: 0 10px;
-	}
-}
--- a/wp-admin/css/color-picker.min.css
+++ b/wp-admin/css/color-picker.min.css
@@ -1,2 +1 @@
-/*! This file is auto-generated */
-.wp-color-picker{width:80px;direction:ltr}.wp-picker-container .hidden{display:none}.wp-picker-container .wp-color-result.button{min-height:30px;margin:0 6px 6px 0;padding:0 0 0 30px;font-size:11px}.wp-color-result-text{background:#f7f7f7;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;display:block;line-height:2.54545455;padding:0 6px;text-align:center}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-left:1px solid #999}.wp-picker-container{display:inline-block}.wp-color-result:focus{border-color:#5b9dd9;box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-color-result:active{transform:none!important}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-input-wrap label{display:inline-block;vertical-align:top}.form-table .wp-picker-input-wrap label{margin:0!important}.wp-customizer .wp-picker-input-wrap .button.wp-picker-default,.wp-picker-input-wrap .button.wp-picker-default{margin-left:6px;padding:0 8px;line-height:2.54545455;min-height:30px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:4rem;font-size:12px;font-family:monospace;line-height:2.33333333;margin:0;padding:0 5px;vertical-align:top;min-height:30px}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}.iris-picker .iris-strip .ui-slider-handle:focus,.iris-picker .ui-square-handle:focus{box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.iris-picker .iris-palette:focus{box-shadow:inset 0 0 5px rgba(0,0,0,.4),0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}@media screen and (max-width:782px){.wp-picker-container input[type=text].wp-color-picker{width:5rem;font-size:16px;line-height:1.875;min-height:32px}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:0 5px}.wp-picker-input-wrap .button.wp-picker-default{padding:0 8px;line-height:2.14285714;min-height:32px}.wp-customizer .wp-picker-input-wrap .button.wp-picker-default{padding:0 8px;font-size:14px;line-height:2.14285714;min-height:32px}.wp-picker-container .wp-color-result.button{padding:0 0 0 40px;font-size:14px;line-height:2.14285714}.wp-customizer .wp-picker-container .wp-color-result.button{font-size:14px;line-height:2.14285714}.wp-picker-container .wp-color-result-text{padding:0 14px;font-size:inherit;line-height:inherit}.wp-customizer .wp-picker-container .wp-color-result-text{padding:0 10px}}
+.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 6px 6px 0;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-left:30px;-webkit-box-shadow:0 1px 0 #ccc;box-shadow:0 1px 0 #ccc;top:0}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;right:0;text-align:center;top:0}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-left:1px solid #999}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 3px rgba(0,115,170,.8);box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-left:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{-webkit-border-radius:0;border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;line-height:16px;margin:0}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}
--- a/wp-admin/css/colors/_admin.scss
+++ b/wp-admin/css/colors/_admin.scss
@@ -2,11 +2,8 @@
@import 'variables';
@import 'mixins';

-@function url-friendly-colour( $color ) {
-	@return '%23' + str-slice( '#{ $color }', 2, -1 );
-}

-body {
+html {
 	background: $body-background;
 }

@@ -23,22 +20,21 @@ a {
 	}
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-	color: currentColor;
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
+	color: $link-focus;
 }


 /* Forms */

-input[type=checkbox]:checked::before {
-	content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27#{url-friendly-colour($form-checked)}%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+	color: $form-checked;
 }

-input[type=radio]:checked::before {
+input[type=radio]:checked:before {
 	background: $form-checked;
 }

@@ -47,80 +43,14 @@ input[type=radio]:checked::before {
 	color: $link-focus;
 }

-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="color"]:focus,
-input[type="date"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="email"]:focus,
-input[type="month"]:focus,
-input[type="number"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="text"]:focus,
-input[type="time"]:focus,
-input[type="url"]:focus,
-input[type="week"]:focus,
-input[type="checkbox"]:focus,
-input[type="radio"]:focus,
-select:focus,
-textarea:focus {
-	border-color: $highlight-color;
-	box-shadow: 0 0 0 1px $highlight-color;
-}
-

 /* Core UI */

 .wp-core-ui {
-
-	.button {
-		border-color: #7e8993;
-		color: #32373c;
-	}
-
-	.button.hover,
-	.button:hover,
-	.button.focus,
-	.button:focus {
-		border-color: darken( #7e8993, 5% );
-		color: darken( #32373c, 5% );
-	}
-
-	.button.focus,
-	.button:focus {
-		border-color: #7e8993;
-		color: darken( #32373c, 5% );
-		box-shadow: 0 0 0 1px #32373c;
-	}
-
-	.button:active {
-		border-color: #7e8993;
-		color: darken( #32373c, 5% );
-		box-shadow: none;
-	}
-
-	.button.active,
-	.button.active:focus,
-	.button.active:hover {
-		border-color: $button-color;
-		color: darken( #32373c, 5% );
-		box-shadow: inset 0 2px 5px -3px $button-color;
-	}
-
-	.button.active:focus {
-		box-shadow: 0 0 0 1px #32373c;
-	}
-
 	.button-primary {
 		@include button( $button-color );
 	}

-	.button-group > .button.active {
-		border-color: $button-color;
-	}
-
 	.wp-ui-primary {
 		color: $text-color;
 		background-color: $base-color;
@@ -154,7 +84,9 @@ textarea:focus {
 /* List tables */

 .wrap .add-new-h2:hover, /* deprecated */
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
 	color: $menu-text;
 	background-color: $menu-background;
 }
@@ -200,7 +132,7 @@ textarea:focus {

 /* Active tabs use a bottom border color that matches the page background color. */

-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
 	background-color: $body-background;
@@ -295,15 +227,23 @@ ul#adminmenu > li.current > a.current:after {

 /* Admin Menu: collapse button */

-#collapse-button {
+#collapse-menu {
    color: $menu-collapse-text;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-    color: $menu-submenu-focus-text;
+#collapse-menu:hover {
+    color: $menu-collapse-focus-text;
 }

+#collapse-button div:after {
+    color: $menu-collapse-icon;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+    color: $menu-collapse-focus-icon;
+}
+
+
 /* Admin Bar */

 #wpadminbar {
@@ -384,7 +324,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -418,26 +357,6 @@ ul#adminmenu > li.current > a.current:after {
 	background: $adminbar-input-background;
 }

-/* Admin Bar: recovery mode */
-
-#wpadminbar #wp-admin-bar-recovery-mode {
-	color: $adminbar-recovery-exit-text;
-	background-color: $adminbar-recovery-exit-background;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-	color: $adminbar-recovery-exit-text;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover >.ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-	color: $adminbar-recovery-exit-text;
-	background-color: $adminbar-recovery-exit-background-alt;
-}
-
 /* Admin Bar: my account */

 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
@@ -496,7 +415,12 @@ ul#adminmenu > li.current > a.current:after {
 }

 .media-selection .attachment.selection.details .thumbnail {
-	box-shadow: 0 0 0 1px #fff, 0 0 0 3px $highlight-color;
+	-webkit-box-shadow:
+		0px 0px 0px 1px #fff,
+		0px 0px 0px 3px $highlight-color;
+	box-shadow:
+		0px 0px 0px 1px #fff,
+		0px 0px 0px 3px $highlight-color;
 }


@@ -550,6 +474,17 @@ body.more-filters-opened .more-filters:focus:before {
 	color: $menu-highlight-text;
 }

+/* Customize */
+
+#customize-theme-controls .widget-area-select .selected {
+	background-color: $menu-highlight-background;
+	color: $menu-highlight-text;
+}
+
+#customize-footer-actions .devices button:focus {
+	border-bottom-color: $highlight-color;
+}
+
 /* Responsive Component */

 div#wp-responsive-toggle a:before {
--- a/wp-admin/css/colors/_mixins.scss
+++ b/wp-admin/css/colors/_mixins.scss
@@ -1,38 +1,34 @@
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-@mixin button( $button-color, $button-text-color: #fff ) {
+@mixin button( $button-color, $text-color: white ) {
 	background: $button-color;
-	border-color: $button-color;
-	color: $button-text-color;
+	border-color: darken( $button-color, 10% ) darken( $button-color, 15% ) darken( $button-color, 15% );
+	color: $text-color;
+	box-shadow: 0 1px 0 darken( $button-color, 15% );
+	text-shadow: 0 -1px 1px darken( $button-color, 15% ),
+		1px 0 1px darken( $button-color, 15% ),
+		0 1px 1px darken( $button-color, 15% ),
+		-1px 0 1px darken( $button-color, 15% );

 	&:hover,
 	&:focus {
 		background: lighten( $button-color, 3% );
-		border-color: darken( $button-color, 3% );
-		color: $button-text-color;
+		border-color: darken( $button-color, 15% );
+		color: $text-color;
+		box-shadow: 0 1px 0 darken( $button-color, 15% );
 	}

 	&:focus {
-		box-shadow:
-			0 0 0 1px #fff,
-			0 0 0 3px $button-color;
+		box-shadow: inset 0 1px 0 darken( $button-color, 10% ),
+					0 0 2px 1px #33b3db;
 	}

 	&:active {
-		background: darken( $button-color, 5% );
-		border-color: darken( $button-color, 5% );
-		color: $button-text-color;
-	}
-
-	&.active,
-	&.active:focus,
-	&.active:hover {
-		background: $button-color;
-		color: $button-text-color;
+		background: darken( $button-color, 10% );
 		border-color: darken( $button-color, 15% );
-		box-shadow: inset 0 2px 5px -3px darken( $button-color, 50% );
+	 	box-shadow: inset 0 2px 0 darken( $button-color, 15% );
 	}

 	&[disabled],
@@ -41,7 +37,15 @@
 	&.disabled {
 		color: hsl( hue( $button-color ), 10%, 80% ) !important;
 		background: darken( $button-color, 8% ) !important;
-		border-color: darken( $button-color, 8% ) !important;
+		border-color: darken( $button-color, 15% ) !important;
 		text-shadow: none !important;
 	}
+
+	&.button-hero {
+		box-shadow: 0 2px 0 darken( $button-color, 15% ) !important;
+		&:active {
+		 	box-shadow: inset 0 3px 0 darken( $button-color, 15% ) !important;
+		}
+	}
+
 }
--- a/wp-admin/css/colors/_variables.scss
+++ b/wp-admin/css/colors/_variables.scss
@@ -18,9 +18,8 @@ $link: #0073aa !default;
 $link-focus: lighten( $link, 10% ) !default;

 $button-color: $highlight-color !default;
-$button-text-color: $text-color !default;
+$form-checked: $highlight-color !default;

-$form-checked: #7e8993 !default;

 // admin menu & admin-bar

@@ -56,8 +55,4 @@ $menu-collapse-focus-icon: $menu-highlight-icon !default;
 $adminbar-avatar-frame: lighten( $menu-background, 7% ) !default;
 $adminbar-input-background: lighten( $menu-background, 7% ) !default;

-$adminbar-recovery-exit-text: $menu-bubble-text !default;
-$adminbar-recovery-exit-background: $menu-bubble-background !default;
-$adminbar-recovery-exit-background-alt: mix(black, $adminbar-recovery-exit-background, 10%) !default;
-
 $menu-customizer-text: mix( $base-color, $text-color, 40% ) !default;
--- a/wp-admin/css/colors/blue/colors-rtl.css
+++ b/wp-admin/css/colors/blue/colors-rtl.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #096484;
-  box-shadow: 0 0 0 1px #096484;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #096484;
+}
+
+input[type=radio]:checked:before {
+  background: #096484;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #e1a948;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #e1a948;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #e1a948;
-  border-color: #e1a948;
-  color: #fff;
+  border-color: #d39323 #bd831f #bd831f;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #bd831f;
+  box-shadow: 0 1px 0 #bd831f;
+  text-shadow: 0 -1px 1px #bd831f, -1px 0 1px #bd831f, 0 1px 1px #bd831f, 1px 0 1px #bd831f;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e3af55;
-  border-color: #dfa33b;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e1a948;
-}
-.wp-core-ui .button-primary:active {
-  background: #dd9f32;
-  border-color: #dd9f32;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #e1a948;
-  color: #fff;
  border-color: #bd831f;
-  box-shadow: inset 0 2px 5px -3px #241906;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #bd831f;
+  box-shadow: 0 1px 0 #bd831f;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #d39323;
+  border-color: #bd831f;
+  -webkit-box-shadow: inset 0 2px 0 #bd831f;
+  box-shadow: inset 0 2px 0 #bd831f;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1cdc7 !important;
  background: #db9925 !important;
-  border-color: #db9925 !important;
+  border-color: #bd831f !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #e1a948;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #bd831f !important;
+  box-shadow: 0 2px 0 #bd831f !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #bd831f !important;
+  box-shadow: inset 0 3px 0 #bd831f !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #52accc;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #52accc;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #096484;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #096484;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #e1a948;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #e1a948;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #e5f8ff;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #52accc;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #e2ecf1;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,12 +259,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #e5f8ff;
 }

-#collapse-button:hover,
-#collapse-button:focus {
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #e5f8ff;
+}
+
+#collapse-menu:hover #collapse-button div:after {
  color: #fff;
 }

@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #6eb9d4;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #e1a948;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #cb9841;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #6eb9d4;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484;
 }

 .attachment.details .check {
  background-color: #096484;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #096484;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #096484;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #096484;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #096484;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #096484;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #e5f8ff;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #096484;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #096484;
-  box-shadow: 0 0 0 1px #096484;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #096484;
+}
+
+input[type=radio]:checked:before {
+  background: #096484;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #e1a948;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #e1a948;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #e1a948;
-  border-color: #e1a948;
-  color: #fff;
+  border-color: #d39323 #bd831f #bd831f;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #bd831f;
+  box-shadow: 0 1px 0 #bd831f;
+  text-shadow: 0 -1px 1px #bd831f, 1px 0 1px #bd831f, 0 1px 1px #bd831f, -1px 0 1px #bd831f;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e3af55;
-  border-color: #dfa33b;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e1a948;
-}
-.wp-core-ui .button-primary:active {
-  background: #dd9f32;
-  border-color: #dd9f32;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #e1a948;
-  color: #fff;
  border-color: #bd831f;
-  box-shadow: inset 0 2px 5px -3px #241906;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #bd831f;
+  box-shadow: 0 1px 0 #bd831f;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #d39323;
+  border-color: #bd831f;
+  -webkit-box-shadow: inset 0 2px 0 #bd831f;
+  box-shadow: inset 0 2px 0 #bd831f;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1cdc7 !important;
  background: #db9925 !important;
-  border-color: #db9925 !important;
+  border-color: #bd831f !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #e1a948;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #bd831f !important;
+  box-shadow: 0 2px 0 #bd831f !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #bd831f !important;
+  box-shadow: inset 0 3px 0 #bd831f !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #52accc;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #52accc;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #096484;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #096484;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #e1a948;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #e1a948;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #e5f8ff;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #52accc;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #e2ecf1;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,12 +259,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #e5f8ff;
 }

-#collapse-button:hover,
-#collapse-button:focus {
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #e5f8ff;
+}
+
+#collapse-menu:hover #collapse-button div:after {
  color: #fff;
 }

@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #6eb9d4;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #e1a948;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #cb9841;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #6eb9d4;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484;
 }

 .attachment.details .check {
  background-color: #096484;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #096484;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #096484;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #096484;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #096484;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #096484;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #e5f8ff;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #096484;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%2359524c%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #59524c;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #c7a589;
-  box-shadow: 0 0 0 1px #c7a589;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #59524c;
+}
+
+input[type=radio]:checked:before {
+  background: #59524c;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #c7a589;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #c7a589;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #c7a589;
-  border-color: #c7a589;
-  color: #fff;
+  border-color: #b78b66 #ae7d55 #ae7d55;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ae7d55;
+  box-shadow: 0 1px 0 #ae7d55;
+  text-shadow: 0 -1px 1px #ae7d55, -1px 0 1px #ae7d55, 0 1px 1px #ae7d55, 1px 0 1px #ae7d55;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #ccad93;
-  border-color: #c29d7f;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #c7a589;
-}
-.wp-core-ui .button-primary:active {
-  background: #bf9878;
-  border-color: #bf9878;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #c7a589;
-  color: #fff;
  border-color: #ae7d55;
-  box-shadow: inset 0 2px 5px -3px #37271a;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ae7d55;
+  box-shadow: 0 1px 0 #ae7d55;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #b78b66;
+  border-color: #ae7d55;
+  -webkit-box-shadow: inset 0 2px 0 #ae7d55;
+  box-shadow: inset 0 2px 0 #ae7d55;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1ccc7 !important;
  background: #ba906d !important;
-  border-color: #ba906d !important;
+  border-color: #ae7d55 !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #c7a589;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ae7d55 !important;
+  box-shadow: 0 2px 0 #ae7d55 !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ae7d55 !important;
+  box-shadow: inset 0 3px 0 #ae7d55 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #59524c;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #59524c;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #c7a589;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #c7a589;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #9ea476;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #9ea476;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f2f1;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #59524c;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cdcbc9;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #f3f2f1;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #c7a589;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #f3f2f1;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #6c645c;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #9ea476;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #8e946a;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #6c645c;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589;
 }

 .attachment.details .check {
  background-color: #c7a589;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #c7a589;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #c7a589;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #c7a589;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #c7a589;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #c7a589;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f2f1;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #c7a589;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%2359524c%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #59524c;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #c7a589;
-  box-shadow: 0 0 0 1px #c7a589;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #59524c;
+}
+
+input[type=radio]:checked:before {
+  background: #59524c;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #c7a589;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #c7a589;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #c7a589;
-  border-color: #c7a589;
-  color: #fff;
+  border-color: #b78b66 #ae7d55 #ae7d55;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ae7d55;
+  box-shadow: 0 1px 0 #ae7d55;
+  text-shadow: 0 -1px 1px #ae7d55, 1px 0 1px #ae7d55, 0 1px 1px #ae7d55, -1px 0 1px #ae7d55;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #ccad93;
-  border-color: #c29d7f;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #c7a589;
-}
-.wp-core-ui .button-primary:active {
-  background: #bf9878;
-  border-color: #bf9878;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #c7a589;
-  color: #fff;
  border-color: #ae7d55;
-  box-shadow: inset 0 2px 5px -3px #37271a;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ae7d55;
+  box-shadow: 0 1px 0 #ae7d55;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #b78b66;
+  border-color: #ae7d55;
+  -webkit-box-shadow: inset 0 2px 0 #ae7d55;
+  box-shadow: inset 0 2px 0 #ae7d55;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1ccc7 !important;
  background: #ba906d !important;
-  border-color: #ba906d !important;
+  border-color: #ae7d55 !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #c7a589;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ae7d55 !important;
+  box-shadow: 0 2px 0 #ae7d55 !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ae7d55 !important;
+  box-shadow: inset 0 3px 0 #ae7d55 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #59524c;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #59524c;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #c7a589;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #c7a589;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #9ea476;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #9ea476;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f2f1;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #59524c;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cdcbc9;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #f3f2f1;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #c7a589;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #f3f2f1;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #6c645c;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #9ea476;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #8e946a;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #6c645c;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589;
 }

 .attachment.details .check {
  background-color: #c7a589;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #c7a589;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #c7a589;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #c7a589;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #c7a589;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #c7a589;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f2f1;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #c7a589;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23523f6d%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #523f6d;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #a3b745;
-  box-shadow: 0 0 0 1px #a3b745;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #523f6d;
+}
+
+input[type=radio]:checked:before {
+  background: #523f6d;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #a3b745;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #a3b745;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #a3b745;
-  border-color: #a3b745;
-  color: #fff;
+  border-color: #829237 #727f30 #727f30;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #727f30;
+  box-shadow: 0 1px 0 #727f30;
+  text-shadow: 0 -1px 1px #727f30, -1px 0 1px #727f30, 0 1px 1px #727f30, 1px 0 1px #727f30;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a9bd4f;
-  border-color: #99ac41;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #a3b745;
-}
-.wp-core-ui .button-primary:active {
-  background: #93a43e;
-  border-color: #93a43e;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #a3b745;
-  color: #fff;
  border-color: #727f30;
-  box-shadow: inset 0 2px 5px -3px black;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #727f30;
+  box-shadow: 0 1px 0 #727f30;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #829237;
+  border-color: #727f30;
+  -webkit-box-shadow: inset 0 2px 0 #727f30;
+  box-shadow: inset 0 2px 0 #727f30;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #cfd1c7 !important;
  background: #89993a !important;
-  border-color: #89993a !important;
+  border-color: #727f30 !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #a3b745;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #727f30 !important;
+  box-shadow: 0 2px 0 #727f30 !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #727f30 !important;
+  box-shadow: inset 0 3px 0 #727f30 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #523f6d;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #523f6d;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #a3b745;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #a3b745;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d46f15;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #d46f15;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #ece6f6;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #523f6d;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cbc5d3;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #ece6f6;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #a3b745;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #ece6f6;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #634c84;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #d46f15;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #bf6413;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #634c84;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745;
 }

 .attachment.details .check {
  background-color: #a3b745;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #a3b745;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #a3b745;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #a3b745;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #a3b745;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #a3b745;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #ece6f6;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #a3b745;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23523f6d%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #523f6d;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #a3b745;
-  box-shadow: 0 0 0 1px #a3b745;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #523f6d;
+}
+
+input[type=radio]:checked:before {
+  background: #523f6d;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #a3b745;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #a3b745;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #a3b745;
-  border-color: #a3b745;
-  color: #fff;
+  border-color: #829237 #727f30 #727f30;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #727f30;
+  box-shadow: 0 1px 0 #727f30;
+  text-shadow: 0 -1px 1px #727f30, 1px 0 1px #727f30, 0 1px 1px #727f30, -1px 0 1px #727f30;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a9bd4f;
-  border-color: #99ac41;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #a3b745;
-}
-.wp-core-ui .button-primary:active {
-  background: #93a43e;
-  border-color: #93a43e;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #a3b745;
-  color: #fff;
  border-color: #727f30;
-  box-shadow: inset 0 2px 5px -3px black;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #727f30;
+  box-shadow: 0 1px 0 #727f30;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #829237;
+  border-color: #727f30;
+  -webkit-box-shadow: inset 0 2px 0 #727f30;
+  box-shadow: inset 0 2px 0 #727f30;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #cfd1c7 !important;
  background: #89993a !important;
-  border-color: #89993a !important;
+  border-color: #727f30 !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #a3b745;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #727f30 !important;
+  box-shadow: 0 2px 0 #727f30 !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #727f30 !important;
+  box-shadow: inset 0 3px 0 #727f30 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #523f6d;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #523f6d;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #a3b745;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #a3b745;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d46f15;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #d46f15;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #ece6f6;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #523f6d;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cbc5d3;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #ece6f6;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #a3b745;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #ece6f6;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #634c84;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #d46f15;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #bf6413;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #634c84;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745;
 }

 .attachment.details .check {
  background-color: #a3b745;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #a3b745;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #a3b745;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #a3b745;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #a3b745;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #a3b745;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #ece6f6;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #a3b745;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f5f5f5;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #04a4cc;
-  box-shadow: 0 0 0 1px #04a4cc;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #04a4cc;
+}
+
+input[type=radio]:checked:before {
+  background: #04a4cc;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #04a4cc;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #04a4cc;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #04a4cc;
-  border-color: #04a4cc;
-  color: #fff;
+  border-color: #037c9a #036881 #036881;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #036881;
+  box-shadow: 0 1px 0 #036881;
+  text-shadow: 0 -1px 1px #036881, -1px 0 1px #036881, 0 1px 1px #036881, 1px 0 1px #036881;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #04b0db;
-  border-color: #0498bd;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #04a4cc;
-}
-.wp-core-ui .button-primary:active {
-  background: #0490b3;
-  border-color: #0490b3;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #04a4cc;
-  color: #fff;
  border-color: #036881;
-  box-shadow: inset 0 2px 5px -3px black;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #036881;
+  box-shadow: 0 1px 0 #036881;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #037c9a;
+  border-color: #036881;
+  -webkit-box-shadow: inset 0 2px 0 #036881;
+  box-shadow: inset 0 2px 0 #036881;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #c7cfd1 !important;
  background: #0384a4 !important;
-  border-color: #0384a4 !important;
+  border-color: #036881 !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #04a4cc;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #036881 !important;
+  box-shadow: 0 2px 0 #036881 !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #036881 !important;
+  box-shadow: inset 0 3px 0 #036881 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #333;
  background-color: #e5e5e5;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #e5e5e5;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #888;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #888;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d64e07;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #d64e07;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #999;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #333;
  background-color: #e5e5e5;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f5f5f5;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #686868;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #333;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #777;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #04a4cc;
+#collapse-menu:hover {
+  color: #333;
+}
+
+#collapse-button div:after {
+  color: #999;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #555;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #f7f7f7;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #d64e07;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #c14606;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #f7f7f7;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc;
 }

 .attachment.details .check {
  background-color: #04a4cc;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #04a4cc;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #04a4cc;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #04a4cc;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #888;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #04a4cc;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #999;
@@ -574,4 +541,4 @@ div#wp-responsive-toggle a:before {
 .theme-section.current,
 .theme-filter.current {
  border-bottom-color: #04a4cc;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f5f5f5;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #04a4cc;
-  box-shadow: 0 0 0 1px #04a4cc;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #04a4cc;
+}
+
+input[type=radio]:checked:before {
+  background: #04a4cc;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #04a4cc;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #04a4cc;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #04a4cc;
-  border-color: #04a4cc;
-  color: #fff;
+  border-color: #037c9a #036881 #036881;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #036881;
+  box-shadow: 0 1px 0 #036881;
+  text-shadow: 0 -1px 1px #036881, 1px 0 1px #036881, 0 1px 1px #036881, -1px 0 1px #036881;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #04b0db;
-  border-color: #0498bd;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #04a4cc;
-}
-.wp-core-ui .button-primary:active {
-  background: #0490b3;
-  border-color: #0490b3;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #04a4cc;
-  color: #fff;
  border-color: #036881;
-  box-shadow: inset 0 2px 5px -3px black;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #036881;
+  box-shadow: 0 1px 0 #036881;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #037c9a;
+  border-color: #036881;
+  -webkit-box-shadow: inset 0 2px 0 #036881;
+  box-shadow: inset 0 2px 0 #036881;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #c7cfd1 !important;
  background: #0384a4 !important;
-  border-color: #0384a4 !important;
+  border-color: #036881 !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #04a4cc;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #036881 !important;
+  box-shadow: 0 2px 0 #036881 !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #036881 !important;
+  box-shadow: inset 0 3px 0 #036881 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #333;
  background-color: #e5e5e5;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #e5e5e5;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #888;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #888;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d64e07;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #d64e07;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #999;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #333;
  background-color: #e5e5e5;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f5f5f5;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #686868;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #333;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #777;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #04a4cc;
+#collapse-menu:hover {
+  color: #333;
+}
+
+#collapse-button div:after {
+  color: #999;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #555;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #f7f7f7;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #d64e07;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #c14606;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #f7f7f7;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc;
 }

 .attachment.details .check {
  background-color: #04a4cc;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #04a4cc;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #04a4cc;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #04a4cc;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #888;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #04a4cc;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #999;
@@ -574,4 +541,4 @@ div#wp-responsive-toggle a:before {
 .theme-section.current,
 .theme-filter.current {
  border-bottom-color: #04a4cc;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #e14d43;
-  box-shadow: 0 0 0 1px #e14d43;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #e14d43;
+}
+
+input[type=radio]:checked:before {
+  background: #e14d43;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #e14d43;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #e14d43;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #e14d43;
-  border-color: #e14d43;
-  color: #fff;
+  border-color: #d02c21 #ba281e #ba281e;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ba281e;
+  box-shadow: 0 1px 0 #ba281e;
+  text-shadow: 0 -1px 1px #ba281e, -1px 0 1px #ba281e, 0 1px 1px #ba281e, 1px 0 1px #ba281e;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e35950;
-  border-color: #df4136;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e14d43;
-}
-.wp-core-ui .button-primary:active {
-  background: #dd382d;
-  border-color: #dd382d;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #e14d43;
-  color: #fff;
  border-color: #ba281e;
-  box-shadow: inset 0 2px 5px -3px #200705;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ba281e;
+  box-shadow: 0 1px 0 #ba281e;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #d02c21;
+  border-color: #ba281e;
+  -webkit-box-shadow: inset 0 2px 0 #ba281e;
+  box-shadow: inset 0 2px 0 #ba281e;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1c8c7 !important;
  background: #d92e23 !important;
-  border-color: #d92e23 !important;
+  border-color: #ba281e !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #e14d43;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ba281e !important;
+  box-shadow: 0 2px 0 #ba281e !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ba281e !important;
+  box-shadow: inset 0 3px 0 #ba281e !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #363b3f;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #363b3f;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #e14d43;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #e14d43;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #69a8bb;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #69a8bb;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f1f2f3;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #363b3f;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #c3c4c5;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #f1f2f3;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #e14d43;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #f1f2f3;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #464d52;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #69a8bb;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #5f97a8;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #464d52;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43;
 }

 .attachment.details .check {
  background-color: #e14d43;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e14d43;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #e14d43;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #e14d43;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #e14d43;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #e14d43;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f1f2f3;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #e14d43;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #e14d43;
-  box-shadow: 0 0 0 1px #e14d43;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #e14d43;
+}
+
+input[type=radio]:checked:before {
+  background: #e14d43;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #e14d43;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #e14d43;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #e14d43;
-  border-color: #e14d43;
-  color: #fff;
+  border-color: #d02c21 #ba281e #ba281e;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ba281e;
+  box-shadow: 0 1px 0 #ba281e;
+  text-shadow: 0 -1px 1px #ba281e, 1px 0 1px #ba281e, 0 1px 1px #ba281e, -1px 0 1px #ba281e;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e35950;
-  border-color: #df4136;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e14d43;
-}
-.wp-core-ui .button-primary:active {
-  background: #dd382d;
-  border-color: #dd382d;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #e14d43;
-  color: #fff;
  border-color: #ba281e;
-  box-shadow: inset 0 2px 5px -3px #200705;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ba281e;
+  box-shadow: 0 1px 0 #ba281e;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #d02c21;
+  border-color: #ba281e;
+  -webkit-box-shadow: inset 0 2px 0 #ba281e;
+  box-shadow: inset 0 2px 0 #ba281e;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1c8c7 !important;
  background: #d92e23 !important;
-  border-color: #d92e23 !important;
+  border-color: #ba281e !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #e14d43;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ba281e !important;
+  box-shadow: 0 2px 0 #ba281e !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ba281e !important;
+  box-shadow: inset 0 3px 0 #ba281e !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #363b3f;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #363b3f;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #e14d43;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #e14d43;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #69a8bb;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #69a8bb;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f1f2f3;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #363b3f;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #c3c4c5;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #f1f2f3;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #e14d43;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #f1f2f3;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #464d52;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #69a8bb;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #5f97a8;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #464d52;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43;
 }

 .attachment.details .check {
  background-color: #e14d43;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e14d43;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #e14d43;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #e14d43;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #e14d43;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #e14d43;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f1f2f3;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #e14d43;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23738e96%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #738e96;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #9ebaa0;
-  box-shadow: 0 0 0 1px #9ebaa0;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #738e96;
+}
+
+input[type=radio]:checked:before {
+  background: #738e96;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #9ebaa0;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #9ebaa0;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #9ebaa0;
-  border-color: #9ebaa0;
-  color: #fff;
+  border-color: #80a583 #719a74 #719a74;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #719a74;
+  box-shadow: 0 1px 0 #719a74;
+  text-shadow: 0 -1px 1px #719a74, -1px 0 1px #719a74, 0 1px 1px #719a74, 1px 0 1px #719a74;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a7c0a9;
-  border-color: #95b497;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #9ebaa0;
-}
-.wp-core-ui .button-primary:active {
-  background: #8faf91;
-  border-color: #8faf91;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #9ebaa0;
-  color: #fff;
  border-color: #719a74;
-  box-shadow: inset 0 2px 5px -3px #253426;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #719a74;
+  box-shadow: 0 1px 0 #719a74;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #80a583;
+  border-color: #719a74;
+  -webkit-box-shadow: inset 0 2px 0 #719a74;
+  box-shadow: inset 0 2px 0 #719a74;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #c7d1c8 !important;
  background: #86a989 !important;
-  border-color: #86a989 !important;
+  border-color: #719a74 !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #9ebaa0;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #719a74 !important;
+  box-shadow: 0 2px 0 #719a74 !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #719a74 !important;
+  box-shadow: inset 0 3px 0 #719a74 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #738e96;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #738e96;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #9ebaa0;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #9ebaa0;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #aa9d88;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #aa9d88;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f2fcff;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #738e96;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #d5dde0;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #f2fcff;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #9ebaa0;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #f2fcff;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #879ea5;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #aa9d88;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #998d7a;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #879ea5;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0;
 }

 .attachment.details .check {
  background-color: #9ebaa0;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #9ebaa0;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #9ebaa0;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #9ebaa0;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #9ebaa0;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #9ebaa0;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f2fcff;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #9ebaa0;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23738e96%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #738e96;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #9ebaa0;
-  box-shadow: 0 0 0 1px #9ebaa0;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #738e96;
+}
+
+input[type=radio]:checked:before {
+  background: #738e96;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #9ebaa0;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #9ebaa0;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #9ebaa0;
-  border-color: #9ebaa0;
-  color: #fff;
+  border-color: #80a583 #719a74 #719a74;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #719a74;
+  box-shadow: 0 1px 0 #719a74;
+  text-shadow: 0 -1px 1px #719a74, 1px 0 1px #719a74, 0 1px 1px #719a74, -1px 0 1px #719a74;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a7c0a9;
-  border-color: #95b497;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #9ebaa0;
-}
-.wp-core-ui .button-primary:active {
-  background: #8faf91;
-  border-color: #8faf91;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #9ebaa0;
-  color: #fff;
  border-color: #719a74;
-  box-shadow: inset 0 2px 5px -3px #253426;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #719a74;
+  box-shadow: 0 1px 0 #719a74;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #80a583;
+  border-color: #719a74;
+  -webkit-box-shadow: inset 0 2px 0 #719a74;
+  box-shadow: inset 0 2px 0 #719a74;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #c7d1c8 !important;
  background: #86a989 !important;
-  border-color: #86a989 !important;
+  border-color: #719a74 !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #9ebaa0;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #719a74 !important;
+  box-shadow: 0 2px 0 #719a74 !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #719a74 !important;
+  box-shadow: inset 0 3px 0 #719a74 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #738e96;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #738e96;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #9ebaa0;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #9ebaa0;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #aa9d88;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #aa9d88;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f2fcff;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #738e96;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #d5dde0;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #f2fcff;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #9ebaa0;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #f2fcff;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #879ea5;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #aa9d88;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #998d7a;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #879ea5;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0;
 }

 .attachment.details .check {
  background-color: #9ebaa0;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #9ebaa0;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #9ebaa0;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #9ebaa0;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #9ebaa0;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #9ebaa0;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f2fcff;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #9ebaa0;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #dd823b;
-  box-shadow: 0 0 0 1px #dd823b;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #dd823b;
+}
+
+input[type=radio]:checked:before {
+  background: #dd823b;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #dd823b;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #dd823b;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #dd823b;
-  border-color: #dd823b;
-  color: #fff;
+  border-color: #c36922 #ad5d1e #ad5d1e;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ad5d1e;
+  box-shadow: 0 1px 0 #ad5d1e;
+  text-shadow: 0 -1px 1px #ad5d1e, -1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, 1px 0 1px #ad5d1e;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #df8a48;
-  border-color: #db7a2e;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #dd823b;
-}
-.wp-core-ui .button-primary:active {
-  background: #d97426;
-  border-color: #d97426;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #dd823b;
-  color: #fff;
  border-color: #ad5d1e;
-  box-shadow: inset 0 2px 5px -3px #150b04;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ad5d1e;
+  box-shadow: 0 1px 0 #ad5d1e;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #c36922;
+  border-color: #ad5d1e;
+  -webkit-box-shadow: inset 0 2px 0 #ad5d1e;
+  box-shadow: inset 0 2px 0 #ad5d1e;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1cbc7 !important;
  background: #cc6d23 !important;
-  border-color: #cc6d23 !important;
+  border-color: #ad5d1e !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #dd823b;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ad5d1e !important;
+  box-shadow: 0 2px 0 #ad5d1e !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ad5d1e !important;
+  box-shadow: inset 0 3px 0 #ad5d1e !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #cf4944;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #cf4944;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #dd823b;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #dd823b;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #ccaf0b;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #ccaf0b;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f1f1;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #cf4944;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #f1c8c7;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #f3f1f1;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #f7e3d3;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #f3f1f1;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #d66560;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #ccaf0b;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #b89e0a;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #d66560;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b;
 }

 .attachment.details .check {
  background-color: #dd823b;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #dd823b;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #dd823b;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #dd823b;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #dd823b;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #dd823b;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f1f1;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #dd823b;
-}
+}
--- 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
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -11,149 +10,115 @@ body {
 a {
  color: #0073aa;
 }
+
 a:hover, a:active, a:focus {
  color: #0096dd;
 }

-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+#media-upload a.del-link:hover,
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #dd823b;
-  box-shadow: 0 0 0 1px #dd823b;
+/* Forms */
+input[type=checkbox]:checked:before {
+  color: #dd823b;
+}
+
+input[type=radio]:checked:before {
+  background: #dd823b;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+  color: #0096dd;
 }

 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #dd823b;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #dd823b;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #dd823b;
-  border-color: #dd823b;
-  color: #fff;
+  border-color: #c36922 #ad5d1e #ad5d1e;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ad5d1e;
+  box-shadow: 0 1px 0 #ad5d1e;
+  text-shadow: 0 -1px 1px #ad5d1e, 1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, -1px 0 1px #ad5d1e;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #df8a48;
-  border-color: #db7a2e;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #dd823b;
-}
-.wp-core-ui .button-primary:active {
-  background: #d97426;
-  border-color: #d97426;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #dd823b;
-  color: #fff;
  border-color: #ad5d1e;
-  box-shadow: inset 0 2px 5px -3px #150b04;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ad5d1e;
+  box-shadow: 0 1px 0 #ad5d1e;
 }
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
+}
+
+.wp-core-ui .button-primary:active {
+  background: #c36922;
+  border-color: #ad5d1e;
+  -webkit-box-shadow: inset 0 2px 0 #ad5d1e;
+  box-shadow: inset 0 2px 0 #ad5d1e;
+}
+
 .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
  color: #d1cbc7 !important;
  background: #cc6d23 !important;
-  border-color: #cc6d23 !important;
+  border-color: #ad5d1e !important;
  text-shadow: none !important;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #dd823b;
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ad5d1e !important;
+  box-shadow: 0 2px 0 #ad5d1e !important;
 }
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ad5d1e !important;
+  box-shadow: inset 0 3px 0 #ad5d1e !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #cf4944;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #cf4944;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #dd823b;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #dd823b;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #ccaf0b;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #ccaf0b;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f1f1;
 }

 /* List tables */
 .wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #cf4944;
 }
@@ -195,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -226,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #f1c8c7;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -244,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -292,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

 /* Admin Menu: collapse button */
-#collapse-button {
+#collapse-menu {
  color: #f3f1f1;
 }

-#collapse-button:hover,
-#collapse-button:focus {
-  color: #f7e3d3;
+#collapse-menu:hover {
+  color: #fff;
+}
+
+#collapse-button div:after {
+  color: #f3f1f1;
+}
+
+#collapse-menu:hover #collapse-button div:after {
+  color: #fff;
 }

 /* Admin Bar */
@@ -378,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -410,25 +383,6 @@ ul#adminmenu > li.current > a.current:after {
  background: #d66560;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #ccaf0b;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #b89e0a;
-}
-
 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
  border-color: #d66560;
@@ -471,16 +425,19 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b;
  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b;
 }

 .attachment.details .check {
  background-color: #dd823b;
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b;
  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b;
 }

 .media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #dd823b;
+  -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #dd823b;
+  box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #dd823b;
 }

 /* Themes */
@@ -531,6 +488,16 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #dd823b;
+  color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+  border-bottom-color: #dd823b;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f1f1;
@@ -556,4 +523,4 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-normal.mce-active,
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #dd823b;
-}
+}
--- 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
--- 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
--- 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
--- 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
--- 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
@@ -1,22 +1,6 @@
-#customize-theme-controls #accordion-section-menu_locations {
+#accordion-section-menu_locations {
 	position: relative;
-	margin-top: 30px;
-}
-
-#customize-theme-controls #accordion-section-menu_locations > .accordion-section-title {
-	border-bottom-color: #ddd;
-	margin-top: 15px;
-}
-
-#customize-theme-controls .customize-section-title-nav_menus-heading,
-#customize-theme-controls .customize-section-title-menu_locations-heading,
-#customize-theme-controls .customize-section-title-menu_locations-description {
-	padding: 0 12px 0 12px;
-}
-
-#customize-theme-controls .customize-control-description.customize-section-title-menu_locations-description {
-	/* Override the default italic style for control descriptions */
-	font-style: normal;
+	margin-bottom: 15px;
 }

 .menu-in-location,
@@ -32,30 +16,11 @@
 	color: #555;
 }

-/* The `edit-menu` and `create-menu` buttons also use the `button-link` class. */
-.customize-control-nav_menu_location .edit-menu,
-.customize-control-nav_menu_location .create-menu {
-	margin-right: 6px;
-	vertical-align: middle;
-	line-height: 2.2;
-}
-
-#customize-controls .customize-control-nav_menu_name {
-	margin-bottom: 12px;
-}
-
-.customize-control-nav_menu_name p:last-of-type {
-	margin-bottom: 0;
-}
-
-#customize-new-menu-submit {
-	float: left;
-	min-width: 85px;
-}
-
 .wp-customizer .menu-item-bar .menu-item-handle,
 .wp-customizer .menu-item-settings,
 .wp-customizer .menu-item-settings .description-thin {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

@@ -78,18 +43,9 @@
 	text-align: left;
 }

-.wp-customizer .menu-item-handle:hover {
-	z-index: 8;
-}
-
-.customize-control-nav_menu_item.has-notifications .menu-item-handle {
-	border-right: 4px solid #00a0d2;
-}
-
 .wp-customizer .menu-item-settings {
 	max-width: 100%;
 	overflow: hidden;
-	z-index: 8;
 	padding: 10px;
 	background: #eee;
 	border: 1px solid #999;
@@ -158,6 +114,7 @@

 .customize-control input.menu-name-field {
 	width: 100%; /* Override the 98% default for customizer inputs, to align with the size of menu items. */
+	margin: 12px 0;
 }

 .wp-customizer .menu-item .item-edit {
@@ -168,14 +125,14 @@
 	width: 30px;
 	height: 38px;
 	margin-left: 0 !important;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	overflow: hidden;
 	cursor: pointer;
-	text-align: center;
 }

-.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:before {
+.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after {
 	content: "\f142";
 }

@@ -201,31 +158,13 @@
 	border-top: none;
 }

-.wp-customizer .menu-location-settings {
-	margin-top: 12px;
-	border-top: none;
-}
-
-.wp-customizer .control-section-nav_menu .menu-location-settings {
-	margin-top: 24px;
-	border-top: 1px solid #ddd;
-}
-
-.wp-customizer .control-section-nav_menu .menu-location-settings,
-.customize-control-nav_menu_auto_add {
-	padding-top: 12px;
-}
-
-.menu-location-settings .customize-control-checkbox .theme-location-set {
+.menu-settings .customize-control-checkbox label {
 	line-height: 1;
 }

-.customize-control-nav_menu_auto_add label {
-	vertical-align: top;
-}
-
-.menu-location-settings .new-menu-locations-widget-note {
-	display: block;
+/* @todo update selector or potentially remove */
+.menu-settings .customize-control.customize-control-checkbox {
+	margin-bottom: 8px; /* Override collapsing at smaller viewports. */
 }

 .customize-control-menu {
@@ -289,6 +228,7 @@

 .customize-screen-options-toggle:focus:before,
 #customize-controls .customize-info .customize-help-toggle:focus:before {
+	-webkit-border-radius: 100%;
 	border-radius: 100%;
 }

@@ -310,18 +250,18 @@
 	display: inline-block;
 	font-size: 20px;
 	line-height: 1;
+	text-indent: -1px; /* account for the dashicon alignment */
 }

 .rtl .wp-customizer .toggle-indicator {
 	text-indent: 1px; /* account for the dashicon alignment */
 }

-.wp-customizer .menu-item .item-edit .toggle-indicator:before,
-#available-menu-items .accordion-section-title .toggle-indicator:before {
+.wp-customizer .toggle-indicator:after {
 	content: "\f140";
-	display: block;
-	padding: 1px 0px 1px 2px;
 	speak: none;
+	vertical-align: top;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	color: #72777c;
 	font: normal 20px/1 dashicons;
@@ -330,19 +270,19 @@
 	text-decoration: none !important;
 }

-.control-section-nav_menu .field-link-target,
-.control-section-nav_menu .field-title-attribute,
-.control-section-nav_menu .field-css-classes,
-.control-section-nav_menu .field-xfn,
-.control-section-nav_menu .field-description {
+#accordion-panel-nav_menus .field-link-target,
+#accordion-panel-nav_menus .field-title-attribute,
+#accordion-panel-nav_menus .field-css-classes,
+#accordion-panel-nav_menus .field-xfn,
+#accordion-panel-nav_menus .field-description {
 	display: none;
 }

-.control-section-nav_menu.field-link-target-active .field-link-target,
-.control-section-nav_menu.field-title-attribute-active .field-title-attribute,
-.control-section-nav_menu.field-css-classes-active .field-css-classes,
-.control-section-nav_menu.field-xfn-active .field-xfn,
-.control-section-nav_menu.field-description-active .field-description {
+#accordion-panel-nav_menus.field-link-target-active .field-link-target,
+#accordion-panel-nav_menus.field-title-attribute-active .field-title-attribute,
+#accordion-panel-nav_menus.field-css-classes-active .field-css-classes,
+#accordion-panel-nav_menus.field-xfn-active .field-xfn,
+#accordion-panel-nav_menus.field-description-active .field-description {
 	display: block;
 }

@@ -415,17 +355,18 @@
 .reordering .menu-item-depth-10 > .menu-item-bar { margin-left: 150px; }
 .reordering .menu-item-depth-11 > .menu-item-bar { margin-left: 165px; }

-.control-section-nav_menu.menu .menu-item-edit-active {
+.control-section-nav_menu .menu .menu-item-edit-active {
 	margin-right: 0;
 }

-.control-section-nav_menu.menu .menu-item-edit-active .menu-item-bar {
+.control-section-nav_menu .menu .menu-item-edit-active .menu-item-bar {
 	margin-left: 0;
 }

-.control-section-nav_menu.menu .sortable-placeholder {
+.control-section-nav_menu .menu .sortable-placeholder {
 	margin-top: 0;
 	margin-bottom: 1px;
+	max-width: -webkit-calc(100% - 2px);
 	max-width: calc(100% - 2px);
 	float: right;
 	display: list-item;
@@ -436,7 +377,7 @@
 	float: none;
 }

-.control-section-nav_menu.menu ul.menu-item-transport .menu-item-bar {
+.control-section-nav_menu .menu ul.menu-item-transport .menu-item-bar {
 	margin-top: 0;
 }

@@ -469,6 +410,7 @@
 	position: absolute;
 	top: 9px;
 	right: 5px;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	font: normal 20px/1 dashicons;
 	-webkit-font-smoothing: antialiased;
@@ -481,9 +423,10 @@

 .menu-item-bar .item-delete:hover,
 .menu-item-bar .item-delete:focus {
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
-	color: #dc3232;
+	color: #f00;
 }

 .adding-menu-items .menu-item-bar .item-edit {
@@ -511,12 +454,8 @@
 	border-right: none;
 	border-left: none;
 	background: #fff;
+	-webkit-transition: background-color 0.15s;
 	transition: background-color 0.15s;
-	/* Reset the value inherited from the base .accordion-section-title style. Ticket #37589. */
-	-webkit-user-select: auto;
-	-moz-user-select: auto;
-	-ms-user-select: auto;
-	user-select: auto;
 }

 #available-menu-items .open .accordion-section-title,
@@ -529,18 +468,18 @@
 	content: none !important;
 }

-#available-menu-items .accordion-section-title:hover .toggle-indicator:before,
-#available-menu-items .button-link:hover .toggle-indicator:before,
-#available-menu-items .button-link:focus .toggle-indicator:before {
+#available-menu-items .accordion-section-title:hover .toggle-indicator:after,
+#available-menu-items .button-link:hover .toggle-indicator:after,
+#available-menu-items .button-link:focus .toggle-indicator:after {
 	color: #23282d;
 }

-#available-menu-items .open .accordion-section-title .toggle-indicator:before {
+#available-menu-items .open .accordion-section-title .toggle-indicator:after {
 	content: "\f142";
 	color: #23282d;
 }

-#available-menu-items .available-menu-items-list {
+#available-menu-items .accordion-section-content {
 	overflow-y: auto;
 	max-height: 200px; /* This gets set in JS to fit the screen size, and based on # of sections. */
 	background: transparent;
@@ -553,10 +492,10 @@
 	position: absolute;
 	top: 5px;
 	left: 5px;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	cursor: pointer;
-	text-align: center;
 }

 #available-menu-items .accordion-section-title .no-items,
@@ -572,29 +511,14 @@
 #available-menu-items .cannot-expand .accordion-section-title .no-items {
 	float: left;
 	color: #555d66;
-	font-weight: 400;
+	font-weight: normal;
 	margin-right: 5px;
 }

 #available-menu-items .accordion-section-content {
-	max-height: 290px;
-	margin: 0;
-	padding: 0;
-	position: relative;
-	background: transparent;
-}
-
-#available-menu-items .accordion-section-content .available-menu-items-list {
-	margin: 0 0 45px 0;
 	padding: 1px 15px 15px 15px;
-}
-
-#available-menu-items .accordion-section-content .available-menu-items-list:only-child { /* Types that do not support new items for the current user */
-	margin-bottom: 0;
-}
-
-#new-custom-menu-item .accordion-section-content {
-	padding: 0 15px 15px 15px;
+	margin: 0;
+	max-height: 290px;
 }

 #available-menu-items .menu-item-tpl {
@@ -603,12 +527,9 @@

 #custom-menu-item-name.invalid,
 #custom-menu-item-url.invalid,
-.edit-menu-item-url.invalid,
 .menu-name-field.invalid,
-.menu-name-field.invalid:focus,
-#available-menu-items .new-content-item .create-item-input.invalid,
-#available-menu-items .new-content-item .create-item-input.invalid:focus {
-	border: 1px solid #dc3232;
+.menu-name-field.invalid:focus {
+	border: 1px solid #f00;
 }

 #available-menu-items .menu-item-handle .item-type {
@@ -624,6 +545,7 @@
 }

 #available-menu-items .menu-item-handle {
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	margin-top: -1px;
 }
@@ -644,10 +566,10 @@
 	color: #82878c;
 	width: 30px;
 	height: 38px;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	cursor: pointer;
-	text-align: center;
 }

 #available-menu-items .menu-item-handle .item-add:focus {
@@ -661,6 +583,7 @@
 	top: 3px;
 	display: inline-block;
 	height: 20px;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	font: normal 20px/1.05 dashicons; /* line height is to account for the dashicon's vertical alignment */
 }
@@ -682,30 +605,59 @@
 	margin: 0 20px;
 }

+#available-menu-items-search .clear-results {
+	position: absolute;
+	top: 20px;
+	left: 20px;
+	width: 20px;
+	height: 20px;
+	cursor: pointer;
+	color: #a00;
+	text-decoration: none;
+}
+
+#available-menu-items-search .clear-results,
+#available-menu-items-search.loading .clear-results.is-visible {
+	display: none;
+}
+
+#available-menu-items-search .clear-results.is-visible {
+	display: block;
+}
+
+#available-menu-items-search .clear-results:before {
+	content: "\f335";
+	font: normal 20px/1 dashicons;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+#available-menu-items-search .clear-results:hover,
+#available-menu-items-search .clear-results:focus {
+	color: #f00;
+}
+
 #available-menu-items-search .spinner {
 	position: absolute;
-	top: 20px; /* 13 container padding +1 input margin +6 ( ( 32 input height - 20 spinner height ) / 2 ) */
-	left: 21px;
+	top: 20px;
 	margin: 0 !important;
+	left: 20px;
 }

 /* search results list */
 #available-menu-items #available-menu-items-search .accordion-section-content {
 	position: absolute;
-	right: 0;
+	right: 1px;
 	top: 60px; /* below title div / search input */
 	bottom: 0px; /* 100% height that still triggers lazy load */
 	max-height: none;
 	width: 100%;
 	padding: 1px 15px 15px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

-#available-menu-items-search .nothing-found {
-	/* Compensate the 1px top padding of the container. */
-	margin-top: -1px;
-}
-
 #available-menu-items-search .accordion-section-title:after {
 	display: none;
 }
@@ -724,6 +676,7 @@
 }

 #customize-preview {
+	-webkit-transition: all 0.2s;
 	transition: all 0.2s;
 }

@@ -740,10 +693,6 @@ body.adding-menu-items #customize-preview {
 	opacity: 0.4;
 }

-body.adding-menu-items #customize-preview iframe {
-	pointer-events: none;
-}
-
 .menu-item-handle .spinner {
 	display: none;
 	float: right;
@@ -768,33 +717,39 @@ body.adding-menu-items #customize-preview iframe {
 }

 .added-menu-item .menu-item-handle {
+	-webkit-transition-property: opacity, background, color;
 	transition-property: opacity, background, color;
+	-webkit-transition-duration: 1.25s;
 	transition-duration: 1.25s;
+	-webkit-transition-timing-function: cubic-bezier( .25, -2.5, .75, 8 );
 	transition-timing-function: cubic-bezier( .25, -2.5, .75, 8 ); /* Replacement for .hide().fadeIn('slow') in JS to add emphasis when it's loaded. */
 }

 /* Add/delete Menus */

-#customize-theme-controls .control-panel-content .control-section-nav_menu:nth-last-child(2) .accordion-section-title {
-	border-bottom-color: #ddd;
-}
-
 /* @todo update selector */
 #accordion-section-add_menu {
 	margin: 15px 12px;
 }

-#accordion-section-add_menu h3 {
-	text-align: left;
+.new-menu-section-content {
+	display: none;
+	padding: 15px 0 0 0;
+	clear: both;
 }

-#accordion-section-add_menu h3,
-#accordion-section-add_menu .customize-add-menu-button {
-	margin: 0;
+/* @todo update selector */
+#accordion-section-add_menu .accordion-section-title {
+	padding-right: 45px;
 }

-#accordion-section-add_menu .customize-add-menu-button {
-	font-weight: 400;
+/* @todo update selector */
+#accordion-section-add_menu .accordion-section-title:before {
+	font: normal 20px/1 dashicons;
+	position: absolute;
+	top: 12px;
+	right: 14px;
+	content: "\f132";
 }

 #create-new-menu-submit {
@@ -808,10 +763,6 @@ body.adding-menu-items #customize-preview iframe {
 	width: 100%;
 }

-.assigned-menu-locations-title p {
-	margin: 0 0 8px 0;
-}
-
 li.assigned-to-menu-location .menu-delete-item {
 	display: none;
 }
@@ -820,6 +771,18 @@ li.assigned-to-menu-location .add-new-menu-item {
 	margin-bottom: 1em;
 }

+.menu-delete {
+	color: #a00;
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+.menu-delete:hover,
+.menu-delete:focus {
+	color: #f00;
+	text-decoration: none;
+}
+
 .menu-item-handle {
 	margin-top: -1px;
 }
@@ -848,12 +811,7 @@ li.assigned-to-menu-location .add-new-menu-item {
 	margin-bottom: 0;
 }

-.customize-control-nav_menu .new-menu-item-invitation {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-.customize-control-nav_menu .customize-control-nav_menu-buttons {
+.customize-control-nav_menu {
 	margin-top: 12px;
 }

@@ -864,24 +822,28 @@ li.assigned-to-menu-location .add-new-menu-item {
 .wp-customizer .menu-item .submitbox .submitdelete:focus,
 .customize-screen-options-toggle:focus:before,
 #customize-controls .customize-info .customize-help-toggle:focus:before,
-.wp-customizer button:focus .toggle-indicator:before,
+.wp-customizer button:focus .toggle-indicator:after,
+#available-menu-items-search .clear-results:focus,
 .menu-delete:focus,
 .menu-item-bar .item-delete:focus:before,
 #available-menu-items .item-add:focus:before {
+	-webkit-box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
+		0 0 2px 1px rgba(30, 140, 190, .8);
 }


-@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;
+		top: 133px;
 	}
 }
--- a/wp-admin/css/customize-nav-menus-rtl.min.css
+++ b/wp-admin/css/customize-nav-menus-rtl.min.css
--- a/wp-admin/css/customize-nav-menus.css
+++ b/wp-admin/css/customize-nav-menus.css
@@ -1,22 +1,6 @@
-#customize-theme-controls #accordion-section-menu_locations {
+#accordion-section-menu_locations {
 	position: relative;
-	margin-top: 30px;
-}
-
-#customize-theme-controls #accordion-section-menu_locations > .accordion-section-title {
-	border-bottom-color: #ddd;
-	margin-top: 15px;
-}
-
-#customize-theme-controls .customize-section-title-nav_menus-heading,
-#customize-theme-controls .customize-section-title-menu_locations-heading,
-#customize-theme-controls .customize-section-title-menu_locations-description {
-	padding: 0 12px 0 12px;
-}
-
-#customize-theme-controls .customize-control-description.customize-section-title-menu_locations-description {
-	/* Override the default italic style for control descriptions */
-	font-style: normal;
+	margin-bottom: 15px;
 }

 .menu-in-location,
@@ -32,30 +16,11 @@
 	color: #555;
 }

-/* The `edit-menu` and `create-menu` buttons also use the `button-link` class. */
-.customize-control-nav_menu_location .edit-menu,
-.customize-control-nav_menu_location .create-menu {
-	margin-left: 6px;
-	vertical-align: middle;
-	line-height: 2.2;
-}
-
-#customize-controls .customize-control-nav_menu_name {
-	margin-bottom: 12px;
-}
-
-.customize-control-nav_menu_name p:last-of-type {
-	margin-bottom: 0;
-}
-
-#customize-new-menu-submit {
-	float: right;
-	min-width: 85px;
-}
-
 .wp-customizer .menu-item-bar .menu-item-handle,
 .wp-customizer .menu-item-settings,
 .wp-customizer .menu-item-settings .description-thin {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

@@ -78,18 +43,9 @@
 	text-align: right;
 }

-.wp-customizer .menu-item-handle:hover {
-	z-index: 8;
-}
-
-.customize-control-nav_menu_item.has-notifications .menu-item-handle {
-	border-left: 4px solid #00a0d2;
-}
-
 .wp-customizer .menu-item-settings {
 	max-width: 100%;
 	overflow: hidden;
-	z-index: 8;
 	padding: 10px;
 	background: #eee;
 	border: 1px solid #999;
@@ -158,6 +114,7 @@

 .customize-control input.menu-name-field {
 	width: 100%; /* Override the 98% default for customizer inputs, to align with the size of menu items. */
+	margin: 12px 0;
 }

 .wp-customizer .menu-item .item-edit {
@@ -168,14 +125,14 @@
 	width: 30px;
 	height: 38px;
 	margin-right: 0 !important;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	overflow: hidden;
 	cursor: pointer;
-	text-align: center;
 }

-.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:before {
+.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after {
 	content: "\f142";
 }

@@ -201,31 +158,13 @@
 	border-top: none;
 }

-.wp-customizer .menu-location-settings {
-	margin-top: 12px;
-	border-top: none;
-}
-
-.wp-customizer .control-section-nav_menu .menu-location-settings {
-	margin-top: 24px;
-	border-top: 1px solid #ddd;
-}
-
-.wp-customizer .control-section-nav_menu .menu-location-settings,
-.customize-control-nav_menu_auto_add {
-	padding-top: 12px;
-}
-
-.menu-location-settings .customize-control-checkbox .theme-location-set {
+.menu-settings .customize-control-checkbox label {
 	line-height: 1;
 }

-.customize-control-nav_menu_auto_add label {
-	vertical-align: top;
-}
-
-.menu-location-settings .new-menu-locations-widget-note {
-	display: block;
+/* @todo update selector or potentially remove */
+.menu-settings .customize-control.customize-control-checkbox {
+	margin-bottom: 8px; /* Override collapsing at smaller viewports. */
 }

 .customize-control-menu {
@@ -289,6 +228,7 @@

 .customize-screen-options-toggle:focus:before,
 #customize-controls .customize-info .customize-help-toggle:focus:before {
+	-webkit-border-radius: 100%;
 	border-radius: 100%;
 }

@@ -310,18 +250,18 @@
 	display: inline-block;
 	font-size: 20px;
 	line-height: 1;
+	text-indent: -1px; /* account for the dashicon alignment */
 }

 .rtl .wp-customizer .toggle-indicator {
 	text-indent: 1px; /* account for the dashicon alignment */
 }

-.wp-customizer .menu-item .item-edit .toggle-indicator:before,
-#available-menu-items .accordion-section-title .toggle-indicator:before {
+.wp-customizer .toggle-indicator:after {
 	content: "\f140";
-	display: block;
-	padding: 1px 2px 1px 0px;
 	speak: none;
+	vertical-align: top;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	color: #72777c;
 	font: normal 20px/1 dashicons;
@@ -330,19 +270,19 @@
 	text-decoration: none !important;
 }

-.control-section-nav_menu .field-link-target,
-.control-section-nav_menu .field-title-attribute,
-.control-section-nav_menu .field-css-classes,
-.control-section-nav_menu .field-xfn,
-.control-section-nav_menu .field-description {
+#accordion-panel-nav_menus .field-link-target,
+#accordion-panel-nav_menus .field-title-attribute,
+#accordion-panel-nav_menus .field-css-classes,
+#accordion-panel-nav_menus .field-xfn,
+#accordion-panel-nav_menus .field-description {
 	display: none;
 }

-.control-section-nav_menu.field-link-target-active .field-link-target,
-.control-section-nav_menu.field-title-attribute-active .field-title-attribute,
-.control-section-nav_menu.field-css-classes-active .field-css-classes,
-.control-section-nav_menu.field-xfn-active .field-xfn,
-.control-section-nav_menu.field-description-active .field-description {
+#accordion-panel-nav_menus.field-link-target-active .field-link-target,
+#accordion-panel-nav_menus.field-title-attribute-active .field-title-attribute,
+#accordion-panel-nav_menus.field-css-classes-active .field-css-classes,
+#accordion-panel-nav_menus.field-xfn-active .field-xfn,
+#accordion-panel-nav_menus.field-description-active .field-description {
 	display: block;
 }

@@ -415,17 +355,18 @@
 .reordering .menu-item-depth-10 > .menu-item-bar { margin-right: 150px; }
 .reordering .menu-item-depth-11 > .menu-item-bar { margin-right: 165px; }

-.control-section-nav_menu.menu .menu-item-edit-active {
+.control-section-nav_menu .menu .menu-item-edit-active {
 	margin-left: 0;
 }

-.control-section-nav_menu.menu .menu-item-edit-active .menu-item-bar {
+.control-section-nav_menu .menu .menu-item-edit-active .menu-item-bar {
 	margin-right: 0;
 }

-.control-section-nav_menu.menu .sortable-placeholder {
+.control-section-nav_menu .menu .sortable-placeholder {
 	margin-top: 0;
 	margin-bottom: 1px;
+	max-width: -webkit-calc(100% - 2px);
 	max-width: calc(100% - 2px);
 	float: left;
 	display: list-item;
@@ -436,7 +377,7 @@
 	float: none;
 }

-.control-section-nav_menu.menu ul.menu-item-transport .menu-item-bar {
+.control-section-nav_menu .menu ul.menu-item-transport .menu-item-bar {
 	margin-top: 0;
 }

@@ -469,6 +410,7 @@
 	position: absolute;
 	top: 9px;
 	left: 5px;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	font: normal 20px/1 dashicons;
 	-webkit-font-smoothing: antialiased;
@@ -481,9 +423,10 @@

 .menu-item-bar .item-delete:hover,
 .menu-item-bar .item-delete:focus {
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
-	color: #dc3232;
+	color: #f00;
 }

 .adding-menu-items .menu-item-bar .item-edit {
@@ -511,12 +454,8 @@
 	border-left: none;
 	border-right: none;
 	background: #fff;
+	-webkit-transition: background-color 0.15s;
 	transition: background-color 0.15s;
-	/* Reset the value inherited from the base .accordion-section-title style. Ticket #37589. */
-	-webkit-user-select: auto;
-	-moz-user-select: auto;
-	-ms-user-select: auto;
-	user-select: auto;
 }

 #available-menu-items .open .accordion-section-title,
@@ -529,18 +468,18 @@
 	content: none !important;
 }

-#available-menu-items .accordion-section-title:hover .toggle-indicator:before,
-#available-menu-items .button-link:hover .toggle-indicator:before,
-#available-menu-items .button-link:focus .toggle-indicator:before {
+#available-menu-items .accordion-section-title:hover .toggle-indicator:after,
+#available-menu-items .button-link:hover .toggle-indicator:after,
+#available-menu-items .button-link:focus .toggle-indicator:after {
 	color: #23282d;
 }

-#available-menu-items .open .accordion-section-title .toggle-indicator:before {
+#available-menu-items .open .accordion-section-title .toggle-indicator:after {
 	content: "\f142";
 	color: #23282d;
 }

-#available-menu-items .available-menu-items-list {
+#available-menu-items .accordion-section-content {
 	overflow-y: auto;
 	max-height: 200px; /* This gets set in JS to fit the screen size, and based on # of sections. */
 	background: transparent;
@@ -553,10 +492,10 @@
 	position: absolute;
 	top: 5px;
 	right: 5px;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	cursor: pointer;
-	text-align: center;
 }

 #available-menu-items .accordion-section-title .no-items,
@@ -572,29 +511,14 @@
 #available-menu-items .cannot-expand .accordion-section-title .no-items {
 	float: right;
 	color: #555d66;
-	font-weight: 400;
+	font-weight: normal;
 	margin-left: 5px;
 }

 #available-menu-items .accordion-section-content {
-	max-height: 290px;
-	margin: 0;
-	padding: 0;
-	position: relative;
-	background: transparent;
-}
-
-#available-menu-items .accordion-section-content .available-menu-items-list {
-	margin: 0 0 45px 0;
 	padding: 1px 15px 15px 15px;
-}
-
-#available-menu-items .accordion-section-content .available-menu-items-list:only-child { /* Types that do not support new items for the current user */
-	margin-bottom: 0;
-}
-
-#new-custom-menu-item .accordion-section-content {
-	padding: 0 15px 15px 15px;
+	margin: 0;
+	max-height: 290px;
 }

 #available-menu-items .menu-item-tpl {
@@ -603,12 +527,9 @@

 #custom-menu-item-name.invalid,
 #custom-menu-item-url.invalid,
-.edit-menu-item-url.invalid,
 .menu-name-field.invalid,
-.menu-name-field.invalid:focus,
-#available-menu-items .new-content-item .create-item-input.invalid,
-#available-menu-items .new-content-item .create-item-input.invalid:focus {
-	border: 1px solid #dc3232;
+.menu-name-field.invalid:focus {
+	border: 1px solid #f00;
 }

 #available-menu-items .menu-item-handle .item-type {
@@ -624,6 +545,7 @@
 }

 #available-menu-items .menu-item-handle {
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	margin-top: -1px;
 }
@@ -644,10 +566,10 @@
 	color: #82878c;
 	width: 30px;
 	height: 38px;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	cursor: pointer;
-	text-align: center;
 }

 #available-menu-items .menu-item-handle .item-add:focus {
@@ -661,6 +583,7 @@
 	top: 3px;
 	display: inline-block;
 	height: 20px;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	font: normal 20px/1.05 dashicons; /* line height is to account for the dashicon's vertical alignment */
 }
@@ -682,30 +605,59 @@
 	margin: 0 20px;
 }

+#available-menu-items-search .clear-results {
+	position: absolute;
+	top: 20px;
+	right: 20px;
+	width: 20px;
+	height: 20px;
+	cursor: pointer;
+	color: #a00;
+	text-decoration: none;
+}
+
+#available-menu-items-search .clear-results,
+#available-menu-items-search.loading .clear-results.is-visible {
+	display: none;
+}
+
+#available-menu-items-search .clear-results.is-visible {
+	display: block;
+}
+
+#available-menu-items-search .clear-results:before {
+	content: "\f335";
+	font: normal 20px/1 dashicons;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+#available-menu-items-search .clear-results:hover,
+#available-menu-items-search .clear-results:focus {
+	color: #f00;
+}
+
 #available-menu-items-search .spinner {
 	position: absolute;
-	top: 20px; /* 13 container padding +1 input margin +6 ( ( 32 input height - 20 spinner height ) / 2 ) */
-	right: 21px;
+	top: 20px;
 	margin: 0 !important;
+	right: 20px;
 }

 /* search results list */
 #available-menu-items #available-menu-items-search .accordion-section-content {
 	position: absolute;
-	left: 0;
+	left: 1px;
 	top: 60px; /* below title div / search input */
 	bottom: 0px; /* 100% height that still triggers lazy load */
 	max-height: none;
 	width: 100%;
 	padding: 1px 15px 15px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

-#available-menu-items-search .nothing-found {
-	/* Compensate the 1px top padding of the container. */
-	margin-top: -1px;
-}
-
 #available-menu-items-search .accordion-section-title:after {
 	display: none;
 }
@@ -724,6 +676,7 @@
 }

 #customize-preview {
+	-webkit-transition: all 0.2s;
 	transition: all 0.2s;
 }

@@ -740,10 +693,6 @@ body.adding-menu-items #customize-preview {
 	opacity: 0.4;
 }

-body.adding-menu-items #customize-preview iframe {
-	pointer-events: none;
-}
-
 .menu-item-handle .spinner {
 	display: none;
 	float: left;
@@ -768,33 +717,39 @@ body.adding-menu-items #customize-preview iframe {
 }

 .added-menu-item .menu-item-handle {
+	-webkit-transition-property: opacity, background, color;
 	transition-property: opacity, background, color;
+	-webkit-transition-duration: 1.25s;
 	transition-duration: 1.25s;
+	-webkit-transition-timing-function: cubic-bezier( .25, -2.5, .75, 8 );
 	transition-timing-function: cubic-bezier( .25, -2.5, .75, 8 ); /* Replacement for .hide().fadeIn('slow') in JS to add emphasis when it's loaded. */
 }

 /* Add/delete Menus */

-#customize-theme-controls .control-panel-content .control-section-nav_menu:nth-last-child(2) .accordion-section-title {
-	border-bottom-color: #ddd;
-}
-
 /* @todo update selector */
 #accordion-section-add_menu {
 	margin: 15px 12px;
 }

-#accordion-section-add_menu h3 {
-	text-align: right;
+.new-menu-section-content {
+	display: none;
+	padding: 15px 0 0 0;
+	clear: both;
 }

-#accordion-section-add_menu h3,
-#accordion-section-add_menu .customize-add-menu-button {
-	margin: 0;
+/* @todo update selector */
+#accordion-section-add_menu .accordion-section-title {
+	padding-left: 45px;
 }

-#accordion-section-add_menu .customize-add-menu-button {
-	font-weight: 400;
+/* @todo update selector */
+#accordion-section-add_menu .accordion-section-title:before {
+	font: normal 20px/1 dashicons;
+	position: absolute;
+	top: 12px;
+	left: 14px;
+	content: "\f132";
 }

 #create-new-menu-submit {
@@ -808,10 +763,6 @@ body.adding-menu-items #customize-preview iframe {
 	width: 100%;
 }

-.assigned-menu-locations-title p {
-	margin: 0 0 8px 0;
-}
-
 li.assigned-to-menu-location .menu-delete-item {
 	display: none;
 }
@@ -820,6 +771,18 @@ li.assigned-to-menu-location .add-new-menu-item {
 	margin-bottom: 1em;
 }

+.menu-delete {
+	color: #a00;
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+.menu-delete:hover,
+.menu-delete:focus {
+	color: #f00;
+	text-decoration: none;
+}
+
 .menu-item-handle {
 	margin-top: -1px;
 }
@@ -848,12 +811,7 @@ li.assigned-to-menu-location .add-new-menu-item {
 	margin-bottom: 0;
 }

-.customize-control-nav_menu .new-menu-item-invitation {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-.customize-control-nav_menu .customize-control-nav_menu-buttons {
+.customize-control-nav_menu {
 	margin-top: 12px;
 }

@@ -864,24 +822,28 @@ li.assigned-to-menu-location .add-new-menu-item {
 .wp-customizer .menu-item .submitbox .submitdelete:focus,
 .customize-screen-options-toggle:focus:before,
 #customize-controls .customize-info .customize-help-toggle:focus:before,
-.wp-customizer button:focus .toggle-indicator:before,
+.wp-customizer button:focus .toggle-indicator:after,
+#available-menu-items-search .clear-results:focus,
 .menu-delete:focus,
 .menu-item-bar .item-delete:focus:before,
 #available-menu-items .item-add:focus:before {
+	-webkit-box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
+		0 0 2px 1px rgba(30, 140, 190, .8);
 }


-@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;
+		top: 133px;
 	}
 }
--- a/wp-admin/css/customize-nav-menus.min.css
+++ b/wp-admin/css/customize-nav-menus.min.css
--- a/wp-admin/css/customize-widgets-rtl.css
+++ b/wp-admin/css/customize-widgets-rtl.css
@@ -18,9 +18,9 @@
 	overflow: visible;
 }

-/* Note: widget-tops are more compact when (max-height: 700px) and (min-width: 981px). */
 .customize-control-widget_form .widget-top {
 	background: #fff;
+	-webkit-transition: opacity 0.5s;
 	transition: opacity 0.5s;
 }

@@ -75,6 +75,7 @@
 }

 .customize-control-widget_form.wide-widget-control .widget-top {
+	-webkit-transition: background-color 0.4s;
 	transition: background-color 0.4s;
 }
 .customize-control-widget_form.wide-widget-control.expanding .widget-top,
@@ -85,18 +86,18 @@
 .widget-inside {
 	padding: 1px 10px 10px 10px;
 	border-top: none;
-	line-height: 1.23076923;
+	line-height: 16px;
 }

-.customize-control-widget_form.expanded .widget-action .toggle-indicator:before {
+.customize-control-widget_form.expanded a.widget-action:after {
 	content: "\f142";
 }

-.customize-control-widget_form.wide-widget-control .widget-action .toggle-indicator:before {
+.customize-control-widget_form.wide-widget-control a.widget-action:after {
 	content: "\f141";
 }

-.customize-control-widget_form.wide-widget-control.expanded .widget-action .toggle-indicator:before {
+.customize-control-widget_form.wide-widget-control.expanded a.widget-action:after {
 	content: "\f139";
 }

@@ -112,7 +113,8 @@
 .control-section.accordion-section.highlighted > .accordion-section-title,
 .customize-control-widget_form.highlighted {
 	outline: none;
-	box-shadow: 0 0 2px rgba(30, 140, 190, 0.8);
+	-webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8);
+	box-shadow: 0 0 2px rgba(30,140,190,0.8);
 	position: relative;
 	z-index: 1;
 }
@@ -189,7 +191,7 @@

 #customize-theme-controls .widget-area-select .selected {
 	color: #fff;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.4);
+	text-shadow: 0 -1px 0 rgba(0,0,0,.4);
 	background: #00a0d2;
 }

@@ -210,21 +212,6 @@
 	display: block;
 }

-/* Text Widget */
-.wp-customizer div.mce-inline-toolbar-grp,
-.wp-customizer div.mce-tooltip {
-	z-index: 500100 !important;
-}
-.wp-customizer .ui-autocomplete.wplink-autocomplete {
-	z-index: 500110; /* originally 100110, but z-index of .wp-full-overlay is 500000 */
-}
-.wp-customizer #wp-link-backdrop {
-	z-index: 500100; /* originally 100100, but z-index of .wp-full-overlay is 500000 */
-}
-.wp-customizer #wp-link-wrap {
-	z-index: 500105; /* originally 100105, but z-index of .wp-full-overlay is 500000 */
-}
-
 /**
 * Styles for new widget addition panel
 */
@@ -235,21 +222,15 @@
 	width: auto !important;
 }

-/* Keep rule that is no longer necessary on widgets.php. */
-#available-widgets .widget-action {
-	display: none;
-}
-
 .ios #available-widgets {
+	-webkit-transition: right 0s;
 	transition: right 0s;
 }

 #available-widgets .widget-tpl:hover,
 #available-widgets .widget-tpl.selected {
-	background: #f3f3f5;
+	background: #eee;
 	border-bottom-color: #ccc;
-	color: #0073aa;
-	border-right: 4px solid #0073aa;
 }

 #customize-controls .widget-title h3 {
@@ -267,6 +248,7 @@
 }

 #customize-preview {
+	-webkit-transition: all 0.2s;
 	transition: all 0.2s;
 }

@@ -305,6 +287,8 @@ body.adding-widget #customize-preview {
 	color: #32373c;
 	font: normal 20px/1 dashicons;
 	text-align: center;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
@@ -437,46 +421,33 @@ body.adding-widget #customize-preview {
 #available-widgets [class*="twitter"] .widget-title:before { content: "\f301"; }

@media screen and (max-height: 700px) and (min-width: 981px) {
-	/* Compact widget-tops on smaller laptops, but not tablets. See ticket #27112#comment:4 */
-	.customize-control-widget_form {
+	.customize-control-widget {
 		margin-bottom: 0;
 	}
-
 	.widget-top {
+		-webkit-box-shadow: none;
 		box-shadow: none;
 		margin-top: -1px;
 	}
-
 	.widget-top:hover {
 		position: relative;
 		z-index: 1;
 	}
-
 	.last-widget {
 		margin-bottom: 15px;
 	}
-
 	.widget-title h3 {
 		padding: 13px 15px;
 	}
-
-	.widget-top .widget-action {
-		padding: 8px 10px;
-	}
-
 	.widget-reorder-nav span {
 		height: 39px;
 	}
-
 	.widget-reorder-nav span:before {
 		line-height: 39px;
 	}
-
-	/* Compact the move widget areas. */
 	#customize-theme-controls .widget-area-select li {
 		padding: 9px 42px 11px 15px;
 	}
-
 	#customize-theme-controls .widget-area-select li:before {
 		top: 8px;
 	}
--- 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
@@ -18,9 +18,9 @@
 	overflow: visible;
 }

-/* Note: widget-tops are more compact when (max-height: 700px) and (min-width: 981px). */
 .customize-control-widget_form .widget-top {
 	background: #fff;
+	-webkit-transition: opacity 0.5s;
 	transition: opacity 0.5s;
 }

@@ -75,6 +75,7 @@
 }

 .customize-control-widget_form.wide-widget-control .widget-top {
+	-webkit-transition: background-color 0.4s;
 	transition: background-color 0.4s;
 }
 .customize-control-widget_form.wide-widget-control.expanding .widget-top,
@@ -85,18 +86,18 @@
 .widget-inside {
 	padding: 1px 10px 10px 10px;
 	border-top: none;
-	line-height: 1.23076923;
+	line-height: 16px;
 }

-.customize-control-widget_form.expanded .widget-action .toggle-indicator:before {
+.customize-control-widget_form.expanded a.widget-action:after {
 	content: "\f142";
 }

-.customize-control-widget_form.wide-widget-control .widget-action .toggle-indicator:before {
+.customize-control-widget_form.wide-widget-control a.widget-action:after {
 	content: "\f139";
 }

-.customize-control-widget_form.wide-widget-control.expanded .widget-action .toggle-indicator:before {
+.customize-control-widget_form.wide-widget-control.expanded a.widget-action:after {
 	content: "\f141";
 }

@@ -112,7 +113,8 @@
 .control-section.accordion-section.highlighted > .accordion-section-title,
 .customize-control-widget_form.highlighted {
 	outline: none;
-	box-shadow: 0 0 2px rgba(30, 140, 190, 0.8);
+	-webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8);
+	box-shadow: 0 0 2px rgba(30,140,190,0.8);
 	position: relative;
 	z-index: 1;
 }
@@ -189,7 +191,7 @@

 #customize-theme-controls .widget-area-select .selected {
 	color: #fff;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.4);
+	text-shadow: 0 -1px 0 rgba(0,0,0,.4);
 	background: #00a0d2;
 }

@@ -210,21 +212,6 @@
 	display: block;
 }

-/* Text Widget */
-.wp-customizer div.mce-inline-toolbar-grp,
-.wp-customizer div.mce-tooltip {
-	z-index: 500100 !important;
-}
-.wp-customizer .ui-autocomplete.wplink-autocomplete {
-	z-index: 500110; /* originally 100110, but z-index of .wp-full-overlay is 500000 */
-}
-.wp-customizer #wp-link-backdrop {
-	z-index: 500100; /* originally 100100, but z-index of .wp-full-overlay is 500000 */
-}
-.wp-customizer #wp-link-wrap {
-	z-index: 500105; /* originally 100105, but z-index of .wp-full-overlay is 500000 */
-}
-
 /**
 * Styles for new widget addition panel
 */
@@ -235,21 +222,15 @@
 	width: auto !important;
 }

-/* Keep rule that is no longer necessary on widgets.php. */
-#available-widgets .widget-action {
-	display: none;
-}
-
 .ios #available-widgets {
+	-webkit-transition: left 0s;
 	transition: left 0s;
 }

 #available-widgets .widget-tpl:hover,
 #available-widgets .widget-tpl.selected {
-	background: #f3f3f5;
+	background: #eee;
 	border-bottom-color: #ccc;
-	color: #0073aa;
-	border-left: 4px solid #0073aa;
 }

 #customize-controls .widget-title h3 {
@@ -267,6 +248,7 @@
 }

 #customize-preview {
+	-webkit-transition: all 0.2s;
 	transition: all 0.2s;
 }

@@ -305,6 +287,8 @@ body.adding-widget #customize-preview {
 	color: #32373c;
 	font: normal 20px/1 dashicons;
 	text-align: center;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
@@ -437,46 +421,33 @@ body.adding-widget #customize-preview {
 #available-widgets [class*="twitter"] .widget-title:before { content: "\f301"; }

@media screen and (max-height: 700px) and (min-width: 981px) {
-	/* Compact widget-tops on smaller laptops, but not tablets. See ticket #27112#comment:4 */
-	.customize-control-widget_form {
+	.customize-control-widget {
 		margin-bottom: 0;
 	}
-
 	.widget-top {
+		-webkit-box-shadow: none;
 		box-shadow: none;
 		margin-top: -1px;
 	}
-
 	.widget-top:hover {
 		position: relative;
 		z-index: 1;
 	}
-
 	.last-widget {
 		margin-bottom: 15px;
 	}
-
 	.widget-title h3 {
 		padding: 13px 15px;
 	}
-
-	.widget-top .widget-action {
-		padding: 8px 10px;
-	}
-
 	.widget-reorder-nav span {
 		height: 39px;
 	}
-
 	.widget-reorder-nav span:before {
 		line-height: 39px;
 	}
-
-	/* Compact the move widget areas. */
 	#customize-theme-controls .widget-area-select li {
 		padding: 9px 15px 11px 42px;
 	}
-
 	#customize-theme-controls .widget-area-select li:before {
 		top: 8px;
 	}
--- 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
@@ -103,17 +103,18 @@
 	overflow: auto;
 	margin: 16px 0;
 	padding: 23px 10px 0;
-	border: 1px solid #ccd0d4;
-	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
 	background: #fff;
 	font-size: 13px;
-	line-height: 1.7;
+	line-height: 2.1em;
 }

 .welcome-panel h2 {
 	margin: 0;
 	font-size: 21px;
-	font-weight: 400;
+	font-weight: normal;
 	line-height: 1.2;
 }

@@ -130,7 +131,7 @@
 	color: #72777c;
 }

-.welcome-panel li a {
+.welcome-panel a {
 	text-decoration: none;
 }

@@ -153,6 +154,7 @@
 	position: absolute;
 	top: 8px;
 	right: 0;
+	-webkit-transition: all .1s ease-in-out;
 	transition: all .1s ease-in-out;
 }

@@ -198,7 +200,7 @@
 }

 .welcome-panel .welcome-widgets-menus {
-	line-height: 1.14285714;
+	line-height: 16px;
 }

 .welcome-panel .welcome-panel-column ul {
@@ -206,7 +208,7 @@
 }

 .welcome-panel .welcome-panel-column li {
-	line-height: 1.14285714;
+	line-height: 16px;
 	list-style-type: none;
 	padding: 0 0 8px;
 }
@@ -220,7 +222,7 @@
 .welcome-panel .welcome-icon:before,
 #dashboard_right_now li a:before,
 #dashboard_right_now li span:before {
-	color: #606a73;
+	color: #82878c;
 	font: normal 20px/1 dashicons;
 	speak: none;
 	display: inline-block;
@@ -245,11 +247,6 @@
 	top: -1px;
 }

-.welcome-panel .welcome-setup-home:before {
-	content: "\f102";
-	top: -1px;
-}
-
 .welcome-panel .welcome-view-site:before {
 	content: "\f115";
 	top: -2px;
@@ -260,16 +257,6 @@
 	top: -2px;
 }

-.welcome-panel .welcome-widgets:before {
-	content: "\f538";
-	top: -2px;
-}
-
-.welcome-panel .welcome-menus:before {
-	content: "\f163";
-	top: -2px;
-}
-
 .welcome-panel .welcome-comments:before {
 	content: "\f117";
 	top: -1px;
@@ -314,158 +301,6 @@
 	content: "\f153";
 }

-/* Dashboard WordPress events */
-
-.community-events-errors {
-	margin: 0;
-}
-
-.community-events-loading {
-	padding: 10px 12px 8px;
-}
-
-.community-events {
-	margin-bottom: 6px;
-	padding: 0 12px;
-}
-
-.community-events .spinner {
-	float: none;
-	margin: 5px 2px 0;
-	vertical-align: top;
-}
-
-.community-events-errors[aria-hidden="true"],
-.community-events-errors [aria-hidden="true"],
-.community-events-loading[aria-hidden="true"],
-.community-events[aria-hidden="true"],
-.community-events [aria-hidden="true"] {
-	display: none;
-}
-
-.community-events .activity-block:first-child,
-.community-events h2 {
-	padding-top: 12px;
-	padding-bottom: 10px;
-}
-
-.community-events-form {
-	margin: 15px 0 5px;
-}
-
-.community-events-form .regular-text {
-	width: 40%;
-	height: 29px;
-	margin: 0;
-	vertical-align: top;
-}
-
-.community-events li.event-none {
-	border-right: 4px solid #00a0d2;
-}
-
-.community-events-form label {
-	display: inline-block;
-	vertical-align: top;
-	line-height: 2.15384615;
-	height: 28px;
-}
-
-.community-events .activity-block > p {
-	margin-bottom: 0;
-	display: inline;
-}
-
-.community-events-toggle-location {
-	vertical-align: middle;
-}
-
-#community-events-submit {
-	margin-right: 3px;
-	margin-left: 3px;
-}
-
-/* Needs higher specificity than #dashboard-widgets .button-link */
-#dashboard-widgets .community-events-cancel.button-link {
-	vertical-align: top;
-	/* Same properties as the submit button for cross-browsers alignment. */
-	line-height: 2;
-	height: 28px;
-	text-decoration: underline;
-}
-
-.community-events ul {
-	background-color: #fafafa;
-	padding-right: 0;
-	padding-left: 0;
-	padding-bottom: 0;
-}
-
-.community-events li {
-	margin: 0;
-	padding: 8px 12px;
-	color: #32373c;
-}
-.community-events li:first-child {
-	border-top: 1px solid #eee;
-}
-
-.community-events li ~ li {
-	border-top: 1px solid #eee;
-}
-
-.community-events .activity-block.last {
-	border-bottom: 1px solid #eee;
-	padding-top: 0;
-	margin-top: -1px;
-}
-
-.community-events .event-info {
-	display: block;
-}
-
-.event-icon {
-	height: 18px;
-	padding-left: 10px;
-	width: 18px;
-	display: none; /* Hide on smaller screens */
-}
-
-.event-icon:before {
-	color: #606a73;
-	font-size: 18px;
-}
-.event-meetup .event-icon:before {
-	content: "\f484";
-}
-.event-wordcamp .event-icon:before {
-	content: "\f486";
-}
-
-.community-events .event-title {
-	font-weight: 600;
-	display: block;
-}
-
-.community-events .event-date,
-.community-events .event-time {
-	display: block;
-}
-
-.community-events-footer {
-	margin-top: 0;
-	margin-bottom: 0;
-	padding: 12px;
-	border-top: 1px solid #eee;
-	color: #ddd;
-}
-
-/* Safari 10 + VoiceOver specific: without this, the hidden text gets read out before the link. */
-.community-events-footer .screen-reader-text {
-	height: inherit;
-	white-space: nowrap;
-}
-
 /* Dashboard WordPress news */

 #dashboard_primary .inside {
@@ -473,21 +308,19 @@
 	padding: 0;
 }

-#dashboard_primary .widget-loading {
+#dashboard_primary .widget-loading,
+#dashboard_primary .dashboard-widget-control-form {
 	padding: 12px 12px 0;
-	margin-bottom: 1em !important; /* Needs to override `.postbox .inside > p:last-child` in common.css */
-}
-
-/* Notice when JS is off. */
-#dashboard_primary .inside .notice {
-	margin: 0;
 }

 body #dashboard-widgets .postbox form .submit {
 	margin: 0;
 }

-/* Used only for configurable widgets. */
+.dashboard-widget-control-form {
+	overflow: hidden;
+}
+
 .dashboard-widget-control-form p {
 	margin-top: 0;
 }
@@ -498,8 +331,9 @@ body #dashboard-widgets .postbox form .submit {
 }

 #dashboard_primary .rss-widget {
+	border-bottom: 1px solid #eee;
 	font-size: 13px;
-	padding: 0 12px 0;
+	padding: 8px 12px 10px;
 }

 #dashboard_primary .rss-widget:last-child {
@@ -508,7 +342,7 @@ body #dashboard-widgets .postbox form .submit {
 }

 #dashboard_primary .rss-widget a {
-	font-weight: 400;
+	font-weight: normal;
 }

 #dashboard_primary .rss-widget span,
@@ -521,8 +355,7 @@ body #dashboard-widgets .postbox form .submit {
 }

 #dashboard_primary .rss-widget ul li {
-	padding: 4px 0;
-	margin: 0;
+	margin-bottom: 8px;
 }

 /* Dashboard right now */
@@ -567,7 +400,7 @@ body #dashboard-widgets .postbox form .submit {
 	margin: 0 0 10px;
 	padding: 0;
 	font-size: 14px;
-	font-weight: 400;
+	font-weight: normal;
 }

 /* Dashboard right now - Colors */
@@ -609,23 +442,37 @@ body #dashboard-widgets .postbox form .submit {
 	margin: 12px;
 }

-#dashboard_quick_press .drafts {
+#dashboard_quick_press .drafts,
+#dashboard_quick_press .easy-blogging {
 	padding: 10px 0 0;
 }

 /* Dashboard Quick Draft - Form styling */

-#dashboard_quick_press label {
-	display: inline-block;
-	margin-bottom: 4px;
+input#save-post {
+	float: right;
+}
+
+form.initial-form.quickpress-open label.prompt {
+	font-style: normal;
+}
+
+form.initial-form.quickpress-open input#title {
+	height: auto;
 }

 #dashboard_quick_press input,
 #dashboard_quick_press textarea {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	margin: 0;
 }

+#dashboard_quick_press textarea {
+	resize: vertical;
+}
+
 #dashboard-widgets .postbox form .submit {
 	margin: -39px 0;
 	float: left;
@@ -635,11 +482,39 @@ body #dashboard-widgets .postbox form .submit {
 	margin-top: 12px;
 }

+#title-wrap #title-prompt-text,
+.textarea-wrap #content-prompt-text {
+	color: #72777c;
+}
+
+#title-wrap #title-prompt-text {
+	font-size: 1.1em;
+	padding: 7px 8px;
+}
+
+.input-text-wrap,
+.textarea-wrap {
+	position: relative;
+}
+
+.input-text-wrap .prompt,
+.textarea-wrap .prompt {
+	position: absolute;
+}
+
+.textarea-wrap #content-prompt-text {
+	font-size: 1.1em;
+	padding: 7px 8px;
+}
+
+.textarea-wrap textarea#content {
+	margin: 0 0 8px;
+	padding: 6px 7px;
+}
+
 #quick-press textarea#content {
 	min-height: 90px;
 	max-height: 1300px;
-	margin: 0 0 8px;
-	padding: 6px 7px;
 	resize: none;
 }

@@ -659,7 +534,7 @@ body #dashboard-widgets .postbox form .submit {
 }

 #dashboard_primary a.rsswidget {
-	font-weight: 400;
+	font-weight: normal;
 }

 #dashboard_quick_press .drafts ul {
@@ -695,7 +570,7 @@ body #dashboard-widgets .postbox form .submit {
 	margin: 0 12px 8px;
 	padding: 0;
 	font-size: 14px;
-	font-weight: 400;
+	font-weight: normal;
 	color: #23282d;
 }

@@ -896,9 +771,7 @@ body #dashboard-widgets .postbox form .submit {
 	min-width: 0;
 }

-#dashboard-widgets li a,
-#dashboard-widgets .button-link,
-.community-events-footer a {
+#dashboard-widgets a {
 	text-decoration: none;
 }

@@ -924,6 +797,7 @@ body #dashboard-widgets .postbox form .submit {

 #activity-widget #the-comment-list .comment,
 #activity-widget #the-comment-list .pingback {
+	-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 }

@@ -948,14 +822,14 @@ body #dashboard-widgets .postbox form .submit {
 }

 #latest-comments #the-comment-list .comment-meta {
-	line-height: 1.5;
+	line-height: 1.5em;
 	margin: 0;
 	color: #666;
 }

 #latest-comments #the-comment-list .comment-meta cite {
 	font-style: normal;
-	font-weight: 400;
+	font-weight: normal;
 }

 #latest-comments #the-comment-list .comment-item blockquote,
@@ -971,6 +845,24 @@ body #dashboard-widgets .postbox form .submit {
 	font-size: 13px;
 }

+/* QuickDraft */
+
+#title-wrap label,
+#description-wrap label {
+	cursor: text;
+}
+
+#title-wrap #title {
+	padding: 2px 6px;
+	font-size: 1.3em;
+	outline: none;
+}
+
+#title-wrap #title-prompt-text {
+	font-size: 1.1em;
+	padding: 5px 8px;
+}
+
 /* Feeds */
 .rss-widget ul {
 	margin: 0;
@@ -979,13 +871,13 @@ body #dashboard-widgets .postbox form .submit {
 }

 a.rsswidget {
-	font-size: 13px;
+	font-size: 14px;
 	font-weight: 600;
-	line-height: 1.4;
+	line-height: 1.7em;
 }

 .rss-widget ul li {
-	line-height: 1.5;
+	line-height: 1.5em;
 	margin-bottom: 12px;
 }

@@ -1038,6 +930,7 @@ a.rsswidget {
 	background-image: none;
 	border-color: #edc048;
 	color: #fff;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 }

@@ -1050,6 +943,7 @@ a.rsswidget {
 	border-bottom-color: #f6e2ac;
 	background: transparent none;
 	color: #fff;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 }

@@ -1057,6 +951,8 @@ a.rsswidget {
 	color: #fff;
 }

+/* Make the browser nags easier to read with Open Sans */
+
 #dashboard_browser_nag h2.hndle {
 	border: none;
 	font-weight: 600;
@@ -1074,28 +970,6 @@ 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
 -------------------------------------------------------------- */

@@ -1206,41 +1080,12 @@ a.rsswidget {

 }

-@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;
 		margin: 4px 0 5px 10px;
 	}
-
-	.community-events-toggle-location {
-		height: 38px;
-		vertical-align: baseline;
-	}
-
-	.community-events-form .regular-text {
-		height: 32px;
-	}
-
-	#community-events-submit {
-		margin-bottom: 0;
-		/* Override .wp-core-ui .button */
-		vertical-align: top;
-	}
-
-	.community-events-form label,
-	#dashboard-widgets .community-events-cancel.button-link {
-		/* Same properties as the submit button for cross-browsers alignment. */
-		font-size: 14px;
-		line-height: normal;
-		height: auto;
-		padding: 6px 0;
-		border: 1px solid transparent;
-	}
-
-	.community-events .spinner {
-		margin-top: 7px;
-	}
 }

 /* Smartphone */
@@ -1264,30 +1109,3 @@ a.rsswidget {
 		right: -35px;
 	}
 }
-
-@media screen and (min-width: 355px) {
-	.community-events .event-info {
-		display: table-row;
-		float: right;
-		max-width: 59%;
-	}
-
-	.event-icon,
-	.event-icon[aria-hidden="true"] {
-		display: table-cell;
-	}
-
-	.event-info-inner {
-		display: table-cell;
-	}
-
-	.community-events .event-date-time {
-		float: left;
-		max-width: 39%;
-	}
-
-	.community-events .event-date,
-	.community-events .event-time {
-		text-align: left;
-	}
-}
--- 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
@@ -103,17 +103,18 @@
 	overflow: auto;
 	margin: 16px 0;
 	padding: 23px 10px 0;
-	border: 1px solid #ccd0d4;
-	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
 	background: #fff;
 	font-size: 13px;
-	line-height: 1.7;
+	line-height: 2.1em;
 }

 .welcome-panel h2 {
 	margin: 0;
 	font-size: 21px;
-	font-weight: 400;
+	font-weight: normal;
 	line-height: 1.2;
 }

@@ -130,7 +131,7 @@
 	color: #72777c;
 }

-.welcome-panel li a {
+.welcome-panel a {
 	text-decoration: none;
 }

@@ -153,6 +154,7 @@
 	position: absolute;
 	top: 8px;
 	left: 0;
+	-webkit-transition: all .1s ease-in-out;
 	transition: all .1s ease-in-out;
 }

@@ -198,7 +200,7 @@
 }

 .welcome-panel .welcome-widgets-menus {
-	line-height: 1.14285714;
+	line-height: 16px;
 }

 .welcome-panel .welcome-panel-column ul {
@@ -206,7 +208,7 @@
 }

 .welcome-panel .welcome-panel-column li {
-	line-height: 1.14285714;
+	line-height: 16px;
 	list-style-type: none;
 	padding: 0 0 8px;
 }
@@ -220,7 +222,7 @@
 .welcome-panel .welcome-icon:before,
 #dashboard_right_now li a:before,
 #dashboard_right_now li span:before {
-	color: #606a73;
+	color: #82878c;
 	font: normal 20px/1 dashicons;
 	speak: none;
 	display: inline-block;
@@ -245,11 +247,6 @@
 	top: -1px;
 }

-.welcome-panel .welcome-setup-home:before {
-	content: "\f102";
-	top: -1px;
-}
-
 .welcome-panel .welcome-view-site:before {
 	content: "\f115";
 	top: -2px;
@@ -260,16 +257,6 @@
 	top: -2px;
 }

-.welcome-panel .welcome-widgets:before {
-	content: "\f538";
-	top: -2px;
-}
-
-.welcome-panel .welcome-menus:before {
-	content: "\f163";
-	top: -2px;
-}
-
 .welcome-panel .welcome-comments:before {
 	content: "\f117";
 	top: -1px;
@@ -314,158 +301,6 @@
 	content: "\f153";
 }

-/* Dashboard WordPress events */
-
-.community-events-errors {
-	margin: 0;
-}
-
-.community-events-loading {
-	padding: 10px 12px 8px;
-}
-
-.community-events {
-	margin-bottom: 6px;
-	padding: 0 12px;
-}
-
-.community-events .spinner {
-	float: none;
-	margin: 5px 2px 0;
-	vertical-align: top;
-}
-
-.community-events-errors[aria-hidden="true"],
-.community-events-errors [aria-hidden="true"],
-.community-events-loading[aria-hidden="true"],
-.community-events[aria-hidden="true"],
-.community-events [aria-hidden="true"] {
-	display: none;
-}
-
-.community-events .activity-block:first-child,
-.community-events h2 {
-	padding-top: 12px;
-	padding-bottom: 10px;
-}
-
-.community-events-form {
-	margin: 15px 0 5px;
-}
-
-.community-events-form .regular-text {
-	width: 40%;
-	height: 29px;
-	margin: 0;
-	vertical-align: top;
-}
-
-.community-events li.event-none {
-	border-left: 4px solid #00a0d2;
-}
-
-.community-events-form label {
-	display: inline-block;
-	vertical-align: top;
-	line-height: 2.15384615;
-	height: 28px;
-}
-
-.community-events .activity-block > p {
-	margin-bottom: 0;
-	display: inline;
-}
-
-.community-events-toggle-location {
-	vertical-align: middle;
-}
-
-#community-events-submit {
-	margin-left: 3px;
-	margin-right: 3px;
-}
-
-/* Needs higher specificity than #dashboard-widgets .button-link */
-#dashboard-widgets .community-events-cancel.button-link {
-	vertical-align: top;
-	/* Same properties as the submit button for cross-browsers alignment. */
-	line-height: 2;
-	height: 28px;
-	text-decoration: underline;
-}
-
-.community-events ul {
-	background-color: #fafafa;
-	padding-left: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-.community-events li {
-	margin: 0;
-	padding: 8px 12px;
-	color: #32373c;
-}
-.community-events li:first-child {
-	border-top: 1px solid #eee;
-}
-
-.community-events li ~ li {
-	border-top: 1px solid #eee;
-}
-
-.community-events .activity-block.last {
-	border-bottom: 1px solid #eee;
-	padding-top: 0;
-	margin-top: -1px;
-}
-
-.community-events .event-info {
-	display: block;
-}
-
-.event-icon {
-	height: 18px;
-	padding-right: 10px;
-	width: 18px;
-	display: none; /* Hide on smaller screens */
-}
-
-.event-icon:before {
-	color: #606a73;
-	font-size: 18px;
-}
-.event-meetup .event-icon:before {
-	content: "\f484";
-}
-.event-wordcamp .event-icon:before {
-	content: "\f486";
-}
-
-.community-events .event-title {
-	font-weight: 600;
-	display: block;
-}
-
-.community-events .event-date,
-.community-events .event-time {
-	display: block;
-}
-
-.community-events-footer {
-	margin-top: 0;
-	margin-bottom: 0;
-	padding: 12px;
-	border-top: 1px solid #eee;
-	color: #ddd;
-}
-
-/* Safari 10 + VoiceOver specific: without this, the hidden text gets read out before the link. */
-.community-events-footer .screen-reader-text {
-	height: inherit;
-	white-space: nowrap;
-}
-
 /* Dashboard WordPress news */

 #dashboard_primary .inside {
@@ -473,21 +308,19 @@
 	padding: 0;
 }

-#dashboard_primary .widget-loading {
+#dashboard_primary .widget-loading,
+#dashboard_primary .dashboard-widget-control-form {
 	padding: 12px 12px 0;
-	margin-bottom: 1em !important; /* Needs to override `.postbox .inside > p:last-child` in common.css */
-}
-
-/* Notice when JS is off. */
-#dashboard_primary .inside .notice {
-	margin: 0;
 }

 body #dashboard-widgets .postbox form .submit {
 	margin: 0;
 }

-/* Used only for configurable widgets. */
+.dashboard-widget-control-form {
+	overflow: hidden;
+}
+
 .dashboard-widget-control-form p {
 	margin-top: 0;
 }
@@ -498,8 +331,9 @@ body #dashboard-widgets .postbox form .submit {
 }

 #dashboard_primary .rss-widget {
+	border-bottom: 1px solid #eee;
 	font-size: 13px;
-	padding: 0 12px 0;
+	padding: 8px 12px 10px;
 }

 #dashboard_primary .rss-widget:last-child {
@@ -508,7 +342,7 @@ body #dashboard-widgets .postbox form .submit {
 }

 #dashboard_primary .rss-widget a {
-	font-weight: 400;
+	font-weight: normal;
 }

 #dashboard_primary .rss-widget span,
@@ -521,8 +355,7 @@ body #dashboard-widgets .postbox form .submit {
 }

 #dashboard_primary .rss-widget ul li {
-	padding: 4px 0;
-	margin: 0;
+	margin-bottom: 8px;
 }

 /* Dashboard right now */
@@ -567,7 +400,7 @@ body #dashboard-widgets .postbox form .submit {
 	margin: 0 0 10px;
 	padding: 0;
 	font-size: 14px;
-	font-weight: 400;
+	font-weight: normal;
 }

 /* Dashboard right now - Colors */
@@ -609,23 +442,37 @@ body #dashboard-widgets .postbox form .submit {
 	margin: 12px;
 }

-#dashboard_quick_press .drafts {
+#dashboard_quick_press .drafts,
+#dashboard_quick_press .easy-blogging {
 	padding: 10px 0 0;
 }

 /* Dashboard Quick Draft - Form styling */

-#dashboard_quick_press label {
-	display: inline-block;
-	margin-bottom: 4px;
+input#save-post {
+	float: left;
+}
+
+form.initial-form.quickpress-open label.prompt {
+	font-style: normal;
+}
+
+form.initial-form.quickpress-open input#title {
+	height: auto;
 }

 #dashboard_quick_press input,
 #dashboard_quick_press textarea {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	margin: 0;
 }

+#dashboard_quick_press textarea {
+	resize: vertical;
+}
+
 #dashboard-widgets .postbox form .submit {
 	margin: -39px 0;
 	float: right;
@@ -635,11 +482,39 @@ body #dashboard-widgets .postbox form .submit {
 	margin-top: 12px;
 }

+#title-wrap #title-prompt-text,
+.textarea-wrap #content-prompt-text {
+	color: #72777c;
+}
+
+#title-wrap #title-prompt-text {
+	font-size: 1.1em;
+	padding: 7px 8px;
+}
+
+.input-text-wrap,
+.textarea-wrap {
+	position: relative;
+}
+
+.input-text-wrap .prompt,
+.textarea-wrap .prompt {
+	position: absolute;
+}
+
+.textarea-wrap #content-prompt-text {
+	font-size: 1.1em;
+	padding: 7px 8px;
+}
+
+.textarea-wrap textarea#content {
+	margin: 0 0 8px;
+	padding: 6px 7px;
+}
+
 #quick-press textarea#content {
 	min-height: 90px;
 	max-height: 1300px;
-	margin: 0 0 8px;
-	padding: 6px 7px;
 	resize: none;
 }

@@ -659,7 +534,7 @@ body #dashboard-widgets .postbox form .submit {
 }

 #dashboard_primary a.rsswidget {
-	font-weight: 400;
+	font-weight: normal;
 }

 #dashboard_quick_press .drafts ul {
@@ -695,7 +570,7 @@ body #dashboard-widgets .postbox form .submit {
 	margin: 0 12px 8px;
 	padding: 0;
 	font-size: 14px;
-	font-weight: 400;
+	font-weight: normal;
 	color: #23282d;
 }

@@ -896,9 +771,7 @@ body #dashboard-widgets .postbox form .submit {
 	min-width: 0;
 }

-#dashboard-widgets li a,
-#dashboard-widgets .button-link,
-.community-events-footer a {
+#dashboard-widgets a {
 	text-decoration: none;
 }

@@ -924,6 +797,7 @@ body #dashboard-widgets .postbox form .submit {

 #activity-widget #the-comment-list .comment,
 #activity-widget #the-comment-list .pingback {
+	-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 }

@@ -948,14 +822,14 @@ body #dashboard-widgets .postbox form .submit {
 }

 #latest-comments #the-comment-list .comment-meta {
-	line-height: 1.5;
+	line-height: 1.5em;
 	margin: 0;
 	color: #666;
 }

 #latest-comments #the-comment-list .comment-meta cite {
 	font-style: normal;
-	font-weight: 400;
+	font-weight: normal;
 }

 #latest-comments #the-comment-list .comment-item blockquote,
@@ -971,6 +845,24 @@ body #dashboard-widgets .postbox form .submit {
 	font-size: 13px;
 }

+/* QuickDraft */
+
+#title-wrap label,
+#description-wrap label {
+	cursor: text;
+}
+
+#title-wrap #title {
+	padding: 2px 6px;
+	font-size: 1.3em;
+	outline: none;
+}
+
+#title-wrap #title-prompt-text {
+	font-size: 1.1em;
+	padding: 5px 8px;
+}
+
 /* Feeds */
 .rss-widget ul {
 	margin: 0;
@@ -979,13 +871,13 @@ body #dashboard-widgets .postbox form .submit {
 }

 a.rsswidget {
-	font-size: 13px;
+	font-size: 14px;
 	font-weight: 600;
-	line-height: 1.4;
+	line-height: 1.7em;
 }

 .rss-widget ul li {
-	line-height: 1.5;
+	line-height: 1.5em;
 	margin-bottom: 12px;
 }

@@ -1038,6 +930,7 @@ a.rsswidget {
 	background-image: none;
 	border-color: #edc048;
 	color: #fff;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 }

@@ -1050,6 +943,7 @@ a.rsswidget {
 	border-bottom-color: #f6e2ac;
 	background: transparent none;
 	color: #fff;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 }

@@ -1057,6 +951,8 @@ a.rsswidget {
 	color: #fff;
 }

+/* Make the browser nags easier to read with Open Sans */
+
 #dashboard_browser_nag h2.hndle {
 	border: none;
 	font-weight: 600;
@@ -1074,28 +970,6 @@ 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
 -------------------------------------------------------------- */

@@ -1206,41 +1080,12 @@ a.rsswidget {

 }

-@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;
 		margin: 4px 10px 5px 0;
 	}
-
-	.community-events-toggle-location {
-		height: 38px;
-		vertical-align: baseline;
-	}
-
-	.community-events-form .regular-text {
-		height: 32px;
-	}
-
-	#community-events-submit {
-		margin-bottom: 0;
-		/* Override .wp-core-ui .button */
-		vertical-align: top;
-	}
-
-	.community-events-form label,
-	#dashboard-widgets .community-events-cancel.button-link {
-		/* Same properties as the submit button for cross-browsers alignment. */
-		font-size: 14px;
-		line-height: normal;
-		height: auto;
-		padding: 6px 0;
-		border: 1px solid transparent;
-	}
-
-	.community-events .spinner {
-		margin-top: 7px;
-	}
 }

 /* Smartphone */
@@ -1264,30 +1109,3 @@ a.rsswidget {
 		left: -35px;
 	}
 }
-
-@media screen and (min-width: 355px) {
-	.community-events .event-info {
-		display: table-row;
-		float: left;
-		max-width: 59%;
-	}
-
-	.event-icon,
-	.event-icon[aria-hidden="true"] {
-		display: table-cell;
-	}
-
-	.event-info-inner {
-		display: table-cell;
-	}
-
-	.community-events .event-date-time {
-		float: right;
-		max-width: 39%;
-	}
-
-	.community-events .event-date,
-	.community-events .event-time {
-		text-align: right;
-	}
-}
--- 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
@@ -3,7 +3,7 @@
 div#media-upload-header {
 	margin: 0;
 	padding: 5px 5px 0;
-	font-weight: 600;
+	font-weight: bold;
 	position: relative;
 	border-bottom: 1px solid #ddd;
 	background: #f9f9f9;
@@ -19,7 +19,7 @@ div#media-upload-header {
 	padding-right: 10px;
 	list-style: none;
 	font-size: 12px;
-	font-weight: 400;
+	font-weight: normal;
 }

 #sidemenu a {
@@ -31,6 +31,7 @@ div#media-upload-header {
 	border-bottom: 1px solid #ddd;
 	background-color: #f9f9f9;
 	text-decoration: none;
+	-webkit-transition: none;
 	transition: none;
 }

@@ -45,7 +46,7 @@ div#media-upload-header {
 }

 #sidemenu a.current {
-	font-weight: 400;
+	font-weight: normal;
 	padding-right: 6px;
 	padding-left: 6px;
 	border: 1px solid #ddd;
@@ -88,7 +89,7 @@ th {
 .media-upload-form label.form-help, td.help {
 	font-family: sans-serif;
 	font-style: italic;
-	font-weight: 400;
+	font-weight: normal;
 }

 .media-upload-form p.help {
@@ -107,19 +108,19 @@ th {
 /* specific to the image upload form */

 .image-align-none-label {
-	background: url(../images/align-none.png) no-repeat center right;
+	background: url(../images/align-none.png) no-repeat center left;
 }

 .image-align-left-label {
-	background: url(../images/align-left.png) no-repeat center right;
+	background: url(../images/align-left.png) no-repeat center left;
 }

 .image-align-center-label {
-	background: url(../images/align-center.png) no-repeat center right;
+	background: url(../images/align-center.png) no-repeat center left;
 }

 .image-align-right-label {
-	background: url(../images/align-right.png) no-repeat center right;
+	background: url(../images/align-right.png) no-repeat center left;
 }

 tr.image-size td {
@@ -186,7 +187,7 @@ span.required {
 #media-upload label.help {
 	font-family: sans-serif;
 	font-style: italic;
-	font-weight: 400;
+	font-weight: normal;
 }

 #media-upload .ui-sortable .media-item {
@@ -206,22 +207,6 @@ 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;
@@ -294,11 +279,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;
@@ -309,7 +294,7 @@ h4.media-sub-title {
 h3.media-title,
 h4.media-sub-title {
 	font-family: Georgia,"Times New Roman",Times,serif;
-	font-weight: 400;
+	font-weight: normal;
 	color: #5A5A5A;
 }

@@ -409,21 +394,25 @@ table.not-image tr.image-only {

 	.image-align-none-label {
 		background-image: url(../images/align-none-2x.png?ver=20120916);
+		-webkit-background-size: 21px 15px;
 		background-size: 21px 15px;
 	}

 	.image-align-left-label {
 		background-image: url(../images/align-left-2x.png?ver=20120916);
+		-webkit-background-size: 22px 15px;
 		background-size: 22px 15px;
 	}

 	.image-align-center-label {
 		background-image: url(../images/align-center-2x.png?ver=20120916);
+		-webkit-background-size: 21px 15px;
 		background-size: 21px 15px;
 	}

 	.image-align-right-label {
 		background-image: url(../images/align-right-2x.png?ver=20120916);
+		-webkit-background-size: 22px 15px;
 		background-size: 22px 15px;
 	}
 }
--- 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
@@ -3,7 +3,7 @@
 div#media-upload-header {
 	margin: 0;
 	padding: 5px 5px 0;
-	font-weight: 600;
+	font-weight: bold;
 	position: relative;
 	border-bottom: 1px solid #ddd;
 	background: #f9f9f9;
@@ -19,7 +19,7 @@ div#media-upload-header {
 	padding-left: 10px;
 	list-style: none;
 	font-size: 12px;
-	font-weight: 400;
+	font-weight: normal;
 }

 #sidemenu a {
@@ -31,6 +31,7 @@ div#media-upload-header {
 	border-bottom: 1px solid #ddd;
 	background-color: #f9f9f9;
 	text-decoration: none;
+	-webkit-transition: none;
 	transition: none;
 }

@@ -45,7 +46,7 @@ div#media-upload-header {
 }

 #sidemenu a.current {
-	font-weight: 400;
+	font-weight: normal;
 	padding-left: 6px;
 	padding-right: 6px;
 	border: 1px solid #ddd;
@@ -88,7 +89,7 @@ th {
 .media-upload-form label.form-help, td.help {
 	font-family: sans-serif;
 	font-style: italic;
-	font-weight: 400;
+	font-weight: normal;
 }

 .media-upload-form p.help {
@@ -186,7 +187,7 @@ span.required {
 #media-upload label.help {
 	font-family: sans-serif;
 	font-style: italic;
-	font-weight: 400;
+	font-weight: normal;
 }

 #media-upload .ui-sortable .media-item {
@@ -206,22 +207,6 @@ 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;
@@ -294,11 +279,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;
@@ -309,7 +294,7 @@ h4.media-sub-title {
 h3.media-title,
 h4.media-sub-title {
 	font-family: Georgia,"Times New Roman",Times,serif;
-	font-weight: 400;
+	font-weight: normal;
 	color: #5A5A5A;
 }

@@ -409,21 +394,25 @@ table.not-image tr.image-only {

 	.image-align-none-label {
 		background-image: url(../images/align-none-2x.png?ver=20120916);
+		-webkit-background-size: 21px 15px;
 		background-size: 21px 15px;
 	}

 	.image-align-left-label {
 		background-image: url(../images/align-left-2x.png?ver=20120916);
+		-webkit-background-size: 22px 15px;
 		background-size: 22px 15px;
 	}

 	.image-align-center-label {
 		background-image: url(../images/align-center-2x.png?ver=20120916);
+		-webkit-background-size: 21px 15px;
 		background-size: 21px 15px;
 	}

 	.image-align-right-label {
 		background-image: url(../images/align-right-2x.png?ver=20120916);
+		-webkit-background-size: 22px 15px;
 		background-size: 22px 15px;
 	}
 }
--- 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
--- 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
--- a/wp-admin/css/edit.min.css
+++ b/wp-admin/css/edit.min.css
--- a/wp-admin/css/farbtastic-rtl.min.css
+++ b/wp-admin/css/farbtastic-rtl.min.css
@@ -1,2 +1 @@
-/*! This file is auto-generated */
 .farbtastic{position:relative}.farbtastic *{position:absolute;cursor:crosshair}.farbtastic,.farbtastic .wheel{width:195px;height:195px}.farbtastic .color,.farbtastic .overlay{top:47px;right:47px;width:101px;height:101px}.farbtastic .wheel{background:url(../images/wheel.png) no-repeat;width:195px;height:195px}.farbtastic .overlay{background:url(../images/mask.png) no-repeat}.farbtastic .marker{width:17px;height:17px;margin:-8px -8px 0 0;overflow:hidden;background:url(../images/marker.png) no-repeat}
--- a/wp-admin/css/farbtastic.min.css
+++ b/wp-admin/css/farbtastic.min.css
@@ -1,2 +1 @@
-/*! This file is auto-generated */
 .farbtastic{position:relative}.farbtastic *{position:absolute;cursor:crosshair}.farbtastic,.farbtastic .wheel{width:195px;height:195px}.farbtastic .color,.farbtastic .overlay{top:47px;left:47px;width:101px;height:101px}.farbtastic .wheel{background:url(../images/wheel.png) no-repeat;width:195px;height:195px}.farbtastic .overlay{background:url(../images/mask.png) no-repeat}.farbtastic .marker{width:17px;height:17px;margin:-8px 0 0 -8px;overflow:hidden;background:url(../images/marker.png) no-repeat}
--- a/wp-admin/css/forms-rtl.css
+++ b/wp-admin/css/forms-rtl.css
--- 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
--- 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
@@ -221,7 +221,8 @@ table.fixed td {
 }

 #wpbody-content input.button,
-#wpbody-content input.button-primary {
+#wpbody-content input.button-primary,
+#wpbody-content input.button-secondary {
 	overflow: visible;
 }

@@ -285,7 +286,7 @@ table.fixed td {
 	width: 29%;
 }

-.inline-edit-row .submit {
+.inline-edit-row p.submit {
 	zoom: 100%;
 }

@@ -441,17 +442,13 @@ div#dashboard-widgets {
 	padding-left: 1px;
 }

-.tagchecklist > li, .tagchecklist .ntdelbutton {
+.tagchecklist span, .tagchecklist span a {
 	display: inline-block;
 	display: block;
 }

-.tagchecklist .ntdelbutton:focus .remove-tag-icon:before {
-	outline: 1px solid #5b9dd9;
-}
-
-.tablenav .button,
-.nav .button {
+.tablenav .button-secondary,
+.nav .button-secondary {
 	padding-top: 2px;
 	padding-bottom: 2px;
 }
@@ -471,6 +468,12 @@ div#dashboard-widgets {
 	display: inline;
 }

+a.post-state-format {
+	text-indent: 0;
+	line-height: 0;
+	font-size: 0;
+}
+
 table.ie-fixed {
 	table-layout: fixed;
 }
@@ -504,7 +507,7 @@ table.ie-fixed {
 	border-collapse: collapse;
 }

-.tablenav a.button {
+.tablenav a.button-secondary {
 	display: inline-block;
 	padding: 2px 5px;
 }
@@ -552,7 +555,7 @@ table.ie-fixed {
 }

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

 .menu li {
@@ -633,9 +636,9 @@ 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-weight: normal;
 	font-variant: normal;
 	font-size: 16px;
 	margin-right: 0;
@@ -644,12 +647,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 {
@@ -658,7 +661,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
@@ -221,7 +221,8 @@ table.fixed td {
 }

 #wpbody-content input.button,
-#wpbody-content input.button-primary {
+#wpbody-content input.button-primary,
+#wpbody-content input.button-secondary {
 	overflow: visible;
 }

@@ -285,7 +286,7 @@ table.fixed td {
 	width: 29%;
 }

-.inline-edit-row .submit {
+.inline-edit-row p.submit {
 	zoom: 100%;
 }

@@ -441,17 +442,13 @@ div#dashboard-widgets {
 	padding-right: 1px;
 }

-.tagchecklist > li, .tagchecklist .ntdelbutton {
+.tagchecklist span, .tagchecklist span a {
 	display: inline-block;
 	display: block;
 }

-.tagchecklist .ntdelbutton:focus .remove-tag-icon:before {
-	outline: 1px solid #5b9dd9;
-}
-
-.tablenav .button,
-.nav .button {
+.tablenav .button-secondary,
+.nav .button-secondary {
 	padding-top: 2px;
 	padding-bottom: 2px;
 }
@@ -471,6 +468,12 @@ div#dashboard-widgets {
 	display: inline;
 }

+a.post-state-format {
+	text-indent: 0;
+	line-height: 0;
+	font-size: 0;
+}
+
 table.ie-fixed {
 	table-layout: fixed;
 }
@@ -504,7 +507,7 @@ table.ie-fixed {
 	border-collapse: collapse;
 }

-.tablenav a.button {
+.tablenav a.button-secondary {
 	display: inline-block;
 	padding: 2px 5px;
 }
@@ -552,7 +555,7 @@ table.ie-fixed {
 }

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

 .menu li {
@@ -633,9 +636,9 @@ 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-weight: normal;
 	font-variant: normal;
 	font-size: 16px;
 	margin-left: 0;
@@ -644,12 +647,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 {
@@ -658,7 +661,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
@@ -6,12 +6,13 @@ html {
 body {
 	background: #fff;
 	color: #444;
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+	font-family: "Open Sans", sans-serif;
 	margin: 140px auto 25px;
 	padding: 20px 20px 10px 20px;
 	max-width: 700px;
 	-webkit-font-smoothing: subpixel-antialiased;
-	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13);
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
 }

 a {
@@ -25,9 +26,12 @@ a:active {

 a:focus {
 	color: #124964;
+	-webkit-box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
 	box-shadow:
 		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
+		0 0 2px 1px rgba(30, 140, 190, .8);
 }

 .ie8 a:focus {
@@ -41,7 +45,7 @@ h1, h2 {
 	font-size: 24px;
 	padding: 0;
 	padding-bottom: 7px;
-	font-weight: 400;
+	font-weight: normal;
 }

 h3 {
@@ -63,7 +67,7 @@ ul, ol, dl {
 }

 a img {
-	border: 0
+	border:0
 }
 abbr {
 	border: 0;
@@ -84,19 +88,20 @@ 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);
 	background-image: none, url(../images/wordpress-logo.svg?ver=20131107);
+	-webkit-background-size: 84px;
 	background-size: 84px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #444; /* same as login.css */
 	height: 84px;
 	font-size: 20px;
-	font-weight: 400;
-	line-height: 1.3;
+	font-weight: normal;
+	line-height: 1.3em;
 	margin: -130px auto 25px;
 	padding: 0;
 	text-decoration: none;
@@ -107,6 +112,11 @@ label {
 	display: block;
 }

+#logo a:focus {
+	-webkit-box-shadow: none;
+	box-shadow: none;
+}
+
 .step {
 	margin: 20px 0 15px;
 }
@@ -115,12 +125,17 @@ label {
 	padding: 0;
 }
 .language-chooser.wp-core-ui .step .button.button-large {
+	height: 36px;
 	font-size: 14px;
+	line-height: 33px;
+	vertical-align: middle;
 }
 textarea {
 	border: 1px solid #ddd;
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+	font-family: "Open Sans", sans-serif;
 	width: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

@@ -146,7 +161,7 @@ textarea {
 }

 .form-table code {
-	line-height: 1.28571428;
+	line-height: 18px;
 	font-size: 14px;
 }

@@ -156,28 +171,28 @@ textarea {
 }

 .form-table input {
-	line-height: 1.33333333;
+	line-height: 20px;
 	font-size: 15px;
 	padding: 3px 5px;
 	border: 1px solid #ddd;
-	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.07);
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
 }

 input,
 submit {
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+	font-family: "Open Sans", sans-serif;
 }

 .form-table input[type=text],
 .form-table input[type=email],
 .form-table input[type=url],
-.form-table input[type=password],
-#pass-strength-result {
-	width: 218px;
+.form-table input[type=password] {
+	width: 206px;
 }

 .form-table th p {
-	font-weight: 400;
+	font-weight: normal;
 }

 .form-table.install-success th,
@@ -202,7 +217,7 @@ submit {

 #error-page p {
 	font-size: 14px;
-	line-height: 1.28571428;
+	line-height: 18px;
 	margin: 25px 0 20px;
 }

@@ -210,6 +225,68 @@ submit {
 	font-family: Consolas, Monaco, monospace;
 }

+.wp-hide-pw > .dashicons {
+	line-height: inherit;
+}
+
+#pass-strength-result {
+	background-color: #eee;
+	border: 1px solid #ddd;
+	color: #23282d;
+	margin: -2px 0px 5px 5px;
+	padding: 3px 5px;
+	text-align: center;
+	width: 218px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	opacity: 0;
+}
+
+#pass-strength-result.short {
+	background-color: #f1adad;
+	border-color: #e35b5b;
+	opacity: 1;
+}
+
+#pass-strength-result.bad {
+	background-color: #fbc5a9;
+	border-color: #f78b53;
+	opacity: 1;
+}
+
+#pass-strength-result.good {
+	background-color: #ffe399;
+	border-color: #ffc733;
+	opacity: 1;
+}
+
+#pass-strength-result.strong {
+	background-color: #c1e1b9;
+	border-color: #83c373;
+	opacity: 1;
+}
+
+#pass1.short, #pass1-text.short {
+	border-color: #e35b5b;
+}
+
+#pass1.bad, #pass1-text.bad {
+	border-color: #f78b53;
+}
+
+#pass1.good, #pass1-text.good {
+	border-color: #ffc733;
+}
+
+#pass1.strong, #pass1-text.strong {
+	border-color: #83c373;
+}
+
+.pw-weak {
+	display: none;
+}
+
 .message {
 	border-right: 4px solid #dc3232;
 	padding: .7em .6em;
@@ -229,6 +306,20 @@ submit {
 	direction: ltr;
 }

+#pass1-text,
+.show-password #pass1 {
+	display: none;
+}
+
+.show-password #pass1-text
+{
+	display: inline-block;
+}
+
+.form-table span.description.important {
+	font-size: 12px;
+}
+

 /* localization */
 body.rtl,
@@ -254,7 +345,7 @@ body.rtl,
 	}
 }

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

 	.form-table {
 		margin-top: 0;
@@ -295,20 +386,11 @@ body.rtl,
 		padding: 7px 10px;
 		display: block;
 		max-width: none;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
 		box-sizing: border-box;
 	}

-	.wp-pwd #pass1 {
-		padding-left: 50px;
-	}
-
-	.wp-pwd .button.wp-hide-pw {
-		left: 0;
-	}
-
-	#pass-strength-result {
-		width: 100%;
-	}
 }

 body.language-chooser {
@@ -320,20 +402,11 @@ body.language-chooser {
 	width: 100%;
 	display: block;
 	border: 1px solid #ddd;
-	background: #fff;
+	background-color: #fff;
 	color: #32373c;
 	font-size: 16px;
 	font-family: Arial, sans-serif;
-	font-weight: 400;
-}
-
-.language-chooser select:focus {
-	color: #32373c;
-}
-
-.language-chooser select option:hover,
-.language-chooser select option:focus {
-	color: #016087;
+	font-weight: normal;
 }

 .language-chooser p {
@@ -342,21 +415,19 @@ body.language-chooser {

 .screen-reader-input,
 .screen-reader-text {
-	border: 0;
-	clip: rect(1px, 1px, 1px, 1px);
-	-webkit-clip-path: inset(50%);
-	clip-path: inset(50%);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
 	position: absolute;
+	margin: -1px;
+	padding: 0;
+	height: 1px;
 	width: 1px;
-	word-wrap: normal !important;
+	overflow: hidden;
+	clip: rect(0 0 0 0);
+	border: 0;
 }

 .spinner {
 	background: url(../images/spinner.gif) no-repeat;
+	-webkit-background-size: 20px 20px;
 	background-size: 20px 20px;
 	visibility: hidden;
 	opacity: 0.7;
@@ -372,7 +443,7 @@ body.language-chooser {
 	margin-left: 15px;
 }

-.button.hide-if-no-js,
+.button-secondary.hide-if-no-js,
 .hide-if-no-js {
 	display: none;
 }
--- a/Show More
+++ b/Show More