Tag 4.3.6

Built from https://develop.svn.wordpress.org/tags/4.3.6@38563 git-svn-id: http://core.svn.wordpress.org/tags/4.3.6@38506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Bump 4.3 branch to 4.3.6.
2016-09-07 17:03:10 +00:00 · 2016-09-07 14:59:23 +00:00 · 2016-09-07 13:58:51 +00:00 · 2016-09-06 17:51:24 +00:00 · 2016-07-01 11:42:24 +00:00 · 2016-06-21 16:33:25 +00:00
1802 changed files with 130848 additions and 659448 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 2015 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" />
@@ -9,14 +9,15 @@
 <body>
 <h1 id="logo">
 	<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
+	<br /> Version 4.3.6
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>

-<h2>First Things First</h2>
+<h1>First Things First</h1>
 <p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I&#8217;m proud to be a part of. Thousands of hours have gone into WordPress, and we&#8217;re dedicated to making it better every day. Thank you for making it part of your world.</p>
 <p style="text-align: right">&#8212; Matt Mullenweg</p>

-<h2>Installation: Famous 5-minute install</h2>
+<h1>Installation: Famous 5-minute install</h1>
 <ol>
 	<li>Unzip the package in an empty directory and upload everything.</li>
 	<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser. It will take you through the process to set up a <code>wp-config.php</code> file with your database connection details.
@@ -26,20 +27,20 @@
 			<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/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
+	<li>Once the configuration file is set up, the installer will set up the tables needed for your 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>

-<h2>Updating</h2>
-<h3>Using the Automatic Updater</h3>
+<h1>Updating</h1>
+<h2>Using the Automatic Updater</h2>
 <p>If you are updating from version 2.7 or higher, you can use the automatic updater:</p>
 <ol>
 	<li>Open <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your browser and follow the instructions.</li>
 	<li>You wanted more, perhaps? That&#8217;s it!</li>
 </ol>

-<h3>Updating Manually</h3>
+<h2>Updating Manually</h2>
 <ol>
 	<li>Before you update anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</li>
 	<li>Delete your old WordPress files, saving ones you&#8217;ve modified.</li>
@@ -47,25 +48,24 @@
 	<li>Point your browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a>.</span></li>
 </ol>

-<h2>Migrating from other systems</h2>
+<h1>Migrating from other systems</h1>
 <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>
+<h1>System Requirements</h1>
 <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>
+<h2>Recommendations</h2>
 <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.4</strong> or higher.</li>
+	<li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.5</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>

-<h2>Online Resources</h2>
+<h1>Online Resources</h1>
 <p>If you have any questions that aren&#8217;t addressed in this document, please take advantage of WordPress&#8217; numerous online resources:</p>
 <dl>
 	<dt><a href="https://codex.wordpress.org/">The WordPress Codex</a></dt>
@@ -74,24 +74,24 @@
 		<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 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>
+<h1>Final Notes</h1>
 <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 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://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>
+<h1>Share the Love</h1>
 <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/" title="Donate to WordPress">donating</a>.</p>

-<h2>License</h2>
+<h1>License</h1>
 <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>
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -1,7 +1,7 @@
 <?php
 /**
 * Confirms that the activation key that is sent in an email after a user signs
- * up for a new site matches the key for that user and then displays confirmation.
+ * up for a new blog matches the key for that user and then displays confirmation.
 *
 * @package WordPress
 */
@@ -9,64 +9,17 @@
 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() ) {
-	wp_redirect( wp_registration_url() );
+if ( !is_multisite() ) {
+	wp_redirect( site_url( '/wp-login.php?action=register' ) );
 	die();
 }

-$valid_error_codes = array( 'already_active', 'blog_taken' );
-
-list( $activate_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
-$activate_cookie       = 'wp-activate-' . COOKIEHASH;
-
-$key    = '';
-$result = null;
-
-if ( isset( $_GET['key'] ) && isset( $_POST['key'] ) && $_GET['key'] !== $_POST['key'] ) {
-	wp_die( __( 'A key value mismatch has been detected. Please follow the link provided in your activation email.' ), __( 'An error occurred during the activation' ), 400 );
-} elseif ( ! empty( $_GET['key'] ) ) {
-	$key = $_GET['key'];
-} elseif ( ! empty( $_POST['key'] ) ) {
-	$key = $_POST['key'];
-}
-
-if ( $key ) {
-	$redirect_url = remove_query_arg( 'key' );
-
-	if ( $redirect_url !== remove_query_arg( false ) ) {
-		setcookie( $activate_cookie, $key, 0, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
-		wp_safe_redirect( $redirect_url );
-		exit;
-	} else {
-		$result = wpmu_activate_signup( $key );
-	}
-}
-
-if ( $result === null && isset( $_COOKIE[ $activate_cookie ] ) ) {
-	$key    = $_COOKIE[ $activate_cookie ];
-	$result = wpmu_activate_signup( $key );
-	setcookie( $activate_cookie, ' ', time() - YEAR_IN_SECONDS, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
-}
-
-if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
-	status_header( 404 );
-} elseif ( is_wp_error( $result ) ) {
-	$error_code = $result->get_error_code();
-
-	if ( ! in_array( $error_code, $valid_error_codes ) ) {
-		status_header( 400 );
-	}
-}
-
-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 +32,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,106 +58,74 @@ 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-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; font-weight: bold; color: #333; }
 	</style>
 	<?php
 }
 add_action( 'wp_head', 'wpmu_activate_stylesheet' );
-add_action( 'wp_head', 'wp_sensitive_page_meta' );

-get_header( 'wp-activate' );
+get_header();
 ?>

-<div id="signup-content" class="widecolumn">
-	<div class="wp-activate-container">
-	<?php if ( ! $key ) { ?>
+<div id="content" class="widecolumn">
+	<?php if ( empty($_GET['key']) && empty($_POST['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 {
-		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>
-			<?php
-			echo '<p class="lead-in">';
-			if ( $signup->domain . $signup->path == '' ) {
-				printf(
-					/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
-					__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-					network_site_url( 'wp-login.php', 'login' ),
-					$signup->user_login,
-					$signup->user_email,
-					wp_lostpassword_url()
-				);
+	<?php } else {
+
+		$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
+		$result = wpmu_activate_signup( $key );
+		if ( is_wp_error($result) ) {
+			if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+			    $signup = $result->get_error_data();
+				?>
+				<h2><?php _e('Your account is now active!'); ?></h2>
+				<?php
+				echo '<p class="lead-in">';
+				if ( $signup->domain . $signup->path == '' ) {
+					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( __('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>';
 			} else {
-				printf(
-					/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
-					__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-					sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
-					$signup->user_login,
-					$signup->user_email,
-					wp_lostpassword_url()
-				);
+				?>
+				<h2><?php _e('An error occurred during the activation'); ?></h2>
+				<?php
+			    echo '<p>'.$result->get_error_message().'</p>';
 			}
-			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; ?>
-			<?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' ) ) :
-				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;
+			<?php if ( $url && $url != network_home_url( '', 'http' ) ) : ?>
+				<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, $url . 'wp-login.php' ); ?></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;
 		}
 	}
 	?>
-	</div>
 </div>
 <script type="text/javascript">
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php
-get_footer( 'wp-activate' );
+<?php get_footer();
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -9,295 +9,200 @@
 /** 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' );
+wp_enqueue_style( 'wp-mediaelement' );
+wp_enqueue_script( 'wp-mediaelement' );
+wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
+	'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+	'pauseOtherPlayers' => ''
+) );

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

 include( ABSPATH . 'wp-admin/admin-header.php' );
+
+$video_url = 'https://videopress.com/embed/T54Iy7Tw';
+$locale    = str_replace( '_', '-', get_locale() );
+if ( 'en-AU' !== $locale ) {
+	list( $locale ) = explode( '-', $locale );
+}
+if ( 'en' !== $locale ) {
+	$video_url = add_query_arg( 'defaultLangCode', $locale, $video_url );
+}
+
+$major_features = array(
+	array(
+		'src'         => array(
+			'mp4'  => '//s.w.org/images/core/4.3/formatting.mp4',
+			'ogv'  => '//s.w.org/images/core/4.3/formatting.ogv',
+			'webm' => '//s.w.org/images/core/4.3/formatting.webm',
+		),
+		'heading'     => __( 'Formatting Shortcuts' ),
+		/* Translators: 1: asterisks; 2: number sign; */
+		'description' => sprintf( __( 'Your writing flow just got faster with new formatting shortcuts in WordPress 4.3. Use asterisks to create lists and number signs to make a heading. No more breaking your flow; your text looks great with a %1$s and a %2$s.' ), '<code>*</code>', '<code>#</code>' ),
+	),
+	array(
+		'src'         => '//s.w.org/images/core/4.3/menu-customizer.png',
+		'heading'     => __( 'Menus in the Customizer' ),
+		'description' => __( 'Create your menu, update it, and assign it, all while live-previewing in the customizer. The streamlined customizer design provides a mobile-friendly and accessible interface. With every release, it becomes easier and faster to make your site just the way you want it.' ),
+	),
+	array(
+		'src'         => '//s.w.org/images/core/4.3/better-passwords.png',
+		'heading'     => __( 'Better Passwords' ),
+		'description' => __( 'Keep your site more secure with WordPress&#8217; improved approach to passwords. Instead of receiving passwords via email, you&#8217;ll get a password reset link. When you add new users to your site or edit a user profile, WordPress will automatically generate a secure password.' ),
+	),
+	array(
+		'src'         => '//s.w.org/images/core/4.3/site-icon-customizer.png',
+		'heading'     => __( 'Site Icons' ),
+		'description' => __( 'Site icons represent your site in browser tabs, bookmark menus, and on the home screen of mobile devices. Add your unique site icon in the customizer; it will even stay in place when you switch themes. Make your whole site reflect your brand.' ),
+	),
+);
+shuffle( $major_features );
+
+$minor_features = array(
+	array(
+		'src'         => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MDAgNDAwIj48cGF0aCBmaWxsPSIjMDBhMGQyIiBkPSJNNTAgMjE1aDI0MHYzMEg1MHpNNTAgMjc1aDI0MHYzMEg1MHpNNTAgMTU1aDI0MHYzMEg1MHpNNTAgOTVoMjQwdjMwSDUwek0zMTAuMSA5NWwxOS45IDMwIDIwLjEtMzAiLz48L3N2Zz4=',
+		'heading'     => __( 'A smoother admin experience' ),
+		'description' => __( 'Refinements to the list view across the admin make your WordPress more accessible and easier to work with on any device.' ),
+	),
+	array(
+		'src'         => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCI+PHBhdGggZmlsbD0iIzAwYTBkMiIgZD0iTTUgMmgxMHEuODIgMCAxLjQxLjU5VDE3IDR2OHEwIC44Mi0uNTkgMS40MVQxNSAxNGgtMmwtNSA1di01SDVxLS44MiAwLTEuNDEtLjU5VDMgMTJWNHEwLS44Mi41OS0xLjQxVDUgMnptOC41IDguNUwxMSA4bDIuNS0yLjUtMS0xTDEwIDcgNy41IDQuNWwtMSAxTDkgOGwtMi41IDIuNSAxIDFMMTAgOWwyLjUgMi41eiIvPjwvc3ZnPg==',
+		'heading'     => __( 'Comments turned off on pages' ),
+		'description' => __( 'All new pages that you create will have comments turned off. Keep discussions to your blog, right where they&#8217;re supposed to happen.' ),
+	),
+	array(
+		'src'         => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PHBhdGggZmlsbD0iIzAwYTBkMiIgZD0iTTI5LjMyOCA1LjcxMnEuMDQ4LS4xNDQuMDk2LS4zODR0LS4wNjQtLjgxNi0uNTI4LS45NzZxLS4zODQtLjM2OC0uODcyLS40NjR0LS43OTIgMGwtLjI4OC4wOHEtMS40NTYuNzItNS44OCAzLjczNnQtNi4zOTIgNS4xNzZxLS43MzYuODMyLTEuNDA4IDIuMzJ0LS44OCAzIC41NDQgMi4zOTJxLjgzMi43MzYgMi4zNDQuNTc2dDMuMDcyLS44MjQgMi4yNDgtMS4zNTJxMi4xNDQtMi4xNDQgNS4xNjgtNi42NTZ0My42MzItNS44MDh6TTIuMjQgMjguMjRxMS4wNTYtLjY4OCAxLjcxMi0xLjUyOHQuOTUyLTEuNjE2LjU0NC0xLjUyLjcyLTEuNDggMS4yNC0xLjI4cTEuMDg4LS44IDIuNTA0LS43MDR0Mi40MjQgMS4xNjhxLjgxNi44OC44MjQgMi42NHQtMS4wOCAyLjg5NnEtMS4yMTYgMS4xMi0yLjkwNCAxLjYyNHQtMy40MjQuNDI0LTMuNTEyLS42MjR6Ii8+PC9zdmc+',
+		'heading'     => __( 'Customize your site quickly' ),
+		'description' => __( 'Wherever you are on the front-end, you can click the customize link in the toolbar to swiftly make changes to your site.' ),
+	),
+);
+
+$tech_features = array(
+	array(
+		'heading'     => __( 'Taxonomy Roadmap' ),
+		'description' => __( 'Terms shared across multiple taxonomies are now split into separate terms.' ),
+	),
+	array(
+		'heading'     => __( 'Template Hierarchy' ),
+		/* Translators: 1: singular.php; 2: single.php; 3:page.php */
+		'description' => sprintf( __( 'Added %1$s as a fallback for %2$s and %3$s' ), '<code>singular.php</code>', '<code>single.php</code>', '<code>page.php</code>' ),
+	),
+	array(
+		'heading'     => '<code>WP_List_Table</code>',
+		'description' => __( 'List tables can and should designate a primary column.' ),
+	),
+);
+
 ?>
-	<div class="wrap about-wrap full-width-layout">
-		<h1>
-			<?php
-			/* translators: %s: The current WordPress version number */
-			printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
-			?>
-		</h1>
+	<div class="wrap about-wrap">
+		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>

-		<p class="about-text">
-			<?php
-			printf(
-				/* translators: %s: The current WordPress version number */
-				__( 'Congratulations on updating to WordPress %s! This update makes it easier than ever to fix your site if something goes wrong.' ),
-				$display_version
-			);
-			?>
-		</p>
+		<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes it even easier to format your content and customize your site.' ), $display_version ); ?></div>
+		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

-		<div class="wp-badge">
-			<?php
-			/* translators: %s: The current WordPress version number */
-			printf( __( 'Version %s' ), $display_version );
-			?>
-		</div>
-
-		<nav class="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>
+		<h2 class="nav-tab-wrapper">
+			<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>
-			<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-		</nav>
+		</h2>

 		<div class="changelog point-releases">
-			<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.2.6'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.2.6' )
-					)
-				);
-				?>
+			<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 6 ); ?></h3>
+			<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.', 1 ), '4.3.6', number_format_i18n( 1 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.3.6' ); ?>
 			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.2.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.2.5' )
-					)
-				);
-				?>
+			<p><?php printf( __( '<strong>Version %1$s</strong> addressed some security issues.' ), '4.3.5' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.3.5' ); ?>
 			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'5.2.4'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '5.2.4' )
-					)
-				);
-				?>
+			<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+		         '<strong>Version %1$s</strong> addressed some security issues.', 7 ), '4.3.4' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.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.',
-						29
-					),
-					'5.2.3',
-					number_format_i18n( 29 )
-				);
-				?>
-				<?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.2.3' )
-					)
-				);
-				?>
+			<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+		         '<strong>Version %1$s</strong> addressed some security issues.', 2 ), '4.3.3' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.3.3' ); ?>
 			</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.',
-						13
-					),
-					'5.2.2',
-					number_format_i18n( 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.2.2' )
-					)
-				);
-				?>
+			<p><?php printf( _n( '<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.', 5 ), '4.3.2', number_format_i18n( 5 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.3.2' ); ?>
 			</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.',
-						33
-					),
-					'5.2.1',
-					number_format_i18n( 33 )
-				);
-				?>
-				<?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.2.1' )
-					)
-				);
-				?>
+			<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.', 26 ), '4.3.1', number_format_i18n( 26 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.3.1' ); ?>
 			</p>
 		</div>

-		<div class="headline-feature">
-			<h2><?php _e( 'Keeping Your Site Safe' ); ?></h2>
-			<p class="lead-description"><?php _e( 'WordPress 5.2 gives you even more robust tools for identifying and fixing configuration issues and fatal errors. Whether you are a developer helping clients or you manage your site solo, these tools can help get you the right information when you need it.' ); ?></p>
-			<div class="inline-svg aligncenter">
-				<img src="https://s.w.org/images/core/5.2/about_maintain-wordpress-v2.svg" alt="">
-			</div>
+		<div class="headline-feature feature-video">
+			<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>

-		<hr />
+		<hr/>

-		<div class="feature-section is-wide has-2-columns is-wider-left">
-			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'Site Health Check' ); ?></h3>
-				<p>
+		<div class="feature-section two-col">
+			<?php foreach ( $major_features as $feature ) : ?>
+			<div class="col">
+				<div class="media-container">
 					<?php
-					printf(
-						/* translators: 1: link to the WordPress 5.1 release post */
-						__( 'Building on <a href="%1$s">the Site Health features introduced in 5.1</a>, this release adds two new pages to help debug common configuration issues. It also adds space where developers can include debugging information for site maintainers.' ),
-						__( 'https://wordpress.org/news/2019/02/betty/' )
-					);
+					// Video.
+					if ( is_array( $feature['src'] ) ) :
+						echo wp_video_shortcode( array(
+							'mp4'      => $feature['src']['mp4'],
+							'ogv'      => $feature['src']['ogv'],
+							'webm'     => $feature['src']['webm'],
+							'loop'     => true,
+							'autoplay' => true,
+							'width'    => 500,
+							'height'   => 284
+						) );

-					if ( current_user_can( 'install_plugins' ) ) {
-						printf(
-							/* translators: 1: link to /wp-admin/site-health.php 2: link to /wp-admin/site-health.php?tab=debug */
-							__( ' <a href="%1$s">Check your site status</a>, and <a href="%2$s">learn how to debug issues</a>.' ),
-							admin_url( 'site-health.php' ),
-							admin_url( 'site-health.php?tab=debug' )
-						);
-					}
+					// Image.
+					else:
 					?>
-				</p>
-			</div>
-			<div class="column">
-				<div class="inline-svg aligncenter">
-					<img src="https://s.w.org/images/core/5.2/about_site-health.svg" alt="">
+					<img src="<?php echo esc_url( $feature['src'] ); ?>" />
+					<?php endif; ?>
 				</div>
+				<h3><?php echo $feature['heading']; ?></h3>
+				<p><?php echo $feature['description']; ?></p>
 			</div>
+			<?php endforeach; ?>
 		</div>

-		<hr />
-
-		<div class="feature-section is-wide has-2-columns is-wider-right">
-			<div class="column">
-				<div class="inline-svg aligncenter">
-					<img src="https://s.w.org/images/core/5.2/about_error-protection.svg" alt="">
+		<div class="feature-section three-col">
+			<?php foreach ( $minor_features as $feature ) : ?>
+			<div class="col">
+				<div class="svg-container">
+					<img src="<?php echo esc_attr( $feature['src'] ); ?>" />
 				</div>
+				<h3><?php echo $feature['heading']; ?></h3>
+				<p><?php echo $feature['description']; ?></p>
 			</div>
-			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'PHP Error Protection' ); ?></h3>
-				<p><?php _e( 'This administrator-focused update will let you safely fix or manage fatal errors without requiring a developer. It features better handling of the so-called “white screen of death”, and a way to enter recovery mode, which pauses error-causing plugins or themes.' ); ?></p>
-			</div>
+			<?php endforeach; ?>
 		</div>

-		<hr />
+		<div class="changelog">
+			<h3><?php _e( 'Under the Hood' ); ?></h3>

-		<h3 class="aligncenter"><?php _e( 'Improvements for Everyone' ); ?></h3>
-
-		<div class="has-2-columns">
-			<div class="column aligncenter">
-				<h4><?php _e( 'Accessibility Updates' ); ?></h4>
-				<p><?php _e( 'A number of changes work together to improve contextual awareness and keyboard navigation flow for those using screen readers and other assistive technologies.' ); ?></p>
+			<div class="feature-section under-the-hood three-col">
+				<?php foreach ( $tech_features as $feature ) : ?>
+				<div class="col">
+					<h4><?php echo $feature['heading']; ?></h4>
+					<p><?php echo $feature['description']; ?></p>
+				</div>
+				<?php endforeach; ?>
 			</div>
-			<div class="column aligncenter">
-				<h4><?php _e( 'New Dashboard Icons' ); ?></h4>
-				<p><?php _e( 'Thirteen new icons include Instagram, a suite of icons for BuddyPress, and rotated Earth icons for global inclusion. Find them in the Dashboard and have some fun!' ); ?></p>
-			</div>
-		</div>

-		<hr />
-
-		<h3 class="aligncenter"><?php _e( 'Developer Happiness' ); ?></h3>
-
-		<div class="has-2-columns is-fullwidth">
-			<div class="column">
-				<h4><a href="https://make.wordpress.org/core/2019/03/26/coding-standards-updates-for-php-5-6/"><?php _e( 'PHP Version Bump' ); ?></a></h4>
-				<p><?php _e( 'The minimum supported PHP version is now 5.6.20. As of WordPress 5.2, themes and plugins can safely take advantage of namespaces, anonymous functions, and more!' ); ?></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 class="column">
-				<h4><a href="https://make.wordpress.org/core/2019/04/24/developer-focused-privacy-updates-in-5-2/"><?php _e( 'Privacy Updates' ); ?></a></h4>
-				<p><?php _e( 'A new theme page template, a conditional function, and two CSS classes make designing and customizing the Privacy Policy page easier.' ); ?></p>
-			</div>
-		</div>
-		<div class="has-2-columns is-fullwidth">
-			<div class="column">
-				<h4><a href="https://make.wordpress.org/core/2019/04/24/miscellaneous-developer-updates-in-5-2/"><?php _e( 'New Body Tag Hook' ); ?></a></h4>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: wp_body_open 2: <body> */
-						__( '5.2 introduces a %1$s hook, which lets themes support injecting code right at the beginning of the %2$s element.' ),
-						'<code>wp_body_open</code>',
-						'<code>&lt;body&gt;</code>'
-					);
-					?>
-				</p>
-			</div>
-			<div class="column">
-				<h4><a href="https://make.wordpress.org/core/2019/03/25/building-javascript/"><?php _e( 'Building JavaScript' ); ?></a></h4>
-				<p><?php _e( 'With the addition of webpack and Babel configurations in the @wordpress/scripts package, developers won&#8217;t have to worry about setting up complex build tools to write modern JavaScript.' ); ?></p>
-			</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
@@ -307,37 +212,24 @@ include( ABSPATH . 'wp-admin/admin-footer.php' );
 // These are strings we may use to describe maintenance/security releases, where we aim for no new strings.
 return;

-__( 'Maintenance Release' );
-__( 'Maintenance Releases' );
+_n_noop( 'Maintenance Release', 'Maintenance Releases' );
+_n_noop( 'Security Release', 'Security Releases' );
+_n_noop( 'Maintenance and Security Release', 'Maintenance and Security Releases' );

-__( 'Security Release' );
-__( 'Security Releases' );
-
-__( 'Maintenance and Security Release' );
-__( 'Maintenance and Security Releases' );
-
-/* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed one security issue.' );
-/* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed some security issues.' );
+/* translators: 1: WordPress version number. */
+_n_noop( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.' );

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

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

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

-/* translators: %s: Codex URL */
 __( 'For more information, see <a href="%s">the release notes</a>.' );
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -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
 */
@@ -21,13 +21,12 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 /** Load WordPress Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );

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

 // 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' );
@@ -45,147 +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',
+	'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
+	'autocomplete-user', 'dashboard-widgets', 'logged-in',
 );

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

 // 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 -->
@@ -34,7 +28,7 @@ global $hook_suffix;
 		<?php
 		$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
 		 *
@@ -46,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.
@@ -64,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
 *
@@ -72,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}" );
-
 /**
 * Prints any scripts and data queued for the footer.
 *
@@ -90,20 +74,22 @@ do_action( "admin_print_footer_scripts-{$hook_suffix}" );
 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}" );
+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,10 +6,9 @@
 * @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.
@@ -19,46 +18,35 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 * @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 name */
-	$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
-} elseif ( is_user_admin() ) {
-	/* translators: User dashboard screen title. %s: Network name */
-	$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,10 +64,10 @@ _wp_admin_html_begin();

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

-$admin_body_class = preg_replace( '/[^a-z0-9_-]+/i', '-', $hook_suffix );
+$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
@@ -108,7 +96,7 @@ do_action( 'admin_enqueue_scripts', $hook_suffix );
 *
 * @since 2.6.0
 */
-do_action( "admin_print_styles-{$hook_suffix}" );
+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}" );
+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}" );
+do_action( "admin_head-$hook_suffix" );

 /**
 * Fires in head section for all admin pages.
@@ -148,63 +136,45 @@ do_action( "admin_head-{$hook_suffix}" );
 */
 do_action( 'admin_head' );

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

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

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

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

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

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

-$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
-$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
+$admin_body_class .= ' 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). */
+/** Allow for cross-domain requests (from the frontend). */
 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,25 +42,25 @@ if ( get_option( 'db_upgraded' ) ) {
 	 * @since 2.8.0
 	 */
 	do_action( 'after_db_upgrade' );
-} elseif ( get_option( 'db_version' ) != $wp_db_version && empty( $_POST ) ) {
-	if ( ! is_multisite() ) {
+} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
+	if ( !is_multisite() ) {
 		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
 		exit;

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

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

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

 auth_redirect();

 // Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
-	wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );
-}
-
-// 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') && !defined('WP_INSTALLING') )
+	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');

 set_screen_options();

-$date_format = __( 'F j, Y' );
-$time_format = __( 'g:i a' );
+$date_format = get_option('date_format');
+$time_format = get_option('time_format');

 wp_enqueue_script( 'common' );

+
+
+
 /**
 * $pagenow is set in vars.php
 * $wp_importers is sometimes set in wp-admin/includes/import.php
@@ -127,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 ) );
 }

 /**
@@ -162,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 analgous 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 = '';
@@ -206,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.
@@ -228,37 +223,23 @@ if ( isset( $plugin_page ) ) {
 		 *
 		 * @since 2.1.0
 		 */
-		do_action( "load-{$page_hook}" );
-		if ( ! isset( $_GET['noheader'] ) ) {
-			require_once( ABSPATH . 'wp-admin/admin-header.php' );
-		}
+		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" ) ) ) {
-			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.
@@ -272,36 +253,33 @@ if ( isset( $plugin_page ) ) {
 		 *
 		 * @since 1.5.0
 		 */
-		do_action( "load-{$plugin_page}" );
+		do_action( 'load-' . $plugin_page );

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

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

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

 	exit();
 } elseif ( isset( $_GET['import'] ) ) {

 	$importer = $_GET['import'];

-	if ( ! current_user_can( 'import' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to import content.' ) );
-	}
+	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;
 	}
@@ -313,19 +291,18 @@ if ( isset( $plugin_page ) ) {
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( "load-importer-{$importer}" );
+	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.
@@ -335,18 +312,18 @@ if ( isset( $plugin_page ) ) {
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param bool $force Whether to force data to be filtered through kses. Default false.
+	 * @param bool false Whether to force data to be filtered through kses. Default false.
 	 */
 	if ( apply_filters( 'force_filtered_html_on_import', false ) ) {
 		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 {
@@ -362,39 +339,33 @@ if ( isset( $plugin_page ) ) {
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( "load-{$pagenow}" );
+	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' ) {
+		if ( $pagenow == 'post-new.php' )
 			do_action( 'load-page-new.php' );
-		} elseif ( $pagenow == 'post.php' ) {
+		elseif ( $pagenow == 'post.php' )
 			do_action( 'load-page.php' );
-		}
-	} elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' ) {
+	}  elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' )
 			do_action( 'load-categories.php' );
-		} elseif ( $taxnow == 'link_category' ) {
+		elseif ( $taxnow == 'link_category' )
 			do_action( 'load-edit-link-categories.php' );
-		}
-	} elseif ( 'term.php' === $pagenow ) {
-		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,15 +14,25 @@ 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' );

-header( 'Content-Type: text/plain; charset=' . get_option( 'blog_charset' ) );
+header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );

 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
 	include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
@@ -35,65 +45,52 @@ 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'] ) && ( $id = intval( $_REQUEST['attachment_id'] ) ) && $_REQUEST['fetch'] ) {
+if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type ) {
-		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:
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) {
+		case 3 :
+			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
 				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
-			}
 			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
-
-			// Title shouldn't ever be empty, but use filename just in case.
-			$file  = get_attached_file( $post->ID );
-			$title = $post->post_title ? $post->post_title : wp_basename( $file );
+			$title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // title shouldn't ever be empty, but use filename just in cas.e
 			echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
 			break;
-		case 2:
-			add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 );
-			echo get_media_item(
-				$id,
-				array(
-					'send'   => false,
-					'delete' => true,
-				)
-			);
+		case 2 :
+			add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
+			echo get_media_item($id, array( 'send' => false, 'delete' => true ));
 			break;
 		default:
-			add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 );
-			echo get_media_item( $id );
+			add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
+			echo get_media_item($id);
 			break;
 	}
 	exit;
 }

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

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

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

@@ -101,11 +98,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,176 +9,180 @@
 /** 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';
-	}
 }

+/**
+ * Display error message at bottom of comments.
+ *
+ * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
+ */
+function comment_footer_die( $msg ) {
+	echo "<div class='wrap'><p>$msg</p></div>";
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	die;
+}
+
+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_to_edit( $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://codex.wordpress.org/Administration_Screens#Comments">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'] );
-
-		if ( ! $comment = get_comment( $comment_id ) ) {
-			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'javascript:history.go(-1)' ) );
-		}
-
-		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
-			comment_footer_die( __( 'Sorry, you are not allowed to edit this comment.' ) );
-		}
-
-		if ( 'trash' == $comment->comment_approved ) {
-			comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
-		}
-
-		$comment = get_comment_to_edit( $comment_id );
-
-		include( ABSPATH . 'wp-admin/edit-form-comment.php' );
-
+	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'] );
-
-		if ( ! $comment = get_comment( $comment_id ) ) {
-			wp_redirect( admin_url( 'edit-comments.php?error=1' ) );
-			die();
-		}
-
-		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-			wp_redirect( admin_url( 'edit-comments.php?error=2' ) );
-			die();
-		}
-
-		// No need to re-approve/re-trash/re-spam a comment.
-		if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-			wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
-			die();
-		}
-
-		require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
-		$formaction    = $action . 'comment';
-		$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
-		$nonce_action .= $comment_id;
-
-		?>
-	<div class="wrap">
-
-	<h1><?php echo esc_html( $title ); ?></h1>
-
-		<?php
-		switch ( $action ) {
-			case 'spam':
-				$caution_msg = __( 'You are about to mark the following comment as spam:' );
-				$button      = _x( 'Mark as Spam', 'comment' );
-				break;
-			case 'trash':
-				$caution_msg = __( 'You are about to move the following comment to the Trash:' );
-				$button      = __( 'Move to Trash' );
-				break;
-			case 'delete':
-				$caution_msg = __( 'You are about to delete the following comment:' );
-				$button      = __( 'Permanently Delete Comment' );
-				break;
-			default:
-				$caution_msg = __( 'You are about to approve the following comment:' );
-				$button      = __( 'Approve Comment' );
-				break;
-		}
-
-		if ( $comment->comment_approved != '0' ) { // if not unapproved
-			$message = '';
-			switch ( $comment->comment_approved ) {
-				case '1':
-					$message = __( 'This comment is currently approved.' );
-					break;
-				case 'spam':
-					$message = __( 'This comment is currently marked as spam.' );
-					break;
-				case 'trash':
-					$message = __( 'This comment is currently in the Trash.' );
-					break;
-			}
-			if ( $message ) {
-				echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
-			}
-		}
-		?>
-<div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
+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 class="notice notice-info"><p>' . $message . '</p></div>';
+	}
+}
+?>
+<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>

 <table class="form-table comment-ays">
 <tr>
-<th scope="row"><?php _e( 'Author' ); ?></th>
-<td><?php comment_author( $comment ); ?></td>
+<th scope="row"><?php _e('Author'); ?></th>
+<td><?php echo $comment->comment_author; ?></td>
 </tr>
-		<?php if ( get_comment_author_email( $comment ) ) { ?>
+<?php if ( $comment->comment_author_email ) { ?>
 <tr>
-<th scope="row"><?php _e( 'Email' ); ?></th>
-<td><?php comment_author_email( $comment ); ?></td>
+<th scope="row"><?php _e('E-mail'); ?></th>
+<td><?php echo $comment->comment_author_email; ?></td>
 </tr>
 <?php } ?>
-		<?php if ( get_comment_author_url( $comment ) ) { ?>
+<?php if ( $comment->comment_author_url ) { ?>
 <tr>
-<th scope="row"><?php _e( 'URL' ); ?></th>
-<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
+<th scope="row"><?php _e('URL'); ?></th>
+<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
 </tr>
 <?php } ?>
 <tr>
 	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
 	<td>
-		<?php
+	<?php
 		$post_id = $comment->comment_post_ID;
 		if ( current_user_can( 'edit_post', $post_id ) ) {
-			$post_link  = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+			$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
 			$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
 		} else {
 			$post_link = esc_html( get_the_title( $post_id ) );
@@ -187,169 +191,142 @@ switch ( $action ) {

 		if ( $comment->comment_parent ) {
 			$parent      = get_comment( $comment->comment_parent );
-			$parent_link = esc_url( get_comment_link( $parent ) );
-			$name        = get_comment_author( $parent );
-			printf(
-				/* translators: %s: comment link */
-				' | ' . __( 'In reply to %s.' ),
-				'<a href="' . $parent_link . '">' . $name . '</a>'
-			);
+			$parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
+			$name        = get_comment_author( $parent->comment_ID );
+			printf( ' | ' . __( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
 		}
-		?>
+	?>
 	</td>
-	</tr>
-	<tr>
+</tr>
+<tr>
 	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
 	<td>
-		<?php
-		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf(
-			__( '%1$s at %2$s' ),
-			/* translators: comment date format. See https://secure.php.net/date */
-			get_comment_date( __( 'Y/m/d' ), $comment ),
-			get_comment_date( __( 'g:i a' ), $comment )
+	<?php
+		/* translators: 2: comment date, 3: comment time */
+		printf( __( '<a href="%1$s">%2$s at %3$s</a>' ),
+			esc_url( get_comment_link( $comment->comment_ID ) ),
+			/* translators: comment date format. See http://php.net/date */
+			get_comment_date( __( 'Y/m/d' ) ),
+			get_comment_date( get_option( 'time_format' ) )
 		);
-		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><?php echo $comment->comment_content; ?></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></td>
+</p>

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

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

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

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

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

-		if ( ! $comment = get_comment( $comment_id ) ) {
-			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'edit-comments.php' ) );
-		}
-		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-			comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
-		}
+	if ( !$comment = get_comment($comment_id) )
+		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+		comment_footer_die( __('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_id );
+			$redir = add_query_arg( array('deleted' => '1'), $redir );
+			break;
+		case 'trashcomment' :
+			wp_trash_comment($comment_id);
+			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
+			break;
+		case 'untrashcomment' :
+			wp_untrash_comment($comment_id);
+			$redir = add_query_arg( array('untrashed' => '1'), $redir );
+			break;
+		case 'spamcomment' :
+			wp_spam_comment($comment_id);
+			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
+			break;
+		case 'unspamcomment' :
+			wp_unspam_comment($comment_id);
+			$redir = add_query_arg( array('unspammed' => '1'), $redir );
+			break;
+		case 'approvecomment' :
+			wp_set_comment_status( $comment_id, 'approve' );
+			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+			break;
+		case 'unapprovecomment' :
+			wp_set_comment_status( $comment_id, '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
@@ -8,101 +8,130 @@

 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
-require_once( dirname( __FILE__ ) . '/includes/credits.php' );

 $title = __( 'Credits' );

-list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+/**
+ * Retrieve the contributor credits.
+ *
+ * @global string $wp_version The current WordPress version.
+ *
+ * @since 3.2.0
+ *
+ * @return array|false A list of all of the contributors, or false on error.
+*/
+function wp_credits() {
+	global $wp_version;
+	$locale = get_locale();
+
+	$results = get_site_transient( 'wordpress_credits_' . $locale );
+
+	if ( ! is_array( $results )
+		|| false !== strpos( $wp_version, '-' )
+		|| ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
+	) {
+		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
+
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+			return false;
+
+		$results = json_decode( wp_remote_retrieve_body( $response ), true );
+
+		if ( ! is_array( $results ) )
+			return false;
+
+		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
+	}
+
+	return $results;
+}
+
+/**
+ * Retrieve the link to a contributor's WordPress.org profile page.
+ *
+ * @access private
+ * @since 3.2.0
+ *
+ * @param string &$display_name The contributor's display name, passed by reference.
+ * @param string $username      The contributor's username.
+ * @param string $profiles      URL to the contributor's WordPress.org profile page.
+ */
+function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
+	$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
+}
+
+/**
+ * Retrieve the link to an external library used in WordPress.
+ *
+ * @access private
+ * @since 3.2.0
+ *
+ * @param string &$data External library data, passed by reference.
+ */
+function _wp_credits_build_object_link( &$data ) {
+	$data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
+}
+
+list( $display_version ) = explode( '-', $wp_version );

 include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
-<div class="wrap about-wrap full-width-layout">
+<div class="wrap about-wrap">

-<h1>
-	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
-	?>
-</h1>
+<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

-<p class="about-text">
-	<?php
-	printf(
-		/* translators: %s: The current WordPress version number */
-		__( 'Congratulations on updating to WordPress %s! This update makes it easier than ever to fix your site if something goes wrong.' ),
-		$display_version
-	);
-	?>
-</p>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes it even easier to format your content and customize your site.' ), $display_version ); ?></div>

-<div class="wp-badge">
-	<?php
-	/* translators: %s: The current WordPress version number */
-	printf( __( 'Version %s' ), $display_version );
-	?>
-</div>
+<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

-<nav class="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="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-</nav>
+<h2 class="nav-tab-wrapper">
+	<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>

-<div class="about-wrap-content">
 <?php

 $credits = wp_credits();

 if ( ! $credits ) {
-	echo '<p class="about-description">';
-	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>.' ),
+	echo '<p class="about-description">' . sprintf( __( '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>';
-	echo '</div>';
-	echo '</div>';
+		/* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
+		__( 'https://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</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";

-echo '<p>' . sprintf(
-	/* 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>';
-
 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'] ) ) {
-			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
 		} else {
-			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 			$title = translate( $group_data['name'] );
 		}

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

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

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

 ?>
-</div>
+<p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
+	/* translators: URL to the Make WordPress 'Get Involved' landing page used on the credits page */
+	__( 'https://make.wordpress.org/' ) ); ?></p>
+
 </div>
 <?php

@@ -141,13 +171,21 @@ return;

 // These are strings returned by the API that we want to be translatable
 __( 'Project Leaders' );
-/* translators: %s: The current WordPress version number */
+__( 'Extended Core Team' );
+__( 'Core Developers' );
+__( 'Recent Rockstars' );
 __( 'Core Contributors to WordPress %s' );
-__( 'Noteworthy Contributors' );
+__( 'Contributing Developers' );
 __( 'Cofounder, Project Lead' );
 __( 'Lead Developer' );
 __( 'Release Lead' );
-__( 'Release Design Lead' );
-__( 'Release Deputy' );
+__( 'User Experience Lead' );
 __( 'Core Developer' );
+__( 'Core Committer' );
+__( 'Guest Committer' );
+__( 'Developer' );
+__( 'Designer' );
+__( 'XML-RPC' );
+__( 'Internationalization' );
 __( 'External Libraries' );
+__( 'Icon Design' );
--- a/wp-admin/css/about-rtl.css
+++ b/wp-admin/css/about-rtl.css
@@ -22,14 +22,6 @@
 	font-size: 15px;
 }

-.about-wrap.full-width-layout {
-	max-width: 1200px;
-}
-
-.about-wrap-content {
-	max-width: 1050px;
-}
-
 .about-wrap div.updated,
 .about-wrap div.error,
 .about-wrap .notice {
@@ -39,34 +31,29 @@
 .about-wrap hr {
 	border: 0;
 	height: 0;
-	margin: 3em 0 0;
+	margin: 0;
 	border-top: 1px solid rgba(0, 0, 0, 0.1);
 }

 .about-wrap img {
 	margin: 0;
-	width: 100%;
+	max-width: 100%;
 	height: auto;
 	vertical-align: middle;
 }

-.about-wrap .inline-svg img {
-	max-width: 100%;
-	width: auto;
-	height: auto;
-}
-
-.about-wrap video {
-	margin: 1.5em auto;
+.about-wrap .jetpack-video-wrapper {
+	margin-bottom: 0;
 }

 /* WordPress Version Badge */

 .wp-badge {
-	background: #0073aa url(../images/w-logo-white.png?ver=20160308) no-repeat;
-	background-position: center 25px;
-	background-size: 80px 80px;
-	color: #fff;
+	background: #0073aa url(../images/w-logo-white.png?ver=20131202) no-repeat;
+	background-position: center 24px;
+	-webkit-background-size: 85px 85px;
+	background-size: 85px 85px;
+	color: #78c8e6;
 	font-size: 14px;
 	text-align: center;
 	font-weight: 600;
@@ -74,13 +61,14 @@
 	padding-top: 120px;
 	height: 40px;
 	display: inline-block;
-	width: 140px;
+	width: 150px;
 	text-rendering: optimizeLegibility;
-	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.2);
 }

 .svg .wp-badge {
-	background-image: url(../images/wordpress-logo-white.svg?ver=20160308);
+	background-image: url(../images/wordpress-logo-white.svg?ver=20131110);
 }

 .about-wrap .wp-badge {
@@ -91,216 +79,91 @@

 /* Tabs */

-.about-wrap .nav-tab {
-	padding-left: 15px;
-	padding-right: 15px;
+.about-wrap h2.nav-tab-wrapper {
+	padding-right: 6px;
+}
+
+.about-wrap h2 .nav-tab {
+	padding: 4px 15px 6px;
+	margin: 0 0 -1px 3px;
 	font-size: 18px;
-	line-height: 1.33333333;
+	vertical-align: top;
+	border-width: 1px;
+	white-space: nowrap;
 }

 /* 1.1 - Typography */

+.about-wrap p {
+	line-height: 1.6em;
+	font-size: 14px;
+}
+
 .about-wrap h1 {
 	margin: 0.2em 0 0 200px;
 	padding: 0;
 	color: #32373c;
-	line-height: 1.2;
+	line-height: 1.2em;
 	font-size: 2.8em;
 	font-weight: 400;
 }

-.about-wrap h2 {
-	margin: 40px 0 .6em;
-	font-size: 2.7em;
-	line-height: 1.3;
-	font-weight: 300;
-	text-align: center;
-}
-
 .about-wrap h3 {
 	margin: 1.25em 0 .6em;
-	font-size: 1.4em;
-	line-height: 1.5;
+	font-size: 1.25em;
+	line-height: 1.5em;
 }

 .about-wrap h4 {
-	font-size: 16px;
 	color: #23282d;
 }

-.about-wrap p {
-	line-height: 1.5;
-	font-size: 16px;
-}
-
 .about-wrap code,
 .about-wrap ol li p {
 	font-size: 14px;
-	font-weight: 400;
-}
-
-.about-wrap figcaption {
-	font-size: 13px;
-	text-align: center;
-	color: white;
-	text-overflow: ellipsis;
+	font-weight: normal;
 }

 .about-wrap .about-description,
 .about-wrap .about-text {
 	margin-top: 1.4em;
-	font-weight: 400;
-	line-height: 1.6;
+	font-weight: normal;
+	line-height: 1.6em;
 	font-size: 19px;
 }

 .about-wrap .about-text {
 	margin: 1em 0 1em 200px;
-	color: #555d66;
+	min-height: 60px;
+	color: #777;
 }

 /* 1.2 - Structure */

-.about-wrap .has-1-columns,
-.about-wrap .has-2-columns,
-.about-wrap .has-3-columns,
-.about-wrap .has-4-columns {
-	display: -ms-grid;
-	display: grid;
-	max-width: 800px;
-	margin-top: 40px;
-	margin-right: auto;
-	margin-left: auto;
-}
-
-.about-wrap .column {
-	margin-left: 20px;
-	margin-right: 20px;
-}
-
-.about-wrap .is-wide {
-	max-width: 760px;
-}
-
-.about-wrap .is-fullwidth {
-	max-width: 100%;
-}
-
-.about-wrap .has-1-columns {
-	display: block;
-	max-width: 680px;
-	margin: 0 auto 40px;
-}
-
-.about-wrap .has-2-columns {
-	-ms-grid-columns: 1fr 1fr;
-	grid-template-columns: 1fr 1fr;
-}
-
-.about-wrap .has-2-columns .column:nth-of-type(2n+1) {
-	-ms-grid-column: 1;
-	grid-column-start: 1;
-}
-
-.about-wrap .has-2-columns .column:nth-of-type(2n) {
-	-ms-grid-column: 2;
-	grid-column-start: 2;
-}
-
-.about-wrap .has-2-columns.is-wider-right {
-	-ms-grid-columns: 1fr 2fr;
-	grid-template-columns: 1fr 2fr;
-}
-
-.about-wrap .has-2-columns.is-wider-left {
-	-ms-grid-columns: 2fr 1fr;
-	grid-template-columns: 2fr 1fr;
-}
-
-.about-wrap .has-3-columns {
-	-ms-grid-columns: (1fr)[3];
-	grid-template-columns: repeat(3, 1fr);
-}
-
-.about-wrap .has-3-columns .column:nth-of-type(3n+1) {
-	-ms-grid-column: 1;
-	grid-column-start: 1;
-}
-
-.about-wrap .has-3-columns .column:nth-of-type(3n+2) {
-	-ms-grid-column: 2;
-	grid-column-start: 2;
-}
-
-.about-wrap .has-3-columns .column:nth-of-type(3n) {
-	-ms-grid-column: 3;
-	grid-column-start: 3;
-}
-
-.about-wrap .has-4-columns {
-	-ms-grid-columns: (1fr)[4];
-	grid-template-columns: repeat(4, 1fr);
-}
-
-.about-wrap .has-4-columns .column:nth-of-type(4n+1) {
-	-ms-grid-column: 1;
-	grid-column-start: 1;
-}
-
-.about-wrap .has-4-columns .column:nth-of-type(4n+2) {
-	-ms-grid-column: 2;
-	grid-column-start: 2;
-}
-
-.about-wrap .has-4-columns .column:nth-of-type(4n+3) {
-	-ms-grid-column: 3;
-	grid-column-start: 3;
-}
-
-.about-wrap .has-4-columns .column:nth-of-type(4n) {
-	-ms-grid-column: 4;
-	grid-column-start: 4;
-}
-
-.about-wrap .column :first-child {
-	margin-top: 0;
-}
-
-.about-wrap .aligncenter {
-	text-align: center;
-}
-
-.about-wrap .alignleft {
+.about-wrap [class$=col] .col {
 	float: right;
-	margin-left: 40px;
+	position: relative;
+}
+.about-wrap .two-col .col {
+	margin-left: 4.799999999%;
+	width: 47.6%;
 }

-.about-wrap .alignright {
-	float: left;
-	margin-right: 40px;
+.about-wrap .three-col .col {
+	margin-left: 4.999999999%;
+	width: 29.95%;
 }

-.about-wrap .is-vertically-aligned-top {
-	align-self: start;
-}
-
-.about-wrap .is-vertically-aligned-center {
-	align-self: center;
-}
-
-.about-wrap .is-vertically-aligned-bottom {
-	align-self: end;
+.about-wrap .two-col .col:nth-of-type(2n),
+.about-wrap .three-col .col:nth-of-type(3n) {
+	margin-left: 0;
 }

 /* 1.3 - Point Releases */

 .about-wrap .point-releases {
 	margin-top: 5px;
-	border-bottom: 1px solid #ddd;
-}
-
-.about-wrap .changelog {
-	margin-bottom: 40px;
+	border-bottom: 1px solid #dfdfdf;
 }

 .about-wrap .changelog.point-releases h3 {
@@ -311,39 +174,98 @@
 	padding-top: 7px;
 }

-.about-wrap .changelog.feature-section .col {
-	margin-top: 40px;
-}
-
 /*------------------------------------------------------------------------------
  2.0 - About Page
 ------------------------------------------------------------------------------*/

 /* 2.1 - Typography */

-.about-wrap .lead-description {
-	font-size: 1.5em;
+.about-wrap .headline-feature h2 {
+	margin: 50px 0 30px;
+	font-size: 2.2em;
+	font-weight: 300;
+	line-height: 1.3;
+	text-align: right;
+}
+
+.about-wrap .headline-feature h3 {
+	margin-top: 30px;
 	text-align: center;
 }

+.about-wrap .feature-list h2 {
+	margin: 30px 0 15px;
+	text-align: center;
+}
+
+.about-wrap .feature-section h4 {
+	margin: 1.4em 0 0.6em 0;
+	font-size: 1em;
+}
+
 .about-wrap .feature-section p {
 	margin-top: 0.6em;
 }

 /* 2.2 - Structure */

-.about-wrap .headline-feature {
-	margin: 0 auto 40px;
-	max-width: 680px;
-}
-
-.about-wrap .headline-feature h2 {
-	margin: 50px 0 0;
-}
-
-.about-wrap .headline-feature img {
-	max-width: 600px;
+.about-wrap .feature-video {
+	position: relative;
+	margin: 40px 0;
+	padding-bottom: 56.25%; /* video is 1280 x 720 */
 	width: 100%;
+	height: 0;
+	text-align: center;
+}
+
+.about-wrap .feature-video embed {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 100%;
+	height: 100%;
+}
+
+.about-wrap .featured-image {
+	text-align: center;
+}
+
+.about-wrap .feature-section {
+	overflow: hidden;
+	padding: 0 0 40px;
+	border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.about-wrap .headline-feature .feature-section {
+	margin: 0 auto;
+	max-width: 95%;
+}
+
+.about-wrap .feature-section .media-container {
+	border: 1px solid #ddd;
+	overflow: hidden;
+}
+
+.about-wrap .feature-section .svg-container {
+	padding: 50px 0;
+	text-align: center;
+	background-color: #e1e1e3;
+}
+
+.about-wrap .feature-section .svg-container img {
+	max-width: 150px;
+}
+
+.about-wrap .feature-section:not(.under-the-hood) .col {
+	margin-top: 40px;
+}
+
+.about-wrap .changelog {
+	margin-bottom: 40px;
+}
+
+.about-wrap .changelog.feature-section .col {
+	margin-top: 40px;
 }

 /* Return to Dashboard Home link */
@@ -351,7 +273,7 @@
 .about-wrap .return-to-dashboard {
 	margin: 30px -5px 0 0;
 	font-size: 14px;
-	font-weight: 600;
+	font-weight: bold;
 }

 .about-wrap .return-to-dashboard a {
@@ -359,31 +281,33 @@
 	padding: 0 5px;
 }

+.about-wrap .feature-list.finer-points h4,
+.about-wrap .feature-list.finer-points p {
+	margin-right: 115px;
+}
+
 /*------------------------------------------------------------------------------
  3.0 - Credits & Freedoms Pages
 ------------------------------------------------------------------------------*/

 /* Credits */

-.about-wrap h2.wp-people-group {
-	margin: 2.6em 0 1.33em;
-	padding: 0;
+.about-wrap h4.wp-people-group {
+	margin-top: 2.6em;
 	font-size: 16px;
-	line-height: inherit;
-	font-weight: 600;
-	text-align: right;
 }

-.about-wrap .wp-people-group {
+.about-wrap ul.wp-people-group {
+	overflow: hidden;
 	padding: 0 5px;
 	margin: 0 -5px 0 -15px;
 }

-.about-wrap .compact {
-	margin-bottom: 0;
+.about-wrap ul.compact {
+	margin-bottom: 0
 }

-.about-wrap .wp-person {
+.about-wrap li.wp-person {
 	display: inline-block;
 	vertical-align: top;
 	margin-left: 10px;
@@ -392,38 +316,35 @@
 	width: 280px;
 }

-.about-wrap .compact .wp-person {
+.about-wrap ul.compact li.wp-person {
 	height: auto;
 	width: 180px;
 	padding-bottom: 0;
 	margin-bottom: 0;
 }

-.about-wrap .wp-person .gravatar {
+.about-wrap li.wp-person img.gravatar {
 	float: right;
 	margin: 0 0 10px 10px;
-	padding: 1px;
+	padding: 2px;
 	width: 60px;
 	height: 60px;
 }

-.about-wrap .compact .wp-person .gravatar {
+.about-wrap ul.compact li.wp-person img.gravatar {
 	width: 30px;
 	height: 30px;
 }

-.about-wrap .wp-person .web {
+.about-wrap li.wp-person a.web {
+	display: block;
 	margin: 6px 0 2px;
 	font-size: 16px;
-	font-weight: 400;
-	line-height: 2;
+	font-weight: normal;
+	line-height: 1.6em;
 	text-decoration: none;
 }

-.about-wrap .wp-person .title {
-	display: block;
-}
-
 .about-wrap #wp-people-group-validators + p.wp-credits-list {
 	margin-top: 0;
 }
@@ -440,95 +361,49 @@

 .freedoms-php .about-wrap ol li {
 	list-style-type: decimal;
-	font-weight: 600;
+	font-weight: bold;
 }

 .freedoms-php .about-wrap ol p {
-	font-weight: 400;
+	font-weight: normal;
 	margin: 0.6em 0;
 }

-.freedoms-php .has-4-columns {
-	margin-bottom: 40px;
-}
-
-.freedoms-php .column .freedoms-image {
-	background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png');
-	background-size: 100%;
-	padding-top: 100%;
-}
-
-.freedoms-php .column:nth-of-type(2) .freedoms-image {
-	background-position: 100% 34%;
-}
-
-.freedoms-php .column:nth-of-type(3) .freedoms-image {
-	background-position: 100% 66%;
-}
-
-.freedoms-php .column:nth-of-type(4) .freedoms-image {
-	background-position: 100% 100%;
-}
-
 /*------------------------------------------------------------------------------
  4.0 - Media Queries
 ------------------------------------------------------------------------------*/

-@media screen and (max-width: 782px) {
-	.about-wrap .has-3-columns,
-	.about-wrap .has-4-columns {
-		-ms-grid-columns: 1fr 1fr;
-		grid-template-columns: 1fr 1fr;
+@media screen and ( max-width: 782px ) {
+	.about-wrap .feature-section {
+		padding: 0;
+		border-bottom: none;
 	}

-	.about-wrap .has-3-columns .column:nth-of-type(3n+1),
-	.about-wrap .has-4-columns .column:nth-of-type(4n+1) {
-		-ms-grid-column: 1;
-		grid-column-start: 1;
-		-ms-grid-row: 1;
-		grid-row-start: 1;
+	.about-wrap [class$=col] .col {
+		float: none;
+		width: 100%;
+		margin: 40px 0 0;
+		padding: 0 0 40px;
+		border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 	}

-	.about-wrap .has-3-columns .column:nth-of-type(3n+2),
-	.about-wrap .has-4-columns .column:nth-of-type(4n+2) {
-		-ms-grid-column: 2;
-		grid-column-start: 2;
-		-ms-grid-row: 1;
-		grid-row-start: 1;
-	}
-
-	.about-wrap .has-3-columns .column:nth-of-type(3n),
-	.about-wrap .has-4-columns .column:nth-of-type(4n+3) {
-		-ms-grid-column: 1;
-		grid-column-start: 1;
-		-ms-grid-row: 2;
-		grid-row-start: 2;
-	}
-
-	.about-wrap .has-4-columns .column:nth-of-type(4n) {
-		-ms-grid-column: 2;
-		grid-column-start: 2;
-		-ms-grid-row: 2;
-		grid-row-start: 2;
-	}
-}
-
-@media screen and (max-width: 600px) {
-	.about-wrap .has-2-columns,
-	.about-wrap .has-3-columns,
-	.about-wrap .has-4-columns {
+	.about-wrap .three-col img {
 		display: block;
+		margin: 0 auto;
 	}

-	.about-wrap :not(.is-wider-right):not(.is-wider-left) .column {
-		margin-left: 0;
-		margin-right: 0;
+	.about-wrap .feature-list .col {
+		margin: 0;
+		padding: 0;
+		border-bottom: none;
 	}

-	.about-wrap .has-2-columns.is-wider-right,
-	.about-wrap .has-2-columns.is-wider-left {
-		display: -ms-grid;
-		display: grid;
+	.about-wrap .headline-feature .feature-section {
+		max-width: 100%;
+	}
+
+	.about-wrap .feature-list .feature-section {
+		padding: 0 0 40px;
 	}
 }

@@ -552,21 +427,38 @@
 		margin-bottom: 1.5em;
 		width: 100%;
 	}
-}

-@media only screen and (max-width: 480px) {
-	.about-wrap .has-2-columns.is-wider-right,
-	.about-wrap .has-2-columns.is-wider-left {
-		display: block;
+	.about-wrap h2.nav-tab-wrapper {
+		padding-right: 0;
+		border-bottom: 0;
 	}

-	.about-wrap .column {
-		margin-left: 0;
-		margin-right: 0;
+	.about-wrap h2 .nav-tab {
+		margin-top: 10px;
+		margin-left: 10px;
+		border-bottom: 1px solid #ccc;
 	}

-	.about-wrap .has-2-columns.is-wider-right img,
-	.about-wrap .has-2-columns.is-wider-left img {
-		max-width: 160px;
+	.about-wrap .feature-section .svg-container {
+		padding-top: 20px;
+		padding-bottom: 20px;
+	}
+
+	.about-wrap .three-col .col,
+	.about-wrap .headline-feature .feature-section .col {
+		width: 100% !important;
+		float: none !important;
+	}
+}
+
+@media only screen and (max-width: 400px) {
+	.about-wrap .feature-list svg {
+		margin-top: 15px;
+		height: 65px;
+		width: 65px;
+	}
+	.about-wrap .feature-list.finer-points h4,
+	.about-wrap .feature-list.finer-points p {
+		margin-right: 80px;
 	}
 }
--- 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
@@ -22,14 +22,6 @@
 	font-size: 15px;
 }

-.about-wrap.full-width-layout {
-	max-width: 1200px;
-}
-
-.about-wrap-content {
-	max-width: 1050px;
-}
-
 .about-wrap div.updated,
 .about-wrap div.error,
 .about-wrap .notice {
@@ -39,34 +31,29 @@
 .about-wrap hr {
 	border: 0;
 	height: 0;
-	margin: 3em 0 0;
+	margin: 0;
 	border-top: 1px solid rgba(0, 0, 0, 0.1);
 }

 .about-wrap img {
 	margin: 0;
-	width: 100%;
+	max-width: 100%;
 	height: auto;
 	vertical-align: middle;
 }

-.about-wrap .inline-svg img {
-	max-width: 100%;
-	width: auto;
-	height: auto;
-}
-
-.about-wrap video {
-	margin: 1.5em auto;
+.about-wrap .jetpack-video-wrapper {
+	margin-bottom: 0;
 }

 /* WordPress Version Badge */

 .wp-badge {
-	background: #0073aa url(../images/w-logo-white.png?ver=20160308) no-repeat;
-	background-position: center 25px;
-	background-size: 80px 80px;
-	color: #fff;
+	background: #0073aa url(../images/w-logo-white.png?ver=20131202) no-repeat;
+	background-position: center 24px;
+	-webkit-background-size: 85px 85px;
+	background-size: 85px 85px;
+	color: #78c8e6;
 	font-size: 14px;
 	text-align: center;
 	font-weight: 600;
@@ -74,13 +61,14 @@
 	padding-top: 120px;
 	height: 40px;
 	display: inline-block;
-	width: 140px;
+	width: 150px;
 	text-rendering: optimizeLegibility;
-	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.2);
 }

 .svg .wp-badge {
-	background-image: url(../images/wordpress-logo-white.svg?ver=20160308);
+	background-image: url(../images/wordpress-logo-white.svg?ver=20131110);
 }

 .about-wrap .wp-badge {
@@ -91,216 +79,91 @@

 /* Tabs */

-.about-wrap .nav-tab {
-	padding-right: 15px;
-	padding-left: 15px;
+.about-wrap h2.nav-tab-wrapper {
+	padding-left: 6px;
+}
+
+.about-wrap h2 .nav-tab {
+	padding: 4px 15px 6px;
+	margin: 0 3px -1px 0;
 	font-size: 18px;
-	line-height: 1.33333333;
+	vertical-align: top;
+	border-width: 1px;
+	white-space: nowrap;
 }

 /* 1.1 - Typography */

+.about-wrap p {
+	line-height: 1.6em;
+	font-size: 14px;
+}
+
 .about-wrap h1 {
 	margin: 0.2em 200px 0 0;
 	padding: 0;
 	color: #32373c;
-	line-height: 1.2;
+	line-height: 1.2em;
 	font-size: 2.8em;
 	font-weight: 400;
 }

-.about-wrap h2 {
-	margin: 40px 0 .6em;
-	font-size: 2.7em;
-	line-height: 1.3;
-	font-weight: 300;
-	text-align: center;
-}
-
 .about-wrap h3 {
 	margin: 1.25em 0 .6em;
-	font-size: 1.4em;
-	line-height: 1.5;
+	font-size: 1.25em;
+	line-height: 1.5em;
 }

 .about-wrap h4 {
-	font-size: 16px;
 	color: #23282d;
 }

-.about-wrap p {
-	line-height: 1.5;
-	font-size: 16px;
-}
-
 .about-wrap code,
 .about-wrap ol li p {
 	font-size: 14px;
-	font-weight: 400;
-}
-
-.about-wrap figcaption {
-	font-size: 13px;
-	text-align: center;
-	color: white;
-	text-overflow: ellipsis;
+	font-weight: normal;
 }

 .about-wrap .about-description,
 .about-wrap .about-text {
 	margin-top: 1.4em;
-	font-weight: 400;
-	line-height: 1.6;
+	font-weight: normal;
+	line-height: 1.6em;
 	font-size: 19px;
 }

 .about-wrap .about-text {
 	margin: 1em 200px 1em 0;
-	color: #555d66;
+	min-height: 60px;
+	color: #777;
 }

 /* 1.2 - Structure */

-.about-wrap .has-1-columns,
-.about-wrap .has-2-columns,
-.about-wrap .has-3-columns,
-.about-wrap .has-4-columns {
-	display: -ms-grid;
-	display: grid;
-	max-width: 800px;
-	margin-top: 40px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-.about-wrap .column {
-	margin-right: 20px;
-	margin-left: 20px;
-}
-
-.about-wrap .is-wide {
-	max-width: 760px;
-}
-
-.about-wrap .is-fullwidth {
-	max-width: 100%;
-}
-
-.about-wrap .has-1-columns {
-	display: block;
-	max-width: 680px;
-	margin: 0 auto 40px;
-}
-
-.about-wrap .has-2-columns {
-	-ms-grid-columns: 1fr 1fr;
-	grid-template-columns: 1fr 1fr;
-}
-
-.about-wrap .has-2-columns .column:nth-of-type(2n+1) {
-	-ms-grid-column: 1;
-	grid-column-start: 1;
-}
-
-.about-wrap .has-2-columns .column:nth-of-type(2n) {
-	-ms-grid-column: 2;
-	grid-column-start: 2;
-}
-
-.about-wrap .has-2-columns.is-wider-right {
-	-ms-grid-columns: 1fr 2fr;
-	grid-template-columns: 1fr 2fr;
-}
-
-.about-wrap .has-2-columns.is-wider-left {
-	-ms-grid-columns: 2fr 1fr;
-	grid-template-columns: 2fr 1fr;
-}
-
-.about-wrap .has-3-columns {
-	-ms-grid-columns: (1fr)[3];
-	grid-template-columns: repeat(3, 1fr);
-}
-
-.about-wrap .has-3-columns .column:nth-of-type(3n+1) {
-	-ms-grid-column: 1;
-	grid-column-start: 1;
-}
-
-.about-wrap .has-3-columns .column:nth-of-type(3n+2) {
-	-ms-grid-column: 2;
-	grid-column-start: 2;
-}
-
-.about-wrap .has-3-columns .column:nth-of-type(3n) {
-	-ms-grid-column: 3;
-	grid-column-start: 3;
-}
-
-.about-wrap .has-4-columns {
-	-ms-grid-columns: (1fr)[4];
-	grid-template-columns: repeat(4, 1fr);
-}
-
-.about-wrap .has-4-columns .column:nth-of-type(4n+1) {
-	-ms-grid-column: 1;
-	grid-column-start: 1;
-}
-
-.about-wrap .has-4-columns .column:nth-of-type(4n+2) {
-	-ms-grid-column: 2;
-	grid-column-start: 2;
-}
-
-.about-wrap .has-4-columns .column:nth-of-type(4n+3) {
-	-ms-grid-column: 3;
-	grid-column-start: 3;
-}
-
-.about-wrap .has-4-columns .column:nth-of-type(4n) {
-	-ms-grid-column: 4;
-	grid-column-start: 4;
-}
-
-.about-wrap .column :first-child {
-	margin-top: 0;
-}
-
-.about-wrap .aligncenter {
-	text-align: center;
-}
-
-.about-wrap .alignleft {
+.about-wrap [class$=col] .col {
 	float: left;
-	margin-right: 40px;
+	position: relative;
+}
+.about-wrap .two-col .col {
+	margin-right: 4.799999999%;
+	width: 47.6%;
 }

-.about-wrap .alignright {
-	float: right;
-	margin-left: 40px;
+.about-wrap .three-col .col {
+	margin-right: 4.999999999%;
+	width: 29.95%;
 }

-.about-wrap .is-vertically-aligned-top {
-	align-self: start;
-}
-
-.about-wrap .is-vertically-aligned-center {
-	align-self: center;
-}
-
-.about-wrap .is-vertically-aligned-bottom {
-	align-self: end;
+.about-wrap .two-col .col:nth-of-type(2n),
+.about-wrap .three-col .col:nth-of-type(3n) {
+	margin-right: 0;
 }

 /* 1.3 - Point Releases */

 .about-wrap .point-releases {
 	margin-top: 5px;
-	border-bottom: 1px solid #ddd;
-}
-
-.about-wrap .changelog {
-	margin-bottom: 40px;
+	border-bottom: 1px solid #dfdfdf;
 }

 .about-wrap .changelog.point-releases h3 {
@@ -311,39 +174,98 @@
 	padding-top: 7px;
 }

-.about-wrap .changelog.feature-section .col {
-	margin-top: 40px;
-}
-
 /*------------------------------------------------------------------------------
  2.0 - About Page
 ------------------------------------------------------------------------------*/

 /* 2.1 - Typography */

-.about-wrap .lead-description {
-	font-size: 1.5em;
+.about-wrap .headline-feature h2 {
+	margin: 50px 0 30px;
+	font-size: 2.2em;
+	font-weight: 300;
+	line-height: 1.3;
+	text-align: left;
+}
+
+.about-wrap .headline-feature h3 {
+	margin-top: 30px;
 	text-align: center;
 }

+.about-wrap .feature-list h2 {
+	margin: 30px 0 15px;
+	text-align: center;
+}
+
+.about-wrap .feature-section h4 {
+	margin: 1.4em 0 0.6em 0;
+	font-size: 1em;
+}
+
 .about-wrap .feature-section p {
 	margin-top: 0.6em;
 }

 /* 2.2 - Structure */

-.about-wrap .headline-feature {
-	margin: 0 auto 40px;
-	max-width: 680px;
-}
-
-.about-wrap .headline-feature h2 {
-	margin: 50px 0 0;
-}
-
-.about-wrap .headline-feature img {
-	max-width: 600px;
+.about-wrap .feature-video {
+	position: relative;
+	margin: 40px 0;
+	padding-bottom: 56.25%; /* video is 1280 x 720 */
 	width: 100%;
+	height: 0;
+	text-align: center;
+}
+
+.about-wrap .feature-video embed {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+
+.about-wrap .featured-image {
+	text-align: center;
+}
+
+.about-wrap .feature-section {
+	overflow: hidden;
+	padding: 0 0 40px;
+	border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.about-wrap .headline-feature .feature-section {
+	margin: 0 auto;
+	max-width: 95%;
+}
+
+.about-wrap .feature-section .media-container {
+	border: 1px solid #ddd;
+	overflow: hidden;
+}
+
+.about-wrap .feature-section .svg-container {
+	padding: 50px 0;
+	text-align: center;
+	background-color: #e1e1e3;
+}
+
+.about-wrap .feature-section .svg-container img {
+	max-width: 150px;
+}
+
+.about-wrap .feature-section:not(.under-the-hood) .col {
+	margin-top: 40px;
+}
+
+.about-wrap .changelog {
+	margin-bottom: 40px;
+}
+
+.about-wrap .changelog.feature-section .col {
+	margin-top: 40px;
 }

 /* Return to Dashboard Home link */
@@ -351,7 +273,7 @@
 .about-wrap .return-to-dashboard {
 	margin: 30px 0 0 -5px;
 	font-size: 14px;
-	font-weight: 600;
+	font-weight: bold;
 }

 .about-wrap .return-to-dashboard a {
@@ -359,31 +281,33 @@
 	padding: 0 5px;
 }

+.about-wrap .feature-list.finer-points h4,
+.about-wrap .feature-list.finer-points p {
+	margin-left: 115px;
+}
+
 /*------------------------------------------------------------------------------
  3.0 - Credits & Freedoms Pages
 ------------------------------------------------------------------------------*/

 /* Credits */

-.about-wrap h2.wp-people-group {
-	margin: 2.6em 0 1.33em;
-	padding: 0;
+.about-wrap h4.wp-people-group {
+	margin-top: 2.6em;
 	font-size: 16px;
-	line-height: inherit;
-	font-weight: 600;
-	text-align: left;
 }

-.about-wrap .wp-people-group {
+.about-wrap ul.wp-people-group {
+	overflow: hidden;
 	padding: 0 5px;
 	margin: 0 -15px 0 -5px;
 }

-.about-wrap .compact {
-	margin-bottom: 0;
+.about-wrap ul.compact {
+	margin-bottom: 0
 }

-.about-wrap .wp-person {
+.about-wrap li.wp-person {
 	display: inline-block;
 	vertical-align: top;
 	margin-right: 10px;
@@ -392,38 +316,35 @@
 	width: 280px;
 }

-.about-wrap .compact .wp-person {
+.about-wrap ul.compact li.wp-person {
 	height: auto;
 	width: 180px;
 	padding-bottom: 0;
 	margin-bottom: 0;
 }

-.about-wrap .wp-person .gravatar {
+.about-wrap li.wp-person img.gravatar {
 	float: left;
 	margin: 0 10px 10px 0;
-	padding: 1px;
+	padding: 2px;
 	width: 60px;
 	height: 60px;
 }

-.about-wrap .compact .wp-person .gravatar {
+.about-wrap ul.compact li.wp-person img.gravatar {
 	width: 30px;
 	height: 30px;
 }

-.about-wrap .wp-person .web {
+.about-wrap li.wp-person a.web {
+	display: block;
 	margin: 6px 0 2px;
 	font-size: 16px;
-	font-weight: 400;
-	line-height: 2;
+	font-weight: normal;
+	line-height: 1.6em;
 	text-decoration: none;
 }

-.about-wrap .wp-person .title {
-	display: block;
-}
-
 .about-wrap #wp-people-group-validators + p.wp-credits-list {
 	margin-top: 0;
 }
@@ -440,95 +361,49 @@

 .freedoms-php .about-wrap ol li {
 	list-style-type: decimal;
-	font-weight: 600;
+	font-weight: bold;
 }

 .freedoms-php .about-wrap ol p {
-	font-weight: 400;
+	font-weight: normal;
 	margin: 0.6em 0;
 }

-.freedoms-php .has-4-columns {
-	margin-bottom: 40px;
-}
-
-.freedoms-php .column .freedoms-image {
-	background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png');
-	background-size: 100%;
-	padding-top: 100%;
-}
-
-.freedoms-php .column:nth-of-type(2) .freedoms-image {
-	background-position: 0 34%;
-}
-
-.freedoms-php .column:nth-of-type(3) .freedoms-image {
-	background-position: 0 66%;
-}
-
-.freedoms-php .column:nth-of-type(4) .freedoms-image {
-	background-position: 0 100%;
-}
-
 /*------------------------------------------------------------------------------
  4.0 - Media Queries
 ------------------------------------------------------------------------------*/

-@media screen and (max-width: 782px) {
-	.about-wrap .has-3-columns,
-	.about-wrap .has-4-columns {
-		-ms-grid-columns: 1fr 1fr;
-		grid-template-columns: 1fr 1fr;
+@media screen and ( max-width: 782px ) {
+	.about-wrap .feature-section {
+		padding: 0;
+		border-bottom: none;
 	}

-	.about-wrap .has-3-columns .column:nth-of-type(3n+1),
-	.about-wrap .has-4-columns .column:nth-of-type(4n+1) {
-		-ms-grid-column: 1;
-		grid-column-start: 1;
-		-ms-grid-row: 1;
-		grid-row-start: 1;
+	.about-wrap [class$=col] .col {
+		float: none;
+		width: 100%;
+		margin: 40px 0 0;
+		padding: 0 0 40px;
+		border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 	}

-	.about-wrap .has-3-columns .column:nth-of-type(3n+2),
-	.about-wrap .has-4-columns .column:nth-of-type(4n+2) {
-		-ms-grid-column: 2;
-		grid-column-start: 2;
-		-ms-grid-row: 1;
-		grid-row-start: 1;
-	}
-
-	.about-wrap .has-3-columns .column:nth-of-type(3n),
-	.about-wrap .has-4-columns .column:nth-of-type(4n+3) {
-		-ms-grid-column: 1;
-		grid-column-start: 1;
-		-ms-grid-row: 2;
-		grid-row-start: 2;
-	}
-
-	.about-wrap .has-4-columns .column:nth-of-type(4n) {
-		-ms-grid-column: 2;
-		grid-column-start: 2;
-		-ms-grid-row: 2;
-		grid-row-start: 2;
-	}
-}
-
-@media screen and (max-width: 600px) {
-	.about-wrap .has-2-columns,
-	.about-wrap .has-3-columns,
-	.about-wrap .has-4-columns {
+	.about-wrap .three-col img {
 		display: block;
+		margin: 0 auto;
 	}

-	.about-wrap :not(.is-wider-right):not(.is-wider-left) .column {
-		margin-right: 0;
-		margin-left: 0;
+	.about-wrap .feature-list .col {
+		margin: 0;
+		padding: 0;
+		border-bottom: none;
 	}

-	.about-wrap .has-2-columns.is-wider-right,
-	.about-wrap .has-2-columns.is-wider-left {
-		display: -ms-grid;
-		display: grid;
+	.about-wrap .headline-feature .feature-section {
+		max-width: 100%;
+	}
+
+	.about-wrap .feature-list .feature-section {
+		padding: 0 0 40px;
 	}
 }

@@ -552,21 +427,38 @@
 		margin-bottom: 1.5em;
 		width: 100%;
 	}
-}

-@media only screen and (max-width: 480px) {
-	.about-wrap .has-2-columns.is-wider-right,
-	.about-wrap .has-2-columns.is-wider-left {
-		display: block;
+	.about-wrap h2.nav-tab-wrapper {
+		padding-left: 0;
+		border-bottom: 0;
 	}

-	.about-wrap .column {
-		margin-right: 0;
-		margin-left: 0;
+	.about-wrap h2 .nav-tab {
+		margin-top: 10px;
+		margin-right: 10px;
+		border-bottom: 1px solid #ccc;
 	}

-	.about-wrap .has-2-columns.is-wider-right img,
-	.about-wrap .has-2-columns.is-wider-left img {
-		max-width: 160px;
+	.about-wrap .feature-section .svg-container {
+		padding-top: 20px;
+		padding-bottom: 20px;
+	}
+
+	.about-wrap .three-col .col,
+	.about-wrap .headline-feature .feature-section .col {
+		width: 100% !important;
+		float: none !important;
+	}
+}
+
+@media only screen and (max-width: 400px) {
+	.about-wrap .feature-list svg {
+		margin-top: 15px;
+		height: 65px;
+		width: 65px;
+	}
+	.about-wrap .feature-list.finer-points h4,
+	.about-wrap .feature-list.finer-points p {
+		margin-left: 80px;
 	}
 }
--- 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
@@ -38,8 +38,8 @@
 /* New Menu icons */

 .icon16:before {
-	color: #82878c; /* same as new icons */
-	font: normal 20px/1 dashicons;
+	color: #999;
+	font: normal 20px/1 'dashicons';
 	speak: none;
 	padding: 6px 0;
 	height: 34px;
@@ -47,60 +47,61 @@
 	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;
 }

 .icon16.icon-dashboard:before {
-	content: "\f226";
+	content: '\f226';
 }

 .icon16.icon-post:before {
-	content: "\f109";
+	content: '\f109';
 }

 .icon16.icon-media:before {
-	content: "\f104";
+	content: '\f104';
 }

 .icon16.icon-links:before {
-	content: "\f103";
+	content: '\f103';
 }

 .icon16.icon-page:before {
-	content: "\f105";
+	content: '\f105';
 }

 .icon16.icon-comments:before {
-	content: "\f101";
+	content: '\f101';
 	margin-top: 1px;
 }

 .icon16.icon-appearance:before {
-	content: "\f100";
+	content: '\f100';
 }

 .icon16.icon-plugins:before {
-	content: "\f106";
+	content: '\f106';
 }

 .icon16.icon-users:before {
-	content: "\f110";
+	content: '\f110';
 }

 .icon16.icon-tools:before {
-	content: "\f107";
+	content: '\f107';
 }

 .icon16.icon-settings:before {
-	content: "\f108";
+	content: '\f108';
 }

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

 .icon16.icon-generic:before {
-	content: "\f111";
+	content: '\f111';
 }

 /* hide background-image for icons above */
@@ -159,14 +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);
+	color: rgba(240,245,250,0.7);
 }

 #adminmenu .wp-submenu a:hover,
@@ -202,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,
@@ -225,6 +227,7 @@
 	bottom: auto;
 	border: 0 none;
 	margin-top: 0;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	background-color: #32373c;
 }
@@ -261,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;
 }
@@ -280,9 +283,9 @@

 #adminmenu .wp-submenu a {
 	font-size: 13px;
-	line-height: 1.4;
+	line-height: 1.2;
 	margin: 0;
-	padding: 5px 0;
+	padding: 6px 0;
 }

 #adminmenu .wp-submenu li.current,
@@ -298,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;
 }

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

 #adminmenu .wp-menu-image img {
@@ -354,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,
@@ -510,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;
 }

@@ -539,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 {
-	content: "\f148";
+#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;
-	font: normal 20px/1 dashicons !important;
+	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
 */
@@ -649,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;
 	}
@@ -728,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;
@@ -818,6 +829,7 @@ li#wp-admin-bar-menu-toggle {
 		display: block;
 		top: 0;
 		right: -1px;
+		-webkit-box-shadow: none;
 		box-shadow: none;
 	}

@@ -859,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;
 	}

@@ -887,10 +901,10 @@ li#wp-admin-bar-menu-toggle {
 	}

 	#wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before {
-		content: "\f228";
+		content: '\f228';
 		display: inline-block;
 		float: right;
-		font: normal 40px/45px dashicons;
+		font: normal 40px/45px 'Dashicons';
 		vertical-align: middle;
 		outline: none;
 		margin: 0;
@@ -902,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
@@ -38,8 +38,8 @@
 /* New Menu icons */

 .icon16:before {
-	color: #82878c; /* same as new icons */
-	font: normal 20px/1 dashicons;
+	color: #999;
+	font: normal 20px/1 'dashicons';
 	speak: none;
 	padding: 6px 0;
 	height: 34px;
@@ -47,60 +47,61 @@
 	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;
 }

 .icon16.icon-dashboard:before {
-	content: "\f226";
+	content: '\f226';
 }

 .icon16.icon-post:before {
-	content: "\f109";
+	content: '\f109';
 }

 .icon16.icon-media:before {
-	content: "\f104";
+	content: '\f104';
 }

 .icon16.icon-links:before {
-	content: "\f103";
+	content: '\f103';
 }

 .icon16.icon-page:before {
-	content: "\f105";
+	content: '\f105';
 }

 .icon16.icon-comments:before {
-	content: "\f101";
+	content: '\f101';
 	margin-top: 1px;
 }

 .icon16.icon-appearance:before {
-	content: "\f100";
+	content: '\f100';
 }

 .icon16.icon-plugins:before {
-	content: "\f106";
+	content: '\f106';
 }

 .icon16.icon-users:before {
-	content: "\f110";
+	content: '\f110';
 }

 .icon16.icon-tools:before {
-	content: "\f107";
+	content: '\f107';
 }

 .icon16.icon-settings:before {
-	content: "\f108";
+	content: '\f108';
 }

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

 .icon16.icon-generic:before {
-	content: "\f111";
+	content: '\f111';
 }

 /* hide background-image for icons above */
@@ -159,14 +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);
+	color: rgba(240,245,250,0.7);
 }

 #adminmenu .wp-submenu a:hover,
@@ -202,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,
@@ -225,6 +227,7 @@
 	bottom: auto;
 	border: 0 none;
 	margin-top: 0;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	background-color: #32373c;
 }
@@ -261,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;
 }
@@ -280,9 +283,9 @@

 #adminmenu .wp-submenu a {
 	font-size: 13px;
-	line-height: 1.4;
+	line-height: 1.2;
 	margin: 0;
-	padding: 5px 0;
+	padding: 6px 0;
 }

 #adminmenu .wp-submenu li.current,
@@ -298,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;
 }

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

 #adminmenu .wp-menu-image img {
@@ -354,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,
@@ -510,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;
 }

@@ -539,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 {
-	content: "\f148";
+#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;
-	font: normal 20px/1 dashicons !important;
+	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
 */
@@ -649,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;
 	}
@@ -728,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;
@@ -818,6 +829,7 @@ li#wp-admin-bar-menu-toggle {
 		display: block;
 		top: 0;
 		left: -1px;
+		-webkit-box-shadow: none;
 		box-shadow: none;
 	}

@@ -859,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;
 	}

@@ -887,10 +901,10 @@ li#wp-admin-bar-menu-toggle {
 	}

 	#wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before {
-		content: "\f228";
+		content: '\f228';
 		display: inline-block;
 		float: left;
-		font: normal 40px/45px dashicons;
+		font: normal 40px/45px 'Dashicons';
 		vertical-align: middle;
 		outline: none;
 		margin: 0;
@@ -902,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,50 @@
-/* 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 {
-	height: 24px;
+.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 rgba(0,0,0,.08);
+	box-shadow: 0 1px 0 rgba(0,0,0,.08);
 }

-.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;
+	font-size: 11px;
+	line-height: 22px;
 	padding: 0 6px;
+	position: relative;
+	left: 0;
 	text-align: center;
+	top: 0;
+	-webkit-box-shadow: inset 0 1px 0 #fff;
+	box-shadow: inset 0 1px 0 #fff;
 }

 .wp-color-result:hover,
@@ -41,18 +61,26 @@
 	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 0 1px #5b9dd9,
+		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
 }

 .wp-picker-open + .wp-picker-input-wrap {
@@ -60,18 +88,7 @@
 	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-customizer .wp-picker-input-wrap .button {
+.wp-picker-container .button {
 	margin-right: 6px;
 }

@@ -80,8 +97,9 @@
 }

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

@@ -89,22 +107,17 @@
 	width: 65px;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 1.4;
+	text-align: center;
+	line-height: 16px;
 	margin: 0;
-	vertical-align: top;
 }

-.wp-color-picker::-webkit-input-placeholder {
-	color: #72777c;
+.wp-picker-container input[type="text"].wp-color-picker:focus::-webkit-input-placeholder {
+	color: transparent;
 }

-.wp-color-picker::-moz-placeholder {
-	color: #72777c;
-	opacity: 1;
-}
-
-.wp-color-picker:-ms-input-placeholder {
-	color: #72777c;
+.wp-picker-container input[type="text"].wp-color-picker:-moz-placeholder {
+	color: #999;
 }

 .wp-picker-container input[type="text"].iris-error {
@@ -112,63 +125,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: 80px;
-		padding: 6px 5px 5px;
-		font-size: 16px;
-		line-height: 1.15;
-	}
-
-	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
-		padding: 5px 5px 4px;
-	}
-
-	.wp-picker-container .wp-color-result.button {
-		height: auto;
-		padding: 0 40px 0 0;
-		font-size: 14px;
-		line-height: 2.1;
-	}
-
-	.wp-customizer .wp-picker-container .wp-color-result.button {
-		font-size: 13px;
-		line-height: 2;
-	}
-
-	.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;
-	}
-}
-
-@media screen and (max-width: 640px) {
-	.wp-customizer .wp-picker-container .wp-color-result.button {
-		font-size: 14px;
-		line-height: 2.1;
-	}
-
-	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
-		padding: 6px 5px;
-	}
-}
--- 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{height:24px;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;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-input-wrap .button{margin-right:6px}.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:65px;font-size:12px;font-family:monospace;line-height:1.4;margin:0;vertical-align:top}.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:80px;padding:6px 5px 5px;font-size:16px;line-height:1.15}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:5px 5px 4px}.wp-picker-container .wp-color-result.button{height:auto;padding:0 40px 0 0;font-size:14px;line-height:2.1}.wp-customizer .wp-picker-container .wp-color-result.button{font-size:13px;line-height:2}.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}}@media screen and (max-width:640px){.wp-customizer .wp-picker-container .wp-color-result.button{font-size:14px;line-height:2.1}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:6px 5px}}
+.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 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08);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;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.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{-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,.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:#dfdfdf;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;text-align:center;line-height:16px;margin:0}.wp-picker-container input[type=text].wp-color-picker:focus::-webkit-input-placeholder{color:transparent}.wp-picker-container input[type=text].wp-color-picker:-moz-placeholder{color:#999}.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,50 @@
-/* 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 {
-	height: 24px;
+.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 rgba(0,0,0,.08);
+	box-shadow: 0 1px 0 rgba(0,0,0,.08);
 }

-.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;
+	font-size: 11px;
+	line-height: 22px;
 	padding: 0 6px;
+	position: relative;
+	right: 0;
 	text-align: center;
+	top: 0;
+	-webkit-box-shadow: inset 0 1px 0 #fff;
+	box-shadow: inset 0 1px 0 #fff;
 }

 .wp-color-result:hover,
@@ -41,18 +61,26 @@
 	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 0 1px #5b9dd9,
+		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
 }

 .wp-picker-open + .wp-picker-input-wrap {
@@ -60,18 +88,7 @@
 	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-customizer .wp-picker-input-wrap .button {
+.wp-picker-container .button {
 	margin-left: 6px;
 }

@@ -80,8 +97,9 @@
 }

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

@@ -89,22 +107,17 @@
 	width: 65px;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 1.4;
+	text-align: center;
+	line-height: 16px;
 	margin: 0;
-	vertical-align: top;
 }

-.wp-color-picker::-webkit-input-placeholder {
-	color: #72777c;
+.wp-picker-container input[type="text"].wp-color-picker:focus::-webkit-input-placeholder {
+	color: transparent;
 }

-.wp-color-picker::-moz-placeholder {
-	color: #72777c;
-	opacity: 1;
-}
-
-.wp-color-picker:-ms-input-placeholder {
-	color: #72777c;
+.wp-picker-container input[type="text"].wp-color-picker:-moz-placeholder {
+	color: #999;
 }

 .wp-picker-container input[type="text"].iris-error {
@@ -112,63 +125,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: 80px;
-		padding: 6px 5px 5px;
-		font-size: 16px;
-		line-height: 1.15;
-	}
-
-	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
-		padding: 5px 5px 4px;
-	}
-
-	.wp-picker-container .wp-color-result.button {
-		height: auto;
-		padding: 0 0 0 40px;
-		font-size: 14px;
-		line-height: 2.1;
-	}
-
-	.wp-customizer .wp-picker-container .wp-color-result.button {
-		font-size: 13px;
-		line-height: 2;
-	}
-
-	.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;
-	}
-}
-
-@media screen and (max-width: 640px) {
-	.wp-customizer .wp-picker-container .wp-color-result.button {
-		font-size: 14px;
-		line-height: 2.1;
-	}
-
-	.wp-customizer .wp-picker-container input[type="text"].wp-color-picker {
-		padding: 6px 5px;
-	}
-}
--- 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{height:24px;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;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-input-wrap .button{margin-left:6px}.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:65px;font-size:12px;font-family:monospace;line-height:1.4;margin:0;vertical-align:top}.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:80px;padding:6px 5px 5px;font-size:16px;line-height:1.15}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:5px 5px 4px}.wp-picker-container .wp-color-result.button{height:auto;padding:0 0 0 40px;font-size:14px;line-height:2.1}.wp-customizer .wp-picker-container .wp-color-result.button{font-size:13px;line-height:2}.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}}@media screen and (max-width:640px){.wp-customizer .wp-picker-container .wp-color-result.button{font-size:14px;line-height:2.1}.wp-customizer .wp-picker-container input[type=text].wp-color-picker{padding:6px 5px}}
+.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 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08);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;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.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{-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,.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:#dfdfdf;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;text-align:center;line-height:16px;margin:0}.wp-picker-container input[type=text].wp-color-picker:focus::-webkit-input-placeholder{color:transparent}.wp-picker-container input[type=text].wp-color-picker:-moz-placeholder{color:#999}.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
@@ -3,7 +3,7 @@
@import 'mixins';


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

@@ -84,7 +84,9 @@ input[type=radio]:checked:before {
 /* 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;
 }
@@ -130,7 +132,7 @@ input[type=radio]:checked:before {

 /* 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;
@@ -225,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 {
@@ -305,7 +315,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -314,7 +323,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,
@@ -323,8 +331,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -348,25 +354,11 @@ ul#adminmenu > li.current > a.current:after {
 	background: $adminbar-input-background;
 }

-/* Admin Bar: recovery mode */
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { color: $menu-text; opacity: 0.7; }
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { color: $menu-text; opacity: 0.7; }
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { color: $menu-text; opacity: 0.7; }
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { color: $menu-text; opacity: 0.7; }

-#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 */

@@ -426,7 +418,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;
 }


@@ -480,6 +477,23 @@ 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;
+}
+
+/* jQuery UI Slider */
+
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+	background: $button-color;
+	border-color: darken( $button-color, 10% );
+	box-shadow: inset 0 1px 0 lighten( $button-color, 15% ), 0 1px 0 rgba(0,0,0,.15);
+}
+
 /* Responsive Component */

 div#wp-responsive-toggle a:before {
--- a/wp-admin/css/colors/_mixins.scss
+++ b/wp-admin/css/colors/_mixins.scss
@@ -2,36 +2,33 @@
 * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-@mixin button( $button-color, $text-color: #fff ) {
+@mixin button( $button-color, $text-color: white ) {
 	background: $button-color;
-	border-color: darken( $button-color, 10% ) darken( $button-color, 15% ) darken( $button-color, 15% );
+	border-color: darken( $button-color, 10% );
 	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% );
+	box-shadow: inset 0 1px 0 lighten( $button-color, 15% ), 0 1px 0 rgba(0,0,0,.15);

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

 	&:focus {
-		box-shadow: inset 0 1px 0 darken( $button-color, 10% ),
-					0 0 2px 1px #33b3db;
+		box-shadow: inset 0 1px 0 lighten( $button-color, 10% ),
+		            0 0 0 1px #5b9dd9,
+		            0 0 2px 1px rgba( 30, 140, 190, .8 );
 	}

-	&:active,
-	&.active,
-	&.active:focus,
-	&.active:hover {
+	&:active {
 		background: darken( $button-color, 10% );
 		border-color: darken( $button-color, 15% );
-	 	box-shadow: inset 0 2px 0 darken( $button-color, 15% );
+		color: $text-color;
+	 	box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ),
+		            0 0 0 1px #5b9dd9,
+		            0 0 2px 1px rgba( 30, 140, 190, .8 );
 	}

 	&[disabled],
@@ -43,12 +40,4 @@
 		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
@@ -55,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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #e1a948;
-  border-color: #d39323 #bd831f #bd831f;
-  color: #fff;
-  box-shadow: 0 1px 0 #bd831f;
-  text-shadow: 0 -1px 1px #bd831f, -1px 0 1px #bd831f, 0 1px 1px #bd831f, 1px 0 1px #bd831f;
+  border-color: #d39323;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #e3af55;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #dd9f32;
  border-color: #bd831f;
-  color: #fff;
-  box-shadow: 0 1px 0 #bd831f;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e8be74;
+  box-shadow: inset 0 1px 0 #e8be74;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #e8be74, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #e8be74, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #d39323;
  border-color: #bd831f;
-  box-shadow: inset 0 2px 0 #bd831f;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #bd831f !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #bd831f !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #bd831f !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #52accc;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #52accc;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #e2ecf1;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #fff;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #fff;
 }

@@ -252,12 +254,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;
 }

@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #6eb9d4;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #e1a948;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #cb9841;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #096484;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #e1a948;
+  border-color: #d39323;
+  -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #e5f8ff;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #e1a948;
-  border-color: #d39323 #bd831f #bd831f;
-  color: #fff;
-  box-shadow: 0 1px 0 #bd831f;
-  text-shadow: 0 -1px 1px #bd831f, 1px 0 1px #bd831f, 0 1px 1px #bd831f, -1px 0 1px #bd831f;
+  border-color: #d39323;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #e3af55;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #dd9f32;
  border-color: #bd831f;
-  color: #fff;
-  box-shadow: 0 1px 0 #bd831f;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e8be74;
+  box-shadow: inset 0 1px 0 #e8be74;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #e8be74, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #e8be74, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #d39323;
  border-color: #bd831f;
-  box-shadow: inset 0 2px 0 #bd831f;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #bd831f !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #bd831f !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #bd831f !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #52accc;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #52accc;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #e2ecf1;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #fff;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #fff;
 }

@@ -252,12 +254,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;
 }

@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #6eb9d4;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #e1a948;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #cb9841;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #096484;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #e1a948;
+  border-color: #d39323;
+  -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #e5f8ff;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #c7a589;
-  border-color: #b78b66 #ae7d55 #ae7d55;
-  color: #fff;
-  box-shadow: 0 1px 0 #ae7d55;
-  text-shadow: 0 -1px 1px #ae7d55, -1px 0 1px #ae7d55, 0 1px 1px #ae7d55, 1px 0 1px #ae7d55;
+  border-color: #b78b66;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #ccad93;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #bf9878;
  border-color: #ae7d55;
-  color: #fff;
-  box-shadow: 0 1px 0 #ae7d55;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #d7bfac;
+  box-shadow: inset 0 1px 0 #d7bfac;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #d7bfac, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #d7bfac, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #b78b66;
  border-color: #ae7d55;
-  box-shadow: inset 0 2px 0 #ae7d55;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #ae7d55 !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #ae7d55 !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #ae7d55 !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #59524c;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #59524c;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #cdcbc9;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #c7a589;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #c7a589;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #6c645c;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #9ea476;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #8e946a;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #c7a589;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #c7a589;
+  border-color: #b78b66;
+  -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f2f1;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #c7a589;
-  border-color: #b78b66 #ae7d55 #ae7d55;
-  color: #fff;
-  box-shadow: 0 1px 0 #ae7d55;
-  text-shadow: 0 -1px 1px #ae7d55, 1px 0 1px #ae7d55, 0 1px 1px #ae7d55, -1px 0 1px #ae7d55;
+  border-color: #b78b66;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #ccad93;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #bf9878;
  border-color: #ae7d55;
-  color: #fff;
-  box-shadow: 0 1px 0 #ae7d55;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #d7bfac;
+  box-shadow: inset 0 1px 0 #d7bfac;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #d7bfac, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #d7bfac, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #b78b66;
  border-color: #ae7d55;
-  box-shadow: inset 0 2px 0 #ae7d55;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #ae7d55 !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #ae7d55 !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #ae7d55 !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #59524c;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #59524c;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #cdcbc9;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #c7a589;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #c7a589;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #6c645c;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #9ea476;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #8e946a;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #c7a589;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #c7a589;
+  border-color: #b78b66;
+  -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f2f1;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #a3b745;
-  border-color: #829237 #727f30 #727f30;
-  color: #fff;
-  box-shadow: 0 1px 0 #727f30;
-  text-shadow: 0 -1px 1px #727f30, -1px 0 1px #727f30, 0 1px 1px #727f30, 1px 0 1px #727f30;
+  border-color: #829237;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #a9bd4f;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #93a43e;
  border-color: #727f30;
-  color: #fff;
-  box-shadow: 0 1px 0 #727f30;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #b6c669;
+  box-shadow: inset 0 1px 0 #b6c669;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #b6c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #b6c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #829237;
  border-color: #727f30;
-  box-shadow: inset 0 2px 0 #727f30;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #727f30 !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #727f30 !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #727f30 !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #523f6d;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #523f6d;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #cbc5d3;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #a3b745;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #a3b745;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #634c84;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #d46f15;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #bf6413;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #a3b745;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #a3b745;
+  border-color: #829237;
+  -webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #ece6f6;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #a3b745;
-  border-color: #829237 #727f30 #727f30;
-  color: #fff;
-  box-shadow: 0 1px 0 #727f30;
-  text-shadow: 0 -1px 1px #727f30, 1px 0 1px #727f30, 0 1px 1px #727f30, -1px 0 1px #727f30;
+  border-color: #829237;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #a9bd4f;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #93a43e;
  border-color: #727f30;
-  color: #fff;
-  box-shadow: 0 1px 0 #727f30;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #b6c669;
+  box-shadow: inset 0 1px 0 #b6c669;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #b6c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #b6c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #829237;
  border-color: #727f30;
-  box-shadow: inset 0 2px 0 #727f30;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #727f30 !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #727f30 !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #727f30 !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #523f6d;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #523f6d;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #cbc5d3;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #a3b745;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #a3b745;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #634c84;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #d46f15;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #bf6413;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #a3b745;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #a3b745;
+  border-color: #829237;
+  -webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #ece6f6;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f5f5f5;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #04a4cc;
-  border-color: #037c9a #036881 #036881;
-  color: #fff;
-  box-shadow: 0 1px 0 #036881;
-  text-shadow: 0 -1px 1px #036881, -1px 0 1px #036881, 0 1px 1px #036881, 1px 0 1px #036881;
+  border-color: #037c9a;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #04b0db;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #0490b3;
  border-color: #036881;
-  color: #fff;
-  box-shadow: 0 1px 0 #036881;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #09cafa;
+  box-shadow: inset 0 1px 0 #09cafa;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #09cafa, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #09cafa, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #037c9a;
  border-color: #036881;
-  box-shadow: inset 0 2px 0 #036881;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #036881 !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #036881 !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #036881 !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #333;
  background-color: #e5e5e5;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #333;
  background-color: #e5e5e5;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #686868;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #04a4cc;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #333;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #04a4cc;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ 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 #adminbarsearch .adminbar-input::-webkit-input-placeholder {
+  color: #333;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
+  color: #333;
+  opacity: 0.7;
 }

-#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;
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
+  color: #333;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #333;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #888;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #04a4cc;
+  border-color: #037c9a;
+  -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #999;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f5f5f5;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #04a4cc;
-  border-color: #037c9a #036881 #036881;
-  color: #fff;
-  box-shadow: 0 1px 0 #036881;
-  text-shadow: 0 -1px 1px #036881, 1px 0 1px #036881, 0 1px 1px #036881, -1px 0 1px #036881;
+  border-color: #037c9a;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #04b0db;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #0490b3;
  border-color: #036881;
-  color: #fff;
-  box-shadow: 0 1px 0 #036881;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #09cafa;
+  box-shadow: inset 0 1px 0 #09cafa;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #09cafa, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #09cafa, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #037c9a;
  border-color: #036881;
-  box-shadow: inset 0 2px 0 #036881;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #036881 !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #036881 !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #036881 !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #333;
  background-color: #e5e5e5;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #333;
  background-color: #e5e5e5;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #686868;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #04a4cc;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #333;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #04a4cc;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ 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 #adminbarsearch .adminbar-input::-webkit-input-placeholder {
+  color: #333;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
+  color: #333;
+  opacity: 0.7;
 }

-#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;
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
+  color: #333;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #333;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #888;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #04a4cc;
+  border-color: #037c9a;
+  -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #999;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #e14d43;
-  border-color: #d02c21 #ba281e #ba281e;
-  color: #fff;
-  box-shadow: 0 1px 0 #ba281e;
-  text-shadow: 0 -1px 1px #ba281e, -1px 0 1px #ba281e, 0 1px 1px #ba281e, 1px 0 1px #ba281e;
+  border-color: #d02c21;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #e35950;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #dd382d;
  border-color: #ba281e;
-  color: #fff;
-  box-shadow: 0 1px 0 #ba281e;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e8776f;
+  box-shadow: inset 0 1px 0 #e8776f;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #e8776f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #e8776f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #d02c21;
  border-color: #ba281e;
-  box-shadow: inset 0 2px 0 #ba281e;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #ba281e !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #ba281e !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #ba281e !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #363b3f;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #363b3f;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #c3c4c5;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #e14d43;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #e14d43;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #464d52;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #69a8bb;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #5f97a8;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #e14d43;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #e14d43;
+  border-color: #d02c21;
+  -webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f1f2f3;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #e14d43;
-  border-color: #d02c21 #ba281e #ba281e;
-  color: #fff;
-  box-shadow: 0 1px 0 #ba281e;
-  text-shadow: 0 -1px 1px #ba281e, 1px 0 1px #ba281e, 0 1px 1px #ba281e, -1px 0 1px #ba281e;
+  border-color: #d02c21;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #e35950;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #dd382d;
  border-color: #ba281e;
-  color: #fff;
-  box-shadow: 0 1px 0 #ba281e;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e8776f;
+  box-shadow: inset 0 1px 0 #e8776f;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #e8776f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #e8776f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #d02c21;
  border-color: #ba281e;
-  box-shadow: inset 0 2px 0 #ba281e;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #ba281e !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #ba281e !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #ba281e !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #363b3f;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #363b3f;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #c3c4c5;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #e14d43;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #e14d43;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #464d52;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #69a8bb;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #5f97a8;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #e14d43;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #e14d43;
+  border-color: #d02c21;
+  -webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f1f2f3;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #9ebaa0;
-  border-color: #80a583 #719a74 #719a74;
-  color: #fff;
-  box-shadow: 0 1px 0 #719a74;
-  text-shadow: 0 -1px 1px #719a74, -1px 0 1px #719a74, 0 1px 1px #719a74, 1px 0 1px #719a74;
+  border-color: #80a583;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #a7c0a9;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #8faf91;
  border-color: #719a74;
-  color: #fff;
-  box-shadow: 0 1px 0 #719a74;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #bccfbd;
+  box-shadow: inset 0 1px 0 #bccfbd;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #bccfbd, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #bccfbd, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #80a583;
  border-color: #719a74;
-  box-shadow: inset 0 2px 0 #719a74;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #719a74 !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #719a74 !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #719a74 !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #738e96;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #738e96;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #d5dde0;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #9ebaa0;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #9ebaa0;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #879ea5;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #aa9d88;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #998d7a;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #9ebaa0;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #9ebaa0;
+  border-color: #80a583;
+  -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f2fcff;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #9ebaa0;
-  border-color: #80a583 #719a74 #719a74;
-  color: #fff;
-  box-shadow: 0 1px 0 #719a74;
-  text-shadow: 0 -1px 1px #719a74, 1px 0 1px #719a74, 0 1px 1px #719a74, -1px 0 1px #719a74;
+  border-color: #80a583;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #a7c0a9;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #8faf91;
  border-color: #719a74;
-  color: #fff;
-  box-shadow: 0 1px 0 #719a74;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #bccfbd;
+  box-shadow: inset 0 1px 0 #bccfbd;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #bccfbd, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #bccfbd, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #80a583;
  border-color: #719a74;
-  box-shadow: inset 0 2px 0 #719a74;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #719a74 !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #719a74 !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #719a74 !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #738e96;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #738e96;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #d5dde0;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #9ebaa0;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #9ebaa0;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #879ea5;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #aa9d88;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #998d7a;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #9ebaa0;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #9ebaa0;
+  border-color: #80a583;
+  -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f2fcff;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #dd823b;
-  border-color: #c36922 #ad5d1e #ad5d1e;
-  color: #fff;
-  box-shadow: 0 1px 0 #ad5d1e;
-  text-shadow: 0 -1px 1px #ad5d1e, -1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, 1px 0 1px #ad5d1e;
+  border-color: #c36922;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #df8a48;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #d97426;
  border-color: #ad5d1e;
-  color: #fff;
-  box-shadow: 0 1px 0 #ad5d1e;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e59e66;
+  box-shadow: inset 0 1px 0 #e59e66;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #e59e66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #e59e66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #c36922;
  border-color: #ad5d1e;
-  box-shadow: inset 0 2px 0 #ad5d1e;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #ad5d1e !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #ad5d1e !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #ad5d1e !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #cf4944;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #cf4944;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #f1c8c7;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #f7e3d3;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #f7e3d3;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #d66560;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #ccaf0b;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #b89e0a;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #dd823b;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #dd823b;
+  border-color: #c36922;
+  -webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f1f1;
--- 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 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

@@ -12,7 +11,9 @@ a {
  color: #0073aa;
 }

-a:hover, a:active, a:focus {
+a:hover,
+a:active,
+a:focus {
  color: #0096dd;
 }

@@ -40,44 +41,44 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #dd823b;
-  border-color: #c36922 #ad5d1e #ad5d1e;
-  color: #fff;
-  box-shadow: 0 1px 0 #ad5d1e;
-  text-shadow: 0 -1px 1px #ad5d1e, 1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, -1px 0 1px #ad5d1e;
+  border-color: #c36922;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
 }

-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #df8a48;
+.wp-core-ui .button-primary:hover,
+.wp-core-ui .button-primary:focus {
+  background: #d97426;
  border-color: #ad5d1e;
-  color: #fff;
-  box-shadow: 0 1px 0 #ad5d1e;
+  color: white;
+  -webkit-box-shadow: inset 0 1px 0 #e59e66;
+  box-shadow: inset 0 1px 0 #e59e66;
 }

 .wp-core-ui .button-primary:focus {
-  box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
+  -webkit-box-shadow: inset 0 1px 0 #e59e66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 1px 0 #e59e66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.wp-core-ui .button-primary:active, .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
+.wp-core-ui .button-primary:active {
  background: #c36922;
  border-color: #ad5d1e;
-  box-shadow: inset 0 2px 0 #ad5d1e;
+  color: white;
+  -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+  box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
 }

-.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 {
+.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: #ad5d1e !important;
  text-shadow: none !important;
 }

-.wp-core-ui .button-primary.button-hero {
-  box-shadow: 0 2px 0 #ad5d1e !important;
-}
-
-.wp-core-ui .button-primary.button-hero:active {
-  box-shadow: inset 0 3px 0 #ad5d1e !important;
-}
-
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #cf4944;
@@ -110,8 +111,9 @@ input[type=radio]:checked:before {
 }

 /* List tables */
-.wrap .add-new-h2:hover,
-.wrap .page-title-action:hover {
+.wrap .add-new-h2:hover, .wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
  color: #fff;
  background-color: #cf4944;
 }
@@ -153,7 +155,7 @@ input[type=radio]:checked:before {
 }

 /* 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;
@@ -185,15 +187,15 @@ input[type=radio]:checked:before {
  color: #f1c8c7;
 }

-#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#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,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
  color: #f7e3d3;
 }

@@ -204,11 +206,11 @@ input[type=radio]:checked:before {
  color: #fff;
 }

-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#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,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
  color: #f7e3d3;
 }

@@ -252,13 +254,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 */
@@ -329,7 +338,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks .menupop ul li a:focus,
 #wpadminbar .quicklinks .menupop ul li a:hover strong,
 #wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
 #wpadminbar .quicklinks .menupop.hover ul li a:hover,
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
@@ -338,7 +346,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,
@@ -347,8 +354,6 @@ ul#adminmenu > li.current > a.current:after {
 }

 #wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
 #wpadminbar.mobile .quicklinks .ab-icon:before,
 #wpadminbar.mobile .quicklinks .ab-item:before {
@@ -370,23 +375,24 @@ ul#adminmenu > li.current > a.current:after {
  background: #d66560;
 }

-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
+#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
-  background-color: #ccaf0b;
+  opacity: 0.7;
 }

-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
  color: #fff;
+  opacity: 0.7;
 }

-#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 {
+#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder {
  color: #fff;
-  background-color: #b89e0a;
+  opacity: 0.7;
+}
+
+#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.7;
 }

 /* Admin Bar: my account */
@@ -431,16 +437,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 */
@@ -491,6 +500,22 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #dd823b;
+  color: #fff;
+}
+
+/* jQuery UI Slider */
+.wp-slider .ui-slider-handle,
+.wp-slider .ui-slider-handle.ui-state-hover,
+.wp-slider .ui-slider-handle.focus {
+  background: #dd823b;
+  border-color: #c36922;
+  -webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f1f1;
--- 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,
@@ -28,34 +12,17 @@

 #customize-controls .theme-location-set,
 #customize-controls .control-section .accordion-section-title:focus .menu-in-location,
-#customize-controls .control-section .accordion-section-title:hover .menu-in-location {
+#customize-controls .control-section .accordion-section-title:hover .menu-in-location,
+#customize-controls .control-section .accordion-section-title:focus .menu-in-locations,
+#customize-controls .control-section .accordion-section-title:hover .menu-in-locations {
 	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 +45,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;
@@ -120,16 +78,29 @@
 }

 .wp-customizer .menu-item .submitbox .submitdelete {
+	display: block;
 	float: right;
 	margin: 6px 0 0;
 	padding: 0;
 	cursor: pointer;
 }

+.wp-customizer .menu-item .submitbox .submitdelete:focus {
+	-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, .8);
+}

-/**
- * Menu items reordering styles
- */
+/* Menu-item reordering nav. */
+.customize-control-nav_menu .reordering .reorder,
+.customize-control-nav_menu .reorder-done {
+	display: none;
+}
+
+.customize-control-nav_menu .reorder,
+.customize-control-nav_menu .reordering .reorder-done {
+	display: inline-block;
+	padding: 5px 8px;
+}

 .menu-item-reorder-nav {
 	display: none;
@@ -139,12 +110,86 @@
 	left: 0;
 }

+.customize-control-nav_menu .reordering .add-new-menu-item {
+	opacity: 0.2;
+	pointer-events: none;
+	cursor: not-allowed;
+}
+
+.menu-item-reorder-nav button {
+	position: relative;
+	overflow: hidden;
+	float: right;
+	display: block;
+	width: 30px;
+	height: 40px;
+	color: #82878c;
+	text-indent: -9999px;
+	cursor: pointer;
+	background: transparent;
+	border: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	outline: none;
+}
+
+.menu-item-reorder-nav button:before {
+	display: inline-block;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	font: normal 20px/40px dashicons;
+	text-align: center;
+	text-indent: 0;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.menu-item-reorder-nav button:hover,
+.menu-item-reorder-nav button:focus {
+	color: #191e23;
+	background: #eee;
+}
+
+.menus-move-down:before {
+	content: '\f347';
+}
+
+.menus-move-up:before {
+	content: '\f343';
+}
+
 .menus-move-left:before {
-	content: "\f345";
+	content: '\f341';
 }

 .menus-move-right:before {
-	content: "\f341";
+	content: '\f345';
+}
+
+.move-up-disabled .menus-move-up,
+.move-down-disabled .menus-move-down,
+.move-right-disabled .menus-move-right,
+.move-left-disabled .menus-move-left {
+	color: #d5d5d5 !important;
+	background-color: #fff !important;
+	cursor: default;
+	pointer-events: none;
+}
+
+.menu-item-reorder-nav:before {
+	content: "";
+	display: block;
+	position: absolute;
+	right: -10px;
+	width: 10px;
+	height: 40px;
+	background: -webkit-linear-gradient(right, rgba(250,250,250,0) 0%,rgba(250,250,250,1) 100%);
+	background: -webkit-gradient(linear, right top, left top, from(rgba(250,250,250,0)), to(rgba(250,250,250,1)));
+	background: -webkit-linear-gradient(right, rgba(250,250,250,0) 0%, rgba(250,250,250,1) 100%);
+	background: linear-gradient(to left, rgba(250,250,250,0) 0%,rgba(250,250,250,1) 100%);
 }

 .reordering .menu-item .item-controls,
@@ -158,6 +203,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,15 +214,37 @@
 	width: 30px;
 	height: 38px;
 	margin-left: 0 !important;
-	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 {
-	content: "\f142";
+.customize-control-nav_menu_item .item-edit:focus {
+	color: #0073aa;
+	-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, .8);
+}
+
+/* rework the arrow indicator implementation for NVDA bug same as #32715 */
+.wp-customizer .menu-item .item-edit .toggle-indicator {
+	display: inline-block;
+	font-size: 20px;
+	line-height: 1;
+}
+
+.wp-customizer .menu-item .item-edit .toggle-indicator:after {
+	content: '\f140';
+	font: normal 20px/1 dashicons;
+	color: #a0a5aa;
+	vertical-align: top;
+	speak: none;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	text-decoration: none !important;
+}
+
+.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after {
+	content: '\f142';
 }

 .wp-customizer .menu-item-settings p.description {
@@ -201,31 +269,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 {
@@ -277,7 +327,7 @@
 	border: none;
 	content: "\f111";
 	display: block;
-	font: 18px/1 dashicons;
+	font: 18px/1 "dashicons";
 	padding: 5px;
 	text-align: center;
 	text-decoration: none !important;
@@ -289,6 +339,9 @@

 .customize-screen-options-toggle:focus:before,
 #customize-controls .customize-info .customize-help-toggle: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, .8);
+	-webkit-border-radius: 100%;
 	border-radius: 100%;
 }

@@ -296,7 +349,7 @@
 	display: none;
 	background: #fff;
 	border-top: 1px solid #ddd;
-	padding: 4px 15px 15px;
+	padding: 4px 15px 0;
 }

 .wp-customizer .metabox-prefs label {
@@ -305,44 +358,19 @@
 	line-height: 30px;
 }

-/* rework the arrow indicator implementation for NVDA bug same as #32715 */
-.wp-customizer .toggle-indicator {
-	display: inline-block;
-	font-size: 20px;
-	line-height: 1;
-}
-
-.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 {
-	content: "\f140";
-	display: block;
-	padding: 1px 0px 1px 2px;
-	speak: none;
-	border-radius: 50%;
-	color: #72777c;
-	font: normal 20px/1 dashicons;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	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-attr-title,
+#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-attr-title-active .field-attr-title,
+#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 +443,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,13 +465,17 @@
 	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;
 }

-/**
- * Add-menu-items mode
+/*
+ * Add-menu-items mode.
 */
+.wp-full-overlay-main {
+	left: auto; /* This overrides a right: 0; which causes the preview to resize rather than slide off screen at the normal size. */
+	width: 100%;
+}

 .adding-menu-items .control-section {
 	opacity: .4;
@@ -453,6 +486,52 @@
 	opacity: 1;
 }

+/* Add-new button. */
+#customize-theme-controls .add-new-menu-item {
+	cursor: pointer;
+	float: left;
+	margin-right: 10px;
+	-webkit-transition: all 0.2s;
+	transition: all 0.2s;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	outline: none;
+}
+
+.add-new-menu-item:before {
+	content: "\f132";
+	display: inline-block;
+	position: relative;
+	right: -2px;
+	top: -1px;
+	font: normal 20px/1 'dashicons';
+	vertical-align: middle;
+	-webkit-transition: all 0.2s;
+	transition: all 0.2s;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.adding-menu-items .add-new-menu-item,
+.adding-menu-items .add-new-menu-item:hover,
+.add-menu-toggle.open,
+.add-menu-toggle.open:hover {
+	background: #eee;
+	border-color: #929793;
+	color: #32373c;
+	-webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
+	box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
+}
+
+.adding-menu-items .add-new-menu-item:before,
+#accordion-section-add_menu .add-new-menu-item.open:before {
+	-webkit-transform: rotate(-45deg);
+	-ms-transform: rotate(-45deg);
+	transform: rotate(-45deg);
+}
+
 .menu-item-bar .item-delete {
 	color: #a00;
 	position: absolute;
@@ -466,13 +545,12 @@

 .menu-item-bar .item-delete:before {
 	content: "\f335";
-	position: absolute;
-	top: 9px;
-	right: 5px;
-	border-radius: 50%;
 	font: normal 20px/1 dashicons;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
+	position: absolute;
+	top: 9px;
+	right: 5px;
 }

 .ie8 .menu-item-bar .item-delete:before {
@@ -481,9 +559,12 @@

 .menu-item-bar .item-delete:hover,
 .menu-item-bar .item-delete:focus {
-	box-shadow: none;
-	outline: none;
-	color: #dc3232;
+	color: #f00;
+}
+
+.menu-item-bar .item-delete:focus {
+	-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, .8);
 }

 .adding-menu-items .menu-item-bar .item-edit {
@@ -494,9 +575,26 @@
 	display: block;
 }

-/**
- * Styles for menu-item addition panel
- */
+#available-menu-items .item {
+	position: static;
+}
+
+#available-menu-items {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	right: -301px;
+	visibility: hidden;
+	overflow-x: hidden;
+	overflow-y: auto;
+	width: 300px;
+	margin: 0;
+	z-index: 4;
+	background: #eee;
+	-webkit-transition: right .18s;
+	transition: right .18s;
+	border-left: 1px solid #ddd;
+}

 #available-menu-items.opening {
 	overflow-y: hidden; /* avoid scrollbar jitter with animating heights */
@@ -511,12 +609,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,23 +623,49 @@
 	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 {
-	color: #23282d;
+#available-menu-items .accordion-section-title .toggle-indicator {
+	display: inline-block;
+	font-size: 20px;
+	line-height: 1;
 }

-#available-menu-items .open .accordion-section-title .toggle-indicator:before {
-	content: "\f142";
-	color: #23282d;
+#available-menu-items .accordion-section-title .toggle-indicator:after {
+	content: '\f140';
+	font: normal 20px/1 'dashicons';
+	color: #a0a5aa;
+	vertical-align: top;
+	speak: none;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	text-decoration: none !important;
 }

-#available-menu-items .available-menu-items-list {
+#available-menu-items .accordion-section-title:hover .toggle-indicator:after {
+	color: #777;
+}
+
+#available-menu-items .open .accordion-section-title .toggle-indicator:after {
+	content: '\f142';
+}
+
+#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;
 }

+button.not-a-button {
+	background: transparent;
+	border: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	-webkit-border-radius: 0;
+	border-radius: 0;
+	outline: 0;
+	padding: 0;
+	margin: 0;
+}
+
 #available-menu-items .accordion-section-title button {
 	display: block;
 	width: 28px;
@@ -553,10 +673,12 @@
 	position: absolute;
 	top: 5px;
 	left: 5px;
-	box-shadow: none;
-	outline: none;
 	cursor: pointer;
-	text-align: center;
+}
+
+#available-menu-items .accordion-section-title button:focus {
+	-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, .8);
 }

 #available-menu-items .accordion-section-title .no-items,
@@ -570,31 +692,30 @@
 }

 #available-menu-items .cannot-expand .accordion-section-title .no-items {
+	display: block;
+	color: #777;
+	font-weight: normal;
 	float: left;
-	color: #555d66;
-	font-weight: 400;
 	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;
+	margin: 0;
+	max-height: 290px;
 }

-#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;
+#available-menu-items #available-menu-items-search .accordion-section-content {
+	position: absolute;
+	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 .menu-item-tpl {
@@ -603,12 +724,22 @@

 #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 .item-tpl {
+	position: relative;
+	padding: 20px 60px 20px 15px;
+	border-bottom: 1px solid #e4e4e4;
+	cursor: pointer;
+	display: none;
+}
+
+#available-menu-items .item-tpl:hover,
+#available-menu-items .item-tpl.selected {
+	background: #eee;
 }

 #available-menu-items .menu-item-handle .item-type {
@@ -623,7 +754,16 @@
 	cursor: pointer;
 }

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

 #available-menu-items .menu-item-handle .item-add:focus {
 	color: #23282d;
+	-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, .8);
 }

 #available-menu-items .item-add:before {
 	content: "\f543";
+	font: normal 20px/1 dashicons;
 	position: relative;
 	right: 2px;
 	top: 3px;
-	display: inline-block;
-	height: 20px;
-	border-radius: 50%;
-	font: normal 20px/1.05 dashicons; /* line height is to account for the dashicon's vertical alignment */
 }

 #available-menu-items .menu-item-handle.item-added .item-type,
@@ -682,28 +818,60 @@
 	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 .clear-results:focus {
+	-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, .8);
+}
+
 #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;
-	top: 60px; /* below title div / search input */
-	bottom: 0px; /* 100% height that still triggers lazy load */
-	max-height: none;
+#available-menu-items-search input {
+	padding: 6px 10px;
 	width: 100%;
-	padding: 1px 15px 15px;
-	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 {
+	padding: 12px 15px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }

 #available-menu-items-search .accordion-section-title:after {
@@ -724,6 +892,7 @@
 }

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

@@ -740,10 +909,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 +933,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 {
@@ -803,21 +974,35 @@ body.adding-menu-items #customize-preview iframe {
 }

 .menu-delete-item {
+	display: block;
 	float: right;
 	padding: 1em 0;
 	width: 100%;
 }

-.assigned-menu-locations-title p {
-	margin: 0 0 8px 0;
-}
-
 li.assigned-to-menu-location .menu-delete-item {
-	display: none;
+  display: none;
 }

 li.assigned-to-menu-location .add-new-menu-item {
-	margin-bottom: 1em;
+  margin-bottom: 1em;
+}
+
+.menu-delete {
+	color: #a00;
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+.menu-delete:hover,
+.menu-delete:focus {
+	color: #f00;
+	text-decoration: none;
+}
+
+.menu-delete:focus {
+	-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, .8);
 }

 .menu-item-handle {
@@ -848,40 +1033,60 @@ 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;
 }

-/**
- * box-shadows
- */
-
-.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,
-.menu-delete:focus,
-.menu-item-bar .item-delete:focus:before,
-#available-menu-items .item-add:focus:before {
-	box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
+#available-menu-items .customize-section-title {
+	display: none;
 }

-
-@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 ) {
+	body.adding-menu-items div#available-menu-items {
+		top: 46px;
+		right: 0;
+		z-index: 10;
+		width: 100%;
+	}
+
 	#available-menu-items #available-menu-items-search .accordion-section-content {
-		top: 130px;
+		top: 133px;
+	}
+
+	#available-menu-items .customize-section-title {
+		display: block;
+		margin: 0;
+	}
+
+	#available-menu-items .customize-section-back {
+		height: 69px;
+	}
+
+	#available-menu-items .customize-section-title h3 {
+		font-size: 20px;
+		font-weight: 200;
+		padding: 9px 14px 12px 10px;
+		margin: 0;
+		line-height: 24px;
+		color: #555;
+		display: block;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	#available-menu-items .customize-section-title .customize-action {
+		font-size: 13px;
+		display: block;
+		font-weight: 400;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
 	}
 }
--- 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,
@@ -28,34 +12,17 @@

 #customize-controls .theme-location-set,
 #customize-controls .control-section .accordion-section-title:focus .menu-in-location,
-#customize-controls .control-section .accordion-section-title:hover .menu-in-location {
+#customize-controls .control-section .accordion-section-title:hover .menu-in-location,
+#customize-controls .control-section .accordion-section-title:focus .menu-in-locations,
+#customize-controls .control-section .accordion-section-title:hover .menu-in-locations {
 	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 +45,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;
@@ -120,16 +78,29 @@
 }

 .wp-customizer .menu-item .submitbox .submitdelete {
+	display: block;
 	float: left;
 	margin: 6px 0 0;
 	padding: 0;
 	cursor: pointer;
 }

+.wp-customizer .menu-item .submitbox .submitdelete:focus {
+	-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, .8);
+}

-/**
- * Menu items reordering styles
- */
+/* Menu-item reordering nav. */
+.customize-control-nav_menu .reordering .reorder,
+.customize-control-nav_menu .reorder-done {
+	display: none;
+}
+
+.customize-control-nav_menu .reorder,
+.customize-control-nav_menu .reordering .reorder-done {
+	display: inline-block;
+	padding: 5px 8px;
+}

 .menu-item-reorder-nav {
 	display: none;
@@ -139,12 +110,86 @@
 	right: 0;
 }

+.customize-control-nav_menu .reordering .add-new-menu-item {
+	opacity: 0.2;
+	pointer-events: none;
+	cursor: not-allowed;
+}
+
+.menu-item-reorder-nav button {
+	position: relative;
+	overflow: hidden;
+	float: left;
+	display: block;
+	width: 30px;
+	height: 40px;
+	color: #82878c;
+	text-indent: -9999px;
+	cursor: pointer;
+	background: transparent;
+	border: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	outline: none;
+}
+
+.menu-item-reorder-nav button:before {
+	display: inline-block;
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 100%;
+	height: 100%;
+	font: normal 20px/40px dashicons;
+	text-align: center;
+	text-indent: 0;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.menu-item-reorder-nav button:hover,
+.menu-item-reorder-nav button:focus {
+	color: #191e23;
+	background: #eee;
+}
+
+.menus-move-down:before {
+	content: '\f347';
+}
+
+.menus-move-up:before {
+	content: '\f343';
+}
+
 .menus-move-left:before {
-	content: "\f341";
+	content: '\f341';
 }

 .menus-move-right:before {
-	content: "\f345";
+	content: '\f345';
+}
+
+.move-up-disabled .menus-move-up,
+.move-down-disabled .menus-move-down,
+.move-right-disabled .menus-move-right,
+.move-left-disabled .menus-move-left {
+	color: #d5d5d5 !important;
+	background-color: #fff !important;
+	cursor: default;
+	pointer-events: none;
+}
+
+.menu-item-reorder-nav:before {
+	content: "";
+	display: block;
+	position: absolute;
+	left: -10px;
+	width: 10px;
+	height: 40px;
+	background: -webkit-linear-gradient(left, rgba(250,250,250,0) 0%,rgba(250,250,250,1) 100%);
+	background: -webkit-gradient(linear, left top, right top, from(rgba(250,250,250,0)), to(rgba(250,250,250,1)));
+	background: -webkit-linear-gradient(left, rgba(250,250,250,0) 0%, rgba(250,250,250,1) 100%);
+	background: linear-gradient(to right, rgba(250,250,250,0) 0%,rgba(250,250,250,1) 100%);
 }

 .reordering .menu-item .item-controls,
@@ -158,6 +203,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,15 +214,37 @@
 	width: 30px;
 	height: 38px;
 	margin-right: 0 !important;
-	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 {
-	content: "\f142";
+.customize-control-nav_menu_item .item-edit:focus {
+	color: #0073aa;
+	-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, .8);
+}
+
+/* rework the arrow indicator implementation for NVDA bug same as #32715 */
+.wp-customizer .menu-item .item-edit .toggle-indicator {
+	display: inline-block;
+	font-size: 20px;
+	line-height: 1;
+}
+
+.wp-customizer .menu-item .item-edit .toggle-indicator:after {
+	content: '\f140';
+	font: normal 20px/1 dashicons;
+	color: #a0a5aa;
+	vertical-align: top;
+	speak: none;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	text-decoration: none !important;
+}
+
+.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after {
+	content: '\f142';
 }

 .wp-customizer .menu-item-settings p.description {
@@ -201,31 +269,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 {
@@ -277,7 +327,7 @@
 	border: none;
 	content: "\f111";
 	display: block;
-	font: 18px/1 dashicons;
+	font: 18px/1 "dashicons";
 	padding: 5px;
 	text-align: center;
 	text-decoration: none !important;
@@ -289,6 +339,9 @@

 .customize-screen-options-toggle:focus:before,
 #customize-controls .customize-info .customize-help-toggle: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, .8);
+	-webkit-border-radius: 100%;
 	border-radius: 100%;
 }

@@ -296,7 +349,7 @@
 	display: none;
 	background: #fff;
 	border-top: 1px solid #ddd;
-	padding: 4px 15px 15px;
+	padding: 4px 15px 0;
 }

 .wp-customizer .metabox-prefs label {
@@ -305,44 +358,19 @@
 	line-height: 30px;
 }

-/* rework the arrow indicator implementation for NVDA bug same as #32715 */
-.wp-customizer .toggle-indicator {
-	display: inline-block;
-	font-size: 20px;
-	line-height: 1;
-}
-
-.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 {
-	content: "\f140";
-	display: block;
-	padding: 1px 2px 1px 0px;
-	speak: none;
-	border-radius: 50%;
-	color: #72777c;
-	font: normal 20px/1 dashicons;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	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-attr-title,
+#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-attr-title-active .field-attr-title,
+#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 +443,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,13 +465,17 @@
 	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;
 }

-/**
- * Add-menu-items mode
+/*
+ * Add-menu-items mode.
 */
+.wp-full-overlay-main {
+	right: auto; /* This overrides a right: 0; which causes the preview to resize rather than slide off screen at the normal size. */
+	width: 100%;
+}

 .adding-menu-items .control-section {
 	opacity: .4;
@@ -453,6 +486,52 @@
 	opacity: 1;
 }

+/* Add-new button. */
+#customize-theme-controls .add-new-menu-item {
+	cursor: pointer;
+	float: right;
+	margin-left: 10px;
+	-webkit-transition: all 0.2s;
+	transition: all 0.2s;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	outline: none;
+}
+
+.add-new-menu-item:before {
+	content: "\f132";
+	display: inline-block;
+	position: relative;
+	left: -2px;
+	top: -1px;
+	font: normal 20px/1 'dashicons';
+	vertical-align: middle;
+	-webkit-transition: all 0.2s;
+	transition: all 0.2s;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.adding-menu-items .add-new-menu-item,
+.adding-menu-items .add-new-menu-item:hover,
+.add-menu-toggle.open,
+.add-menu-toggle.open:hover {
+	background: #eee;
+	border-color: #929793;
+	color: #32373c;
+	-webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
+	box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
+}
+
+.adding-menu-items .add-new-menu-item:before,
+#accordion-section-add_menu .add-new-menu-item.open:before {
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+
 .menu-item-bar .item-delete {
 	color: #a00;
 	position: absolute;
@@ -466,13 +545,12 @@

 .menu-item-bar .item-delete:before {
 	content: "\f335";
-	position: absolute;
-	top: 9px;
-	left: 5px;
-	border-radius: 50%;
 	font: normal 20px/1 dashicons;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
+	position: absolute;
+	top: 9px;
+	left: 5px;
 }

 .ie8 .menu-item-bar .item-delete:before {
@@ -481,9 +559,12 @@

 .menu-item-bar .item-delete:hover,
 .menu-item-bar .item-delete:focus {
-	box-shadow: none;
-	outline: none;
-	color: #dc3232;
+	color: #f00;
+}
+
+.menu-item-bar .item-delete:focus {
+	-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, .8);
 }

 .adding-menu-items .menu-item-bar .item-edit {
@@ -494,9 +575,26 @@
 	display: block;
 }

-/**
- * Styles for menu-item addition panel
- */
+#available-menu-items .item {
+	position: static;
+}
+
+#available-menu-items {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: -301px;
+	visibility: hidden;
+	overflow-x: hidden;
+	overflow-y: auto;
+	width: 300px;
+	margin: 0;
+	z-index: 4;
+	background: #eee;
+	-webkit-transition: left .18s;
+	transition: left .18s;
+	border-right: 1px solid #ddd;
+}

 #available-menu-items.opening {
 	overflow-y: hidden; /* avoid scrollbar jitter with animating heights */
@@ -511,12 +609,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,23 +623,49 @@
 	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 {
-	color: #23282d;
+#available-menu-items .accordion-section-title .toggle-indicator {
+	display: inline-block;
+	font-size: 20px;
+	line-height: 1;
 }

-#available-menu-items .open .accordion-section-title .toggle-indicator:before {
-	content: "\f142";
-	color: #23282d;
+#available-menu-items .accordion-section-title .toggle-indicator:after {
+	content: '\f140';
+	font: normal 20px/1 'dashicons';
+	color: #a0a5aa;
+	vertical-align: top;
+	speak: none;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	text-decoration: none !important;
 }

-#available-menu-items .available-menu-items-list {
+#available-menu-items .accordion-section-title:hover .toggle-indicator:after {
+	color: #777;
+}
+
+#available-menu-items .open .accordion-section-title .toggle-indicator:after {
+	content: '\f142';
+}
+
+#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;
 }

+button.not-a-button {
+	background: transparent;
+	border: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	-webkit-border-radius: 0;
+	border-radius: 0;
+	outline: 0;
+	padding: 0;
+	margin: 0;
+}
+
 #available-menu-items .accordion-section-title button {
 	display: block;
 	width: 28px;
@@ -553,10 +673,12 @@
 	position: absolute;
 	top: 5px;
 	right: 5px;
-	box-shadow: none;
-	outline: none;
 	cursor: pointer;
-	text-align: center;
+}
+
+#available-menu-items .accordion-section-title button:focus {
+	-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, .8);
 }

 #available-menu-items .accordion-section-title .no-items,
@@ -570,31 +692,30 @@
 }

 #available-menu-items .cannot-expand .accordion-section-title .no-items {
+	display: block;
+	color: #777;
+	font-weight: normal;
 	float: right;
-	color: #555d66;
-	font-weight: 400;
 	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;
+	margin: 0;
+	max-height: 290px;
 }

-#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;
+#available-menu-items #available-menu-items-search .accordion-section-content {
+	position: absolute;
+	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 .menu-item-tpl {
@@ -603,12 +724,22 @@

 #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 .item-tpl {
+	position: relative;
+	padding: 20px 15px 20px 60px;
+	border-bottom: 1px solid #e4e4e4;
+	cursor: pointer;
+	display: none;
+}
+
+#available-menu-items .item-tpl:hover,
+#available-menu-items .item-tpl.selected {
+	background: #eee;
 }

 #available-menu-items .menu-item-handle .item-type {
@@ -623,7 +754,16 @@
 	cursor: pointer;
 }

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

 #available-menu-items .menu-item-handle .item-add:focus {
 	color: #23282d;
+	-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, .8);
 }

 #available-menu-items .item-add:before {
 	content: "\f543";
+	font: normal 20px/1 dashicons;
 	position: relative;
 	left: 2px;
 	top: 3px;
-	display: inline-block;
-	height: 20px;
-	border-radius: 50%;
-	font: normal 20px/1.05 dashicons; /* line height is to account for the dashicon's vertical alignment */
 }

 #available-menu-items .menu-item-handle.item-added .item-type,
@@ -682,28 +818,60 @@
 	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 .clear-results:focus {
+	-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, .8);
+}
+
 #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;
-	top: 60px; /* below title div / search input */
-	bottom: 0px; /* 100% height that still triggers lazy load */
-	max-height: none;
+#available-menu-items-search input {
+	padding: 6px 10px;
 	width: 100%;
-	padding: 1px 15px 15px;
-	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 {
+	padding: 12px 15px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }

 #available-menu-items-search .accordion-section-title:after {
@@ -724,6 +892,7 @@
 }

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

@@ -740,10 +909,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 +933,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 {
@@ -803,21 +974,35 @@ body.adding-menu-items #customize-preview iframe {
 }

 .menu-delete-item {
+	display: block;
 	float: left;
 	padding: 1em 0;
 	width: 100%;
 }

-.assigned-menu-locations-title p {
-	margin: 0 0 8px 0;
-}
-
 li.assigned-to-menu-location .menu-delete-item {
-	display: none;
+  display: none;
 }

 li.assigned-to-menu-location .add-new-menu-item {
-	margin-bottom: 1em;
+  margin-bottom: 1em;
+}
+
+.menu-delete {
+	color: #a00;
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+.menu-delete:hover,
+.menu-delete:focus {
+	color: #f00;
+	text-decoration: none;
+}
+
+.menu-delete:focus {
+	-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, .8);
 }

 .menu-item-handle {
@@ -848,40 +1033,60 @@ 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;
 }

-/**
- * box-shadows
- */
-
-.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,
-.menu-delete:focus,
-.menu-item-bar .item-delete:focus:before,
-#available-menu-items .item-add:focus:before {
-	box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
+#available-menu-items .customize-section-title {
+	display: none;
 }

-
-@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 ) {
+	body.adding-menu-items div#available-menu-items {
+		top: 46px;
+		left: 0;
+		z-index: 10;
+		width: 100%;
+	}
+
 	#available-menu-items #available-menu-items-search .accordion-section-content {
-		top: 130px;
+		top: 133px;
+	}
+
+	#available-menu-items .customize-section-title {
+		display: block;
+		margin: 0;
+	}
+
+	#available-menu-items .customize-section-back {
+		height: 69px;
+	}
+
+	#available-menu-items .customize-section-title h3 {
+		font-size: 20px;
+		font-weight: 200;
+		padding: 9px 10px 12px 14px;
+		margin: 0;
+		line-height: 24px;
+		color: #555;
+		display: block;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	#available-menu-items .customize-section-title .customize-action {
+		font-size: 13px;
+		display: block;
+		font-weight: 400;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
 	}
 }
--- 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,21 +18,11 @@
 	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;
 }

-.customize-control .widget-action {
-	color: #72777c;
-}
-
-.customize-control .widget-top:hover .widget-action,
-.customize-control .widget-action:focus {
-	color: #23282d;
-}
-
 .customize-control-widget_form:not(.widget-rendered) .widget-top {
 	opacity: 0.5;
 }
@@ -75,6 +65,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,
@@ -88,15 +79,19 @@
 	line-height: 16px;
 }

-.customize-control-widget_form.expanded .widget-action .toggle-indicator:before {
+.widget-top {
+	cursor: move;
+}
+
+.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";
 }

@@ -104,7 +99,6 @@
 	cursor: pointer;
 }

-.widget-top,
 .customize-control-widget_form .widget .customize-control-title {
 	cursor: move;
 }
@@ -112,7 +106,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;
 }
@@ -122,8 +117,44 @@
 }

 /**
- * Widget reordering styles
- */
+* Widget reordering styles
+**/
+
+.reorder-toggle {
+	float: left;
+	padding: 5px 8px;
+	text-decoration: none;
+	cursor: pointer;
+	outline: none;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.reorder-toggle:focus {
+	outline: 1px dotted;
+}
+
+.reorder-done,
+.reordering .reorder {
+	display: none;
+}
+
+.reordering .reorder-done {
+	display: block;
+	color: #0073aa;
+}
+
+.reordering .reorder-done:hover,
+.reordering .reorder-done:active {
+	color: #00a0d2;
+}
+
+#customize-theme-controls .reordering .add-new-widget {
+	opacity: 0.2;
+	pointer-events: none;
+	cursor: not-allowed;
+}

 #customize-theme-controls .widget-reorder-nav {
 	display: none;
@@ -131,14 +162,61 @@
 	background-color: #fafafa;
 }

-.move-widget:before {
-	content: "\f504";
+.widget-reorder-nav span {
+	position: relative;
+	overflow: hidden;
+	float: right;
+	display: block;
+	width: 33px; /* was 42px for mobile */
+	height: 43px;
+	color: #82878c;
+	text-indent: -9999px;
+	cursor: pointer;
+	outline: none;
 }

-#customize-theme-controls .move-widget-area {
+.widget-reorder-nav span:before {
+	display: inline-block;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	font: normal 20px/43px 'dashicons';
+	text-align: center;
+	text-indent: 0;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.widget-reorder-nav span:hover,
+.widget-reorder-nav span:focus {
+	color: #444;
+	background: #eee;
+}
+
+.move-widget:before {
+	content: '\f504';
+}
+
+.move-widget-down:before {
+	content: '\f347';
+}
+
+.move-widget-up:before {
+	content: '\f343';
+}
+
+#customize-theme-controls .first-widget .move-widget-up,
+#customize-theme-controls .last-widget .move-widget-down {
+	color: #d5d5d5;
+	cursor: default;
+}
+
+#customize-theme-controls  .move-widget-area {
 	display: none;
 	background: #fff;
-	border: 1px solid #ddd;
+	border: 1px solid #dedede;
 	border-top: none;
 	cursor: auto;
 }
@@ -174,11 +252,11 @@

 #customize-theme-controls .widget-area-select li:before {
 	display: none;
-	content: "\f147";
+	content: '\f147';
 	position: absolute;
 	top: 12px;
 	right: 10px;
-	font: normal 20px/1 dashicons;
+	font: normal 20px/1 'dashicons';
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
@@ -189,7 +267,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,63 +288,149 @@
 	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
 */
+.wp-full-overlay-main {
+	left: auto; /* this overrides a right: 0; which causes the preview to resize, I'd rather have it go off screen at the normal size. */
+	width: 100%;
+}

-/* override widgets admin page rules in wp-admin/css/widgets.css */
+#customize-theme-controls .add-new-widget {
+	cursor: pointer;
+	float: left;
+	margin-right: 10px;
+	-webkit-transition: all 0.2s;
+	transition: all 0.2s;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	outline: none;
+}
+
+.add-new-widget:before {
+	content: "\f132";
+	display: inline-block;
+	position: relative;
+	right: -2px;
+	top: -1px;
+	font: normal 20px/1 'dashicons';
+	vertical-align: middle;
+	-webkit-transition: all 0.2s;
+	transition: all 0.2s;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+body.adding-widget .add-new-widget,
+body.adding-widget .add-new-widget:hover {
+	background: #eee;
+	border-color: #999;
+	color: #32373c;
+	-webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
+	box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
+}
+body.adding-widget .add-new-widget:before {
+	-webkit-transform: rotate(-45deg);
+	-ms-transform: rotate(-45deg);
+	transform: rotate(-45deg);
+}
+
+#available-widgets .widget {
+	position: static;
+}
+
+/* override widgets admin page rules in wp-admin/css/wp-admin.css */
 #widgets-left #available-widgets .widget {
 	float: none !important;
 	width: auto !important;
 }

-/* Keep rule that is no longer necessary on widgets.php. */
-#available-widgets .widget-action {
-	display: none;
+#available-widgets {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	right: -301px;
+	visibility: hidden;
+	overflow: auto;
+	width: 300px;
+	margin: 0;
+	z-index: 1;
+	background: #eee !important;
+	-webkit-transition: right .18s;
+	transition: right .18s;
+	border-left: 1px solid #ddd;
 }

 .ios #available-widgets {
+	-webkit-transition: right 0s;
 	transition: right 0s;
 }

+#available-widgets-list {
+	top: 46px;
+	position: absolute;
+	overflow: auto;
+	bottom: 0;
+	width: 100%;
+}
+
+#available-widgets-filter {
+	position: fixed;
+	top: 0;
+	z-index: 1;
+	width: 300px;
+	height: 46px;
+	padding: 8px 13px 7px 17px;
+	background: #eee;
+	border-bottom: 1px solid #e4e4e4;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+#available-widgets-filter input {
+	padding: 5px 10px 2px 10px;
+	width: 100%;
+}
+
+#available-widgets .widget-tpl {
+	position: relative;
+	padding: 20px 60px 20px 15px;
+	background: #fff;
+	border-bottom: 1px solid #e4e4e4;
+	cursor: pointer;
+	display: none;
+}
+
 #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 {
-	font-size: 1em;
+#available-widgets .widget-top,
+#available-widgets .widget-top:hover {
+	border: none;
+	background: transparent;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }

-#available-widgets .widget-title h3 {
+#available-widgets .widget-title h4 {
 	padding: 0 0 5px;
 	font-size: 14px;
 }

 #available-widgets .widget .widget-description {
 	padding: 0;
-	color: #72777c;
+	color: #777;
 }

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

@@ -288,8 +452,7 @@ body.adding-widget #customize-preview {
 * Widget Icon styling
 * No plurals in naming.
 * Ordered from lowest to highest specificity.
- */
-
+ **/
 #available-widgets .widget-title {
 	position: relative;
 }
@@ -303,8 +466,10 @@ body.adding-widget #customize-preview {
 	width: 20px;
 	height: 20px;
 	color: #32373c;
-	font: normal 20px/1 dashicons;
+	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;
@@ -436,48 +601,94 @@ body.adding-widget #customize-preview {
 #available-widgets [class*="tweet"] .widget-title:before,
 #available-widgets [class*="twitter"] .widget-title:before { content: "\f301"; }

+#available-widgets .customize-section-title {
+	display: none;
+}
+
@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 {
+	.widget-title h4 {
 		padding: 13px 15px;
 	}
-
-	.widget-top .widget-action {
-		padding: 8px 10px;
+	.widget-top a.widget-action:after {
+		padding-top: 9px;
 	}
-
 	.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;
 	}
 }
+
+@media screen and ( max-width: 640px ) {
+	body.adding-widget div#available-widgets {
+		top: 46px;
+		right: 0;
+		z-index: 10;
+		width: 100%;
+	}
+
+	#available-widgets .customize-section-title {
+		display: block;
+		margin: 0;
+	}
+
+	#available-widgets .customize-section-back {
+		height: 69px;
+	}
+
+	#available-widgets .customize-section-title h3 {
+		font-size: 20px;
+		font-weight: 200;
+		padding: 9px 14px 12px 10px;
+		margin: 0;
+		line-height: 24px;
+		color: #555;
+		display: block;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	#available-widgets .customize-section-title .customize-action {
+		font-size: 13px;
+		display: block;
+		font-weight: 400;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	#available-widgets-filter {
+		position: relative;
+		width: 100%;
+		background: #fff;
+		height: auto;
+		padding: 10px 15px;
+	}
+
+	#available-widgets-list {
+		top: 140px;
+	}
+}
--- 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,21 +18,11 @@
 	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;
 }

-.customize-control .widget-action {
-	color: #72777c;
-}
-
-.customize-control .widget-top:hover .widget-action,
-.customize-control .widget-action:focus {
-	color: #23282d;
-}
-
 .customize-control-widget_form:not(.widget-rendered) .widget-top {
 	opacity: 0.5;
 }
@@ -75,6 +65,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,
@@ -88,15 +79,19 @@
 	line-height: 16px;
 }

-.customize-control-widget_form.expanded .widget-action .toggle-indicator:before {
+.widget-top {
+	cursor: move;
+}
+
+.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";
 }

@@ -104,7 +99,6 @@
 	cursor: pointer;
 }

-.widget-top,
 .customize-control-widget_form .widget .customize-control-title {
 	cursor: move;
 }
@@ -112,7 +106,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;
 }
@@ -122,8 +117,44 @@
 }

 /**
- * Widget reordering styles
- */
+* Widget reordering styles
+**/
+
+.reorder-toggle {
+	float: right;
+	padding: 5px 8px;
+	text-decoration: none;
+	cursor: pointer;
+	outline: none;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.reorder-toggle:focus {
+	outline: 1px dotted;
+}
+
+.reorder-done,
+.reordering .reorder {
+	display: none;
+}
+
+.reordering .reorder-done {
+	display: block;
+	color: #0073aa;
+}
+
+.reordering .reorder-done:hover,
+.reordering .reorder-done:active {
+	color: #00a0d2;
+}
+
+#customize-theme-controls .reordering .add-new-widget {
+	opacity: 0.2;
+	pointer-events: none;
+	cursor: not-allowed;
+}

 #customize-theme-controls .widget-reorder-nav {
 	display: none;
@@ -131,14 +162,61 @@
 	background-color: #fafafa;
 }

-.move-widget:before {
-	content: "\f504";
+.widget-reorder-nav span {
+	position: relative;
+	overflow: hidden;
+	float: left;
+	display: block;
+	width: 33px; /* was 42px for mobile */
+	height: 43px;
+	color: #82878c;
+	text-indent: -9999px;
+	cursor: pointer;
+	outline: none;
 }

-#customize-theme-controls .move-widget-area {
+.widget-reorder-nav span:before {
+	display: inline-block;
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 100%;
+	height: 100%;
+	font: normal 20px/43px 'dashicons';
+	text-align: center;
+	text-indent: 0;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.widget-reorder-nav span:hover,
+.widget-reorder-nav span:focus {
+	color: #444;
+	background: #eee;
+}
+
+.move-widget:before {
+	content: '\f504';
+}
+
+.move-widget-down:before {
+	content: '\f347';
+}
+
+.move-widget-up:before {
+	content: '\f343';
+}
+
+#customize-theme-controls .first-widget .move-widget-up,
+#customize-theme-controls .last-widget .move-widget-down {
+	color: #d5d5d5;
+	cursor: default;
+}
+
+#customize-theme-controls  .move-widget-area {
 	display: none;
 	background: #fff;
-	border: 1px solid #ddd;
+	border: 1px solid #dedede;
 	border-top: none;
 	cursor: auto;
 }
@@ -174,11 +252,11 @@

 #customize-theme-controls .widget-area-select li:before {
 	display: none;
-	content: "\f147";
+	content: '\f147';
 	position: absolute;
 	top: 12px;
 	left: 10px;
-	font: normal 20px/1 dashicons;
+	font: normal 20px/1 'dashicons';
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
@@ -189,7 +267,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,63 +288,149 @@
 	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
 */
+.wp-full-overlay-main {
+	right: auto; /* this overrides a right: 0; which causes the preview to resize, I'd rather have it go off screen at the normal size. */
+	width: 100%;
+}

-/* override widgets admin page rules in wp-admin/css/widgets.css */
+#customize-theme-controls .add-new-widget {
+	cursor: pointer;
+	float: right;
+	margin-left: 10px;
+	-webkit-transition: all 0.2s;
+	transition: all 0.2s;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	outline: none;
+}
+
+.add-new-widget:before {
+	content: "\f132";
+	display: inline-block;
+	position: relative;
+	left: -2px;
+	top: -1px;
+	font: normal 20px/1 'dashicons';
+	vertical-align: middle;
+	-webkit-transition: all 0.2s;
+	transition: all 0.2s;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+body.adding-widget .add-new-widget,
+body.adding-widget .add-new-widget:hover {
+	background: #eee;
+	border-color: #999;
+	color: #32373c;
+	-webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
+	box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);
+}
+body.adding-widget .add-new-widget:before {
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+
+#available-widgets .widget {
+	position: static;
+}
+
+/* override widgets admin page rules in wp-admin/css/wp-admin.css */
 #widgets-left #available-widgets .widget {
 	float: none !important;
 	width: auto !important;
 }

-/* Keep rule that is no longer necessary on widgets.php. */
-#available-widgets .widget-action {
-	display: none;
+#available-widgets {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: -301px;
+	visibility: hidden;
+	overflow: auto;
+	width: 300px;
+	margin: 0;
+	z-index: 1;
+	background: #eee !important;
+	-webkit-transition: left .18s;
+	transition: left .18s;
+	border-right: 1px solid #ddd;
 }

 .ios #available-widgets {
+	-webkit-transition: left 0s;
 	transition: left 0s;
 }

+#available-widgets-list {
+	top: 46px;
+	position: absolute;
+	overflow: auto;
+	bottom: 0;
+	width: 100%;
+}
+
+#available-widgets-filter {
+	position: fixed;
+	top: 0;
+	z-index: 1;
+	width: 300px;
+	height: 46px;
+	padding: 8px 17px 7px 13px;
+	background: #eee;
+	border-bottom: 1px solid #e4e4e4;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+#available-widgets-filter input {
+	padding: 5px 10px 2px 10px;
+	width: 100%;
+}
+
+#available-widgets .widget-tpl {
+	position: relative;
+	padding: 20px 15px 20px 60px;
+	background: #fff;
+	border-bottom: 1px solid #e4e4e4;
+	cursor: pointer;
+	display: none;
+}
+
 #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 {
-	font-size: 1em;
+#available-widgets .widget-top,
+#available-widgets .widget-top:hover {
+	border: none;
+	background: transparent;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }

-#available-widgets .widget-title h3 {
+#available-widgets .widget-title h4 {
 	padding: 0 0 5px;
 	font-size: 14px;
 }

 #available-widgets .widget .widget-description {
 	padding: 0;
-	color: #72777c;
+	color: #777;
 }

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

@@ -288,8 +452,7 @@ body.adding-widget #customize-preview {
 * Widget Icon styling
 * No plurals in naming.
 * Ordered from lowest to highest specificity.
- */
-
+ **/
 #available-widgets .widget-title {
 	position: relative;
 }
@@ -303,8 +466,10 @@ body.adding-widget #customize-preview {
 	width: 20px;
 	height: 20px;
 	color: #32373c;
-	font: normal 20px/1 dashicons;
+	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;
@@ -436,48 +601,94 @@ body.adding-widget #customize-preview {
 #available-widgets [class*="tweet"] .widget-title:before,
 #available-widgets [class*="twitter"] .widget-title:before { content: "\f301"; }

+#available-widgets .customize-section-title {
+	display: none;
+}
+
@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 {
+	.widget-title h4 {
 		padding: 13px 15px;
 	}
-
-	.widget-top .widget-action {
-		padding: 8px 10px;
+	.widget-top a.widget-action:after {
+		padding-top: 9px;
 	}
-
 	.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;
 	}
 }
+
+@media screen and ( max-width: 640px ) {
+	body.adding-widget div#available-widgets {
+		top: 46px;
+		left: 0;
+		z-index: 10;
+		width: 100%;
+	}
+
+	#available-widgets .customize-section-title {
+		display: block;
+		margin: 0;
+	}
+
+	#available-widgets .customize-section-back {
+		height: 69px;
+	}
+
+	#available-widgets .customize-section-title h3 {
+		font-size: 20px;
+		font-weight: 200;
+		padding: 9px 10px 12px 14px;
+		margin: 0;
+		line-height: 24px;
+		color: #555;
+		display: block;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	#available-widgets .customize-section-title .customize-action {
+		font-size: 13px;
+		display: block;
+		font-weight: 400;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	#available-widgets-filter {
+		position: relative;
+		width: 100%;
+		background: #fff;
+		height: auto;
+		padding: 10px 15px;
+	}
+
+	#available-widgets-list {
+		top: 140px;
+	}
+}
--- 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
--- 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
--- 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,9 +3,9 @@
 div#media-upload-header {
 	margin: 0;
 	padding: 5px 5px 0;
-	font-weight: 600;
+	font-weight: bold;
 	position: relative;
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid #dfdfdf;
 	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 {
@@ -28,9 +28,10 @@ div#media-upload-header {
 	float: right;
 	line-height: 28px;
 	border-top: 1px solid #f9f9f9;
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid #dfdfdf;
 	background-color: #f9f9f9;
 	text-decoration: none;
+	-webkit-transition: none;
 	transition: none;
 }

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

 #sidemenu a.current {
-	font-weight: 400;
+	font-weight: normal;
 	padding-right: 6px;
 	padding-left: 6px;
-	border: 1px solid #ddd;
+	border: 1px solid #dfdfdf;
 	border-bottom-color: #f1f1f1;
 	background-color: #f1f1f1;
 	color: #000;
@@ -61,18 +62,13 @@ div#media-upload-header {
 }

 #media-upload .slidetoggle {
-	border-top-color: #ddd;
+	border-top-color: #dfdfdf;
 }

 #media-upload input[type="radio"] {
 	padding: 0;
 }

-.media-upload-form label.form-help,
-td.help {
-	color: #72777c;
-}
-
 form {
 	margin: 1em;
 }
@@ -88,7 +84,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 {
@@ -151,8 +147,7 @@ thead.media-item-info tr {
 	border: 8px solid #fff;
 }

-abbr.required,
-span.required {
+abbr.required {
 	text-decoration: none;
 	border: none;
 }
@@ -186,7 +181,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 +201,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;
@@ -291,15 +270,15 @@ span.required {
 	clear: both;
 	padding: 0 0 3px;
 	font-size: 1.6em;
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid #DADADA;
 }

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

-h4.media-sub-title {
-	border-bottom: 1px solid #ddd;
+h4.media-sub-title  {
+	border-bottom: 1px solid #DADADA;
 	font-size: 1.3em;
 	margin: 12px;
 	padding: 0 0 3px;
@@ -309,7 +288,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;
 }

@@ -343,7 +322,7 @@ h4.media-sub-title {
 #gallery-settings label,
 #gallery-settings legend {
 	font-size: 13px;
-	color: #444;
+	color: #464646;
 	margin-left: 15px;
 }

@@ -352,7 +331,7 @@ h4.media-sub-title {
 }

 #gallery-settings p.ml-submit {
-	border-top: 1px solid #ddd;
+	border-top: 1px solid #dfdfdf;
 }

 #gallery-settings select#columns {
@@ -380,14 +359,9 @@ h4.media-sub-title {
 }

 p.media-types {
-	margin: 0;
 	padding: 1em;
 }

-p.media-types-required-info {
-	padding-top: 0;
-}
-
 tr.not-image {
 	display: none;
 }
@@ -409,21 +383,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,9 +3,9 @@
 div#media-upload-header {
 	margin: 0;
 	padding: 5px 5px 0;
-	font-weight: 600;
+	font-weight: bold;
 	position: relative;
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid #dfdfdf;
 	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 {
@@ -28,9 +28,10 @@ div#media-upload-header {
 	float: left;
 	line-height: 28px;
 	border-top: 1px solid #f9f9f9;
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid #dfdfdf;
 	background-color: #f9f9f9;
 	text-decoration: none;
+	-webkit-transition: none;
 	transition: none;
 }

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

 #sidemenu a.current {
-	font-weight: 400;
+	font-weight: normal;
 	padding-left: 6px;
 	padding-right: 6px;
-	border: 1px solid #ddd;
+	border: 1px solid #dfdfdf;
 	border-bottom-color: #f1f1f1;
 	background-color: #f1f1f1;
 	color: #000;
@@ -61,18 +62,13 @@ div#media-upload-header {
 }

 #media-upload .slidetoggle {
-	border-top-color: #ddd;
+	border-top-color: #dfdfdf;
 }

 #media-upload input[type="radio"] {
 	padding: 0;
 }

-.media-upload-form label.form-help,
-td.help {
-	color: #72777c;
-}
-
 form {
 	margin: 1em;
 }
@@ -88,7 +84,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 {
@@ -151,8 +147,7 @@ thead.media-item-info tr {
 	border: 8px solid #fff;
 }

-abbr.required,
-span.required {
+abbr.required {
 	text-decoration: none;
 	border: none;
 }
@@ -186,7 +181,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 +201,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;
@@ -291,15 +270,15 @@ span.required {
 	clear: both;
 	padding: 0 0 3px;
 	font-size: 1.6em;
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid #DADADA;
 }

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

-h4.media-sub-title {
-	border-bottom: 1px solid #ddd;
+h4.media-sub-title  {
+	border-bottom: 1px solid #DADADA;
 	font-size: 1.3em;
 	margin: 12px;
 	padding: 0 0 3px;
@@ -309,7 +288,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;
 }

@@ -343,7 +322,7 @@ h4.media-sub-title {
 #gallery-settings label,
 #gallery-settings legend {
 	font-size: 13px;
-	color: #444;
+	color: #464646;
 	margin-right: 15px;
 }

@@ -352,7 +331,7 @@ h4.media-sub-title {
 }

 #gallery-settings p.ml-submit {
-	border-top: 1px solid #ddd;
+	border-top: 1px solid #dfdfdf;
 }

 #gallery-settings select#columns {
@@ -380,14 +359,9 @@ h4.media-sub-title {
 }

 p.media-types {
-	margin: 0;
 	padding: 1em;
 }

-p.media-types-required-info {
-	padding-top: 0;
-}
-
 tr.not-image {
 	display: none;
 }
@@ -409,21 +383,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 +0,0 @@
-/*! 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 +0,0 @@
-/*! 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;
 }

@@ -243,7 +244,7 @@ table.fixed td {
 }

 #wpbody-content .postbox {
-	border: 1px solid #ddd;
+	border: 1px solid #dfdfdf;
 }

 #wpbody-content .postbox .hndle {
@@ -285,7 +286,7 @@ table.fixed td {
 	width: 29%;
 }

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

@@ -395,10 +396,15 @@ p.search-box {
 	margin: -3px 0 4px;
 }

-#widget-list .widget {
+#widget-list .widget,
+.feature-filter .feature-group li {
 	display: inline;
 }

+.feature-filter .feature-group li input {
+	vertical-align: middle;
+}
+
 #editorcontainer #content {
 	overflow: auto;
 	margin: auto;
@@ -441,17 +447,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 +473,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 +512,7 @@ table.ie-fixed {
 	border-collapse: collapse;
 }

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

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

 .menu li {
@@ -633,9 +641,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 +652,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 +666,7 @@ input[type="password"],

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


@@ -684,7 +692,11 @@ input[type="password"],
 * html .stuffbox,
 * html .stuffbox input,
 * html .stuffbox textarea {
-	border: 1px solid #ddd;
+	border: 1px solid #DFDFDF;
+}
+
+* html .feature-filter .feature-group li {
+	width: 145px;
 }

 * html div.widget-liquid-left {
@@ -718,7 +730,7 @@ input[type="password"],
 }

 * html input {
-	border: 1px solid #ddd;
+	border: 1px solid #dfdfdf;
 }

 * html .edit-box {
--- 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;
 }

@@ -243,7 +244,7 @@ table.fixed td {
 }

 #wpbody-content .postbox {
-	border: 1px solid #ddd;
+	border: 1px solid #dfdfdf;
 }

 #wpbody-content .postbox .hndle {
@@ -285,7 +286,7 @@ table.fixed td {
 	width: 29%;
 }

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

@@ -395,10 +396,15 @@ p.search-box {
 	margin: -3px 0 4px;
 }

-#widget-list .widget {
+#widget-list .widget,
+.feature-filter .feature-group li {
 	display: inline;
 }

+.feature-filter .feature-group li input {
+	vertical-align: middle;
+}
+
 #editorcontainer #content {
 	overflow: auto;
 	margin: auto;
@@ -441,17 +447,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 +473,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 +512,7 @@ table.ie-fixed {
 	border-collapse: collapse;
 }

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

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

 .menu li {
@@ -633,9 +641,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 +652,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 +666,7 @@ input[type="password"],

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


@@ -684,7 +692,11 @@ input[type="password"],
 * html .stuffbox,
 * html .stuffbox input,
 * html .stuffbox textarea {
-	border: 1px solid #ddd;
+	border: 1px solid #DFDFDF;
+}
+
+* html .feature-filter .feature-group li {
+	width: 145px;
 }

 * html div.widget-liquid-left {
@@ -718,7 +730,7 @@ input[type="password"],
 }

 * html input {
-	border: 1px solid #ddd;
+	border: 1px solid #dfdfdf;
 }

 * html .edit-box {
--- 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,45 +6,36 @@ 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 {
 	color: #0073aa;
+	text-decoration: none;
 }

-a:hover,
-a:active {
+a:hover {
 	color: #00a0d2;
 }

-a:focus {
-	color: #124964;
-	box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
-}
-
-.ie8 a:focus {
-	outline: #5b9dd9 solid 1px;
-}
-
-h1, h2 {
-	border-bottom: 1px solid #ddd;
+h1 {
+	border-bottom: 1px solid #dedede;
 	clear: both;
 	color: #666;
 	font-size: 24px;
+	margin: 30px 0;
 	padding: 0;
 	padding-bottom: 7px;
-	font-weight: 400;
+	font-weight: normal;
 }

-h3 {
+h2 {
 	font-size: 16px;
 }

@@ -63,39 +54,33 @@ ul, ol, dl {
 }

 a img {
-	border: 0
+	border:0
 }
 abbr {
 	border: 0;
 	font-variant: normal;
 }

-fieldset {
-	border: 0;
-	padding: 0;
-	margin: 0;
-}
-
 label {
 	cursor: pointer;
 }

 #logo {
 	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 */
+	color: #999;
 	height: 84px;
 	font-size: 20px;
-	font-weight: 400;
+	font-weight: normal;
 	line-height: 1.3em;
 	margin: -130px auto 25px;
 	padding: 0;
@@ -106,7 +91,6 @@ label {
 	overflow: hidden;
 	display: block;
 }
-
 .step {
 	margin: 20px 0 15px;
 }
@@ -116,14 +100,15 @@ label {
 }
 .language-chooser.wp-core-ui .step .button.button-large {
 	height: 36px;
-	font-size: 14px;
-	line-height: 33px;
 	vertical-align: middle;
+	font-size: 14px;
 }
 textarea {
-	border: 1px solid #ddd;
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+	border: 1px solid #dfdfdf;
+	font-family: "Open Sans", sans-serif;
 	width: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

@@ -163,27 +148,26 @@ textarea {
 	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,
 .form-table.install-success td {
 	vertical-align: middle;
 	padding: 16px 0 16px 20px;
@@ -213,10 +197,73 @@ 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;
-	background-color: #fbeaea;
+	border: 1px solid #c00;
+	padding: 0.5em 0.7em;
+	margin: 5px 0 15px;
+	background-color: #ffebe8;
 }

 /* rtl:ignore */
@@ -232,6 +279,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,
@@ -257,7 +318,7 @@ body.rtl,
 	}
 }

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

 	.form-table {
 		margin-top: 0;
@@ -298,6 +359,8 @@ body.rtl,
 		padding: 7px 10px;
 		display: block;
 		max-width: none;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
 		box-sizing: border-box;
 	}

@@ -316,7 +379,7 @@ body.language-chooser {
 	color: #32373c;
 	font-size: 16px;
 	font-family: Arial, sans-serif;
-	font-weight: 400;
+	font-weight: normal;
 }

 .language-chooser p {
@@ -325,21 +388,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;
@@ -351,11 +412,12 @@ body.language-chooser {

 .step .spinner {
 	display: inline-block;
-	vertical-align: middle;
+	margin-top: 8px;
 	margin-left: 15px;
+	vertical-align: top;
 }

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