Tag 4.4.4

Built from https://develop.svn.wordpress.org/tags/4.4.4@37846 git-svn-id: http://core.svn.wordpress.org/tags/4.4.4@37810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Bump 4.4 branch to 4.4.4.
2016-06-26 13:56:51 +00:00 · 2016-06-21 16:21:26 +00:00 · 2016-06-21 14:53:31 +00:00 · 2016-06-21 14:51:29 +00:00 · 2016-06-21 14:42:29 +00:00 · 2016-06-21 14:32:27 +00:00
2376 changed files with 148135 additions and 898856 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 __DIR__ . '/wp-blog-header.php';
+require( dirname( __FILE__ ) . '/wp-blog-header.php' );
--- a/license.txt
+++ b/license.txt
@@ -1,6 +1,6 @@
 WordPress - Web publishing software

-Copyright 2011-2020 by the contributors
+Copyright 2016 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
@@ -19,7 +19,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 This program incorporates work covered by the following copyright and
 permission notices:

-  b2 is (c) 2001, 2002 Michel Valdrighi - https://cafelog.com
+  b2 is (c) 2001, 2002 Michel Valdrighi - m@tidakada.com -
+  http://tidakada.com

  Wherever third party code has been used, credit has been given in the code's
  comments.
--- 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,6 +9,7 @@
 <body>
 <h1 id="logo">
 	<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
+	<br /> Version 4.4.4
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>

@@ -26,13 +27,14 @@
 			<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser.</li>
 		</ol>
 	</li>
-	<li>Once the configuration file is set up, the installer will set up the tables needed for your site. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="https://wordpress.org/support/forums/">WordPress support forums</a> with as much data as you can gather.</li>
+	<li>Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="https://wordpress.org/support/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
 	<li><strong>If you did not enter a password, note the password given to you.</strong> If you did not provide a username, it will be <code>admin</code>.</li>
 	<li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on &#8220;Profile&#8221; to change the password.</li>
 </ol>

 <h2>Updating</h2>
 <h3>Using the Automatic Updater</h3>
+<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>
@@ -47,20 +49,19 @@
 </ol>

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

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

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

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

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

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

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

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

 </body>
 </html>
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -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,66 +9,19 @@
 define( 'WP_INSTALLING', true );

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

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

-if ( ! is_multisite() ) {
+if ( !is_multisite() ) {
 	wp_redirect( wp_registration_url() );
 	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 ( remove_query_arg( false ) !== $redirect_url ) {
-		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 ( null === $result && 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 ( null === $result || ( 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, true ) ) {
-		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.
+// 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,104 +58,73 @@ function wpmu_activate_stylesheet() {
 		#submit, #key { width: 90%; font-size: 24px; }
 		#language { margin-top: .5em; }
 		.error { background: #f66; }
-		span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: 600; }
+		span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: bold; }
 	</style>
 	<?php
 }
 add_action( 'wp_head', 'wpmu_activate_stylesheet' );
-add_action( 'wp_head', 'wp_sensitive_page_meta' );

 get_header( 'wp-activate' );
-
-$blog_details = get_blog_details();
 ?>

 <div id="signup-content" class="widecolumn">
 	<div class="wp-activate-container">
-	<?php if ( ! $key ) { ?>
+	<?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( $blog_details->path . '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, true ) ) {
-			$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 address, 4: Lost password URL. */
-					__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-					network_site_url( $blog_details->path . '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 address, 4: Lost password URL. */
-					__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-					sprintf( '<a href="http://%1$s%2$s">%1$s%2$s</a>', $signup->domain, $blog_details->path ),
-					$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 ( null === $result || 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 && network_home_url( '', 'http' ) !== $url ) :
-				switch_to_blog( (int) $result['blog_id'] );
-				$login_url = wp_login_url();
-				restore_current_blog();
+			<?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
-					printf(
-						/* translators: 1: Login URL, 2: Network home URL. */
-						__( '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( $blog_details->path . 'wp-login.php', 'login' ),
-						network_home_url( $blog_details->path )
-					);
-				?>
-				</p>
-				<?php
-				endif;
+				<p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) ); ?></p>
+			<?php else: ?>
+				<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p>
+			<?php endif;
 		}
 	}
 	?>
@@ -216,5 +134,4 @@ $blog_details = get_blog_details();
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php
-get_footer( 'wp-activate' );
+<?php get_footer( 'wp-activate' );
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -7,519 +7,215 @@
 */

 /** WordPress Administration Bootstrap */
-require_once __DIR__ . '/admin.php';
+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' ) );
+if ( current_user_can( 'install_plugins' ) ) {
+	add_thickbox();
+	wp_enqueue_script( 'plugin-install' );
+}

-require_once ABSPATH . 'wp-admin/admin-header.php';
+$video_url = 'https://videopress.com/embed/J44FHXvg?hd=true';
+$locale    = str_replace( '_', '-', get_locale() );
+list( $locale ) = explode( '-', $locale );
+if ( 'en' !== $locale ) {
+	$video_url = add_query_arg( 'defaultLangCode', $locale, $video_url );
+}
+
+wp_oembed_add_host_js();
+
+$title = __( 'About' );
+
+list( $display_version ) = explode( '-', $wp_version );
+
+include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
-	<div class="wrap about__container">
+	<div class="wrap about-wrap">
+		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>

-		<div class="about__header">
-			<div class="about__header-image">
-				<picture>
-					<source media="(max-width: 782px)" srcset="data:image/svg+xml,<?php echo rawurlencode( '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 205 109" width="205"><g fill="none" fill-rule="evenodd"><path fill="#000" fill-rule="nonzero" d="M65.901 108.433c2.546-5.254 4.927-9.195 7.143-11.822H1.246v-5.173h71.798c-2.216-2.627-4.597-6.568-7.143-11.822h4.31c5.173 5.993 10.592 10.427 16.257 13.3v2.217c-5.665 2.791-11.084 7.225-16.256 13.3h-4.31z"/><path fill="#000" fill-rule="nonzero" d="M29.345 26.834c-.129 1.365-.633 2.432-1.512 3.2-.879.76-2.048 1.142-3.507 1.142-1.02 0-1.919-.24-2.698-.72-.773-.487-1.371-1.176-1.793-2.066-.422-.891-.641-1.925-.659-3.103v-1.195c0-1.207.214-2.27.642-3.19.427-.92 1.04-1.63 1.836-2.128.803-.498 1.729-.747 2.778-.747 1.412 0 2.549.384 3.41 1.152.861.767 1.362 1.851 1.503 3.252H27.13c-.105-.92-.375-1.582-.809-1.987-.427-.41-1.057-.615-1.89-.615-.966 0-1.71.355-2.232 1.064-.515.703-.779 1.737-.79 3.102v1.134c0 1.383.245 2.437.738 3.164.498.727 1.224 1.09 2.18 1.09.872 0 1.529-.197 1.968-.59.44-.392.718-1.045.835-1.959h2.215zm14.008-1.898c0 1.253-.217 2.355-.65 3.304-.434.944-1.055 1.67-1.864 2.18-.803.504-1.728.756-2.777.756-1.037 0-1.963-.252-2.777-.756-.809-.51-1.436-1.234-1.881-2.171-.44-.938-.662-2.018-.668-3.243v-.72c0-1.249.22-2.35.659-3.306.445-.955 1.07-1.684 1.872-2.188.809-.51 1.734-.765 2.777-.765 1.043 0 1.966.252 2.769.756.808.498 1.432 1.219 1.872 2.162.44.938.662 2.03.668 3.279v.712zm-2.224-.668c0-1.418-.27-2.505-.808-3.261-.534-.756-1.292-1.134-2.277-1.134-.96 0-1.714.378-2.258 1.134-.54.75-.815 1.813-.827 3.19v.739c0 1.406.273 2.493.818 3.26.55.768 1.312 1.152 2.285 1.152.984 0 1.74-.375 2.267-1.125.534-.75.8-1.846.8-3.287v-.668zM47.368 31V18.203h3.78c1.13 0 2.132.252 3.005.756a5.146 5.146 0 012.039 2.145c.48.925.72 1.986.72 3.181v.642c0 1.213-.243 2.28-.729 3.199a5.057 5.057 0 01-2.065 2.127c-.89.498-1.913.747-3.068.747h-3.682zm2.223-11.004v9.229h1.45c1.167 0 2.06-.364 2.681-1.09.627-.733.947-1.782.958-3.147v-.712c0-1.388-.302-2.449-.905-3.181-.604-.733-1.48-1.099-2.628-1.099h-1.556zm18.816 5.291h-5.256v3.938h6.144V31h-8.368V18.203h8.306v1.793h-6.082v3.533h5.256v1.758zM81.534 31H79.32V18.203h2.215V31zm11.222-3.296c0-.562-.199-.996-.597-1.3-.393-.305-1.105-.613-2.136-.924-1.031-.31-1.852-.656-2.461-1.037-1.166-.732-1.75-1.687-1.75-2.865 0-1.031.42-1.88 1.258-2.549.843-.668 1.936-1.002 3.278-1.002.89 0 1.685.164 2.382.492a3.898 3.898 0 011.643 1.407c.399.603.598 1.274.598 2.013h-2.215c0-.669-.21-1.19-.633-1.565-.416-.38-1.013-.571-1.793-.571-.726 0-1.292.155-1.696.466-.398.31-.598.744-.598 1.3 0 .47.217.862.65 1.178.434.31 1.15.615 2.145.914.996.293 1.796.63 2.4 1.01.603.376 1.046.81 1.327 1.302.281.486.422 1.057.422 1.713 0 1.067-.41 1.916-1.23 2.55-.815.626-1.923.94-3.323.94-.926 0-1.778-.17-2.558-.51-.773-.346-1.376-.82-1.81-1.424-.428-.603-.642-1.306-.642-2.11h2.224c0 .727.24 1.29.72 1.688.481.399 1.17.598 2.066.598.774 0 1.354-.155 1.74-.466.393-.316.59-.732.59-1.248zm14.481-1.459V31h-2.224V18.203h4.896c1.43 0 2.563.372 3.401 1.116.844.745 1.266 1.729 1.266 2.954 0 1.253-.413 2.229-1.239 2.926-.821.697-1.972 1.046-3.454 1.046h-2.646zm0-1.784h2.672c.791 0 1.395-.185 1.811-.554.416-.375.624-.914.624-1.617 0-.691-.211-1.242-.633-1.652-.422-.416-1.002-.63-1.74-.642h-2.734v4.465zm21.303.475c0 1.253-.217 2.355-.65 3.304-.434.944-1.055 1.67-1.864 2.18-.802.504-1.728.756-2.777.756-1.037 0-1.963-.252-2.777-.756-.809-.51-1.436-1.234-1.881-2.171-.44-.938-.662-2.018-.668-3.243v-.72c0-1.249.22-2.35.659-3.306.445-.955 1.069-1.684 1.872-2.188.809-.51 1.734-.765 2.777-.765 1.043 0 1.966.252 2.769.756.809.498 1.433 1.219 1.872 2.162.44.938.662 2.03.668 3.279v.712zm-2.224-.668c0-1.418-.269-2.505-.808-3.261-.533-.756-1.292-1.134-2.277-1.134-.96 0-1.713.378-2.258 1.134-.539.75-.815 1.813-.827 3.19v.739c0 1.406.273 2.493.818 3.26.551.768 1.312 1.152 2.285 1.152.984 0 1.74-.375 2.268-1.125.533-.75.799-1.846.799-3.287v-.668zm13.718 1.02h-5.255v3.937h6.143V31h-8.367V18.203h8.306v1.793h-6.082v3.533h5.255v1.758zm13.92-5.292h-3.99V31h-2.206V19.996h-3.955v-1.793h10.151v1.793zm8.19 6.073h-2.478V31h-2.224V18.203h4.5c1.477 0 2.616.331 3.419.993.803.662 1.204 1.62 1.204 2.874 0 .856-.208 1.574-.624 2.154-.41.574-.984 1.016-1.723 1.327l2.874 5.335V31h-2.381l-2.567-4.93zm-2.478-1.784h2.285c.75 0 1.336-.187 1.758-.562.421-.381.632-.9.632-1.556 0-.686-.196-1.216-.588-1.59-.387-.376-.967-.57-1.741-.58h-2.346v4.288zm14.561-.017l2.945-6.065h2.461l-4.289 8.086V31h-2.233v-4.71l-4.298-8.087h2.47l2.944 6.065z"/><path stroke="#000" stroke-width="2" d="M2 1h201v46H2z"/></g></svg>' ); ?>" />
-					<img alt="<?php _e( 'Code is Poetry' ); ?>" src="data:image/svg+xml,<?php echo rawurlencode( '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1210 48"><path fill="#000" d="M65.875 39.875c2.583-5.333 5-9.333 7.25-12H.25v-5.25h72.875c-2.25-2.667-4.667-6.667-7.25-12h4.375c5.25 6.083 10.75 10.583 16.5 13.5v2.25c-5.75 2.833-11.25 7.333-16.5 13.5h-4.375zM1035.34 26.834c-.12 1.365-.63 2.432-1.51 3.2-.88.76-2.04 1.142-3.5 1.142-1.02 0-1.92-.24-2.7-.72-.78-.487-1.37-1.176-1.79-2.066-.43-.891-.65-1.925-.66-3.103v-1.195c0-1.207.21-2.27.64-3.19.43-.92 1.04-1.63 1.83-2.128.81-.498 1.73-.747 2.78-.747 1.41 0 2.55.384 3.41 1.152.86.767 1.36 1.851 1.5 3.252h-2.21c-.11-.92-.37-1.582-.81-1.987-.43-.41-1.06-.615-1.89-.615-.96 0-1.71.355-2.23 1.064-.52.703-.78 1.737-.79 3.102v1.134c0 1.383.24 2.437.74 3.164.49.727 1.22 1.09 2.18 1.09.87 0 1.53-.197 1.97-.59.43-.392.71-1.045.83-1.959h2.21zm14.01-1.898c0 1.253-.21 2.355-.65 3.304-.43.944-1.05 1.67-1.86 2.18-.8.504-1.73.756-2.78.756-1.04 0-1.96-.252-2.78-.756-.8-.51-1.43-1.234-1.88-2.171-.44-.938-.66-2.018-.66-3.243v-.72c0-1.249.22-2.35.65-3.306.45-.955 1.07-1.684 1.88-2.188.81-.51 1.73-.765 2.77-.765 1.05 0 1.97.252 2.77.756.81.498 1.44 1.219 1.87 2.162.44.938.67 2.03.67 3.279v.712zm-2.22-.668c0-1.418-.27-2.505-.81-3.261-.53-.756-1.29-1.134-2.28-1.134-.96 0-1.71.378-2.25 1.134-.54.75-.82 1.813-.83 3.19v.739c0 1.406.27 2.493.82 3.26.55.768 1.31 1.152 2.28 1.152.99 0 1.74-.375 2.27-1.125s.8-1.846.8-3.287v-.668zm6.24 6.732V18.203h3.78c1.13 0 2.13.252 3 .756a5.138 5.138 0 012.04 2.145c.48.925.72 1.986.72 3.181v.642c0 1.213-.24 2.28-.73 3.199a5.08 5.08 0 01-2.06 2.127c-.89.498-1.92.747-3.07.747h-3.68zm2.22-11.004v9.229h1.45c1.17 0 2.06-.364 2.68-1.09.63-.733.95-1.782.96-3.147v-.712c0-1.388-.3-2.449-.9-3.181-.61-.733-1.48-1.099-2.63-1.099h-1.56zm18.82 5.291h-5.26v3.938h6.14V31h-8.36V18.203h8.3v1.793h-6.08v3.533h5.26v1.758zM1087.53 31h-2.21V18.203h2.21V31zm11.23-3.296c0-.562-.2-.996-.6-1.3-.39-.305-1.11-.613-2.14-.924-1.03-.31-1.85-.656-2.46-1.037-1.16-.732-1.75-1.687-1.75-2.865 0-1.031.42-1.88 1.26-2.549.84-.668 1.94-1.002 3.28-1.002.89 0 1.68.164 2.38.492.7.329 1.25.797 1.64 1.407.4.603.6 1.274.6 2.013h-2.21c0-.669-.21-1.19-.64-1.565-.41-.38-1.01-.571-1.79-.571-.73 0-1.29.155-1.7.466-.39.31-.59.744-.59 1.3 0 .47.21.862.65 1.178.43.31 1.15.615 2.14.914 1 .293 1.8.63 2.4 1.01.6.376 1.05.81 1.33 1.302.28.486.42 1.057.42 1.713 0 1.067-.41 1.916-1.23 2.55-.82.626-1.92.94-3.32.94-.93 0-1.78-.17-2.56-.51-.77-.346-1.38-.82-1.81-1.424-.43-.603-.64-1.306-.64-2.11h2.22c0 .727.24 1.29.72 1.688.48.399 1.17.598 2.07.598.77 0 1.35-.155 1.74-.466.39-.316.59-.732.59-1.248zm14.48-1.459V31h-2.23V18.203h4.9c1.43 0 2.56.372 3.4 1.116.84.745 1.27 1.729 1.27 2.954 0 1.253-.42 2.229-1.24 2.926-.82.697-1.97 1.046-3.46 1.046h-2.64zm0-1.784h2.67c.79 0 1.39-.185 1.81-.554.42-.375.62-.914.62-1.617 0-.691-.21-1.242-.63-1.652-.42-.416-1-.63-1.74-.642h-2.73v4.465zm21.3.475c0 1.253-.22 2.355-.65 3.304-.43.944-1.06 1.67-1.86 2.18-.81.504-1.73.756-2.78.756-1.04 0-1.96-.252-2.78-.756-.81-.51-1.43-1.234-1.88-2.171-.44-.938-.66-2.018-.67-3.243v-.72c0-1.249.22-2.35.66-3.306.45-.955 1.07-1.684 1.87-2.188.81-.51 1.74-.765 2.78-.765 1.04 0 1.97.252 2.77.756.81.498 1.43 1.219 1.87 2.162.44.938.66 2.03.67 3.279v.712zm-2.22-.668c0-1.418-.27-2.505-.81-3.261-.54-.756-1.29-1.134-2.28-1.134-.96 0-1.71.378-2.26 1.134-.54.75-.81 1.813-.82 3.19v.739c0 1.406.27 2.493.81 3.26.55.768 1.32 1.152 2.29 1.152.98 0 1.74-.375 2.27-1.125s.8-1.846.8-3.287v-.668zm13.71 1.02h-5.25v3.937h6.14V31h-8.37V18.203h8.31v1.793h-6.08v3.533h5.25v1.758zm13.92-5.292h-3.99V31h-2.2V19.996h-3.96v-1.793h10.15v1.793zm8.19 6.073h-2.47V31h-2.23V18.203h4.5c1.48 0 2.62.331 3.42.993.8.662 1.21 1.62 1.21 2.874 0 .856-.21 1.574-.63 2.154-.41.574-.98 1.016-1.72 1.327l2.87 5.335V31h-2.38l-2.57-4.93zm-2.47-1.784h2.28c.75 0 1.34-.187 1.76-.562.42-.381.63-.9.63-1.556 0-.686-.19-1.216-.59-1.59-.38-.376-.96-.57-1.74-.58h-2.34v4.288zm14.56-.017l2.94-6.065h2.46l-4.29 8.086V31h-2.23v-4.71l-4.3-8.087h2.47l2.95 6.065z"/><path stroke="#000" stroke-width="2" d="M1008 1h201v46h-201z"/></svg>' ); ?>" />
-				</picture>
-			</div>
+		<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes your site more connected and responsive.' ), $display_version ); ?></div>
+		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

-			<div class="about__header-container">
-				<div class="about__header-title">
-					<p>
-						<?php _e( 'WordPress' ); ?>
-						<?php echo $display_version; ?>
-					</p>
-				</div>
+		<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>
+		</h2>

-				<div class="about__header-text">
-					<?php _e( 'Sharing your stories has never been easier' ); ?>
-				</div>
-				<div class="about__header-badge">
-					<img alt="<?php _e( 'New' ); ?>" src="data:image/svg+xml,<?php echo rawurlencode( '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 153 153" width="115"><circle cx="76.5" cy="76.5" r="76.5" fill="#000"/><path fill="#D1CFE4" d="M53.333 86h-2.827L39.769 69.564V86H36.94V64.672h2.828L50.535 81.18V64.67h2.798V86zm26.05-9.858h-9.242V83.7h10.737V86h-13.55V64.672h13.403v2.314h-10.59v6.856h9.243v2.3zm18.596 3.134l.41 2.813.6-2.534 4.219-14.883h2.373l4.116 14.883.586 2.578.454-2.871 3.311-14.59h2.827L111.704 86h-2.563l-4.395-15.542-.337-1.626-.337 1.626L99.517 86h-2.564l-5.156-21.328h2.812l3.37 14.604z"/></svg>' ); ?>" />
-				</div>
-			</div>
-
-			<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-				<a href="about.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'What&#8217;s New' ); ?></a>
-				<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-				<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-				<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-			</nav>
-		</div>
-
-		<div class="about__section is-feature">
-			<h1 class="aligncenter">
-				<?php
-				printf(
-					/* translators: %s: The current WordPress version number. */
-					__( 'Welcome to WordPress %s.' ),
-					$display_version
-				);
-				?>
-			</h1>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: The current WordPress version number. */
-					__( 'WordPress %s brings you countless ways to set your ideas free and bring them to life. With a brand-new default theme as your canvas, it supports an ever-growing collection of blocks as your brushes. Paint with words. Pictures. Sound. Or rich embedded media.' ),
-					$display_version
-				);
-				?>
+		<div class="changelog point-releases">
+			<h3><?php _e( 'Maintenance and Security Releases' ); ?> </h3>
+			<p><?php printf( __( '<strong>Version %1$s</strong> addressed some security issues.' ), '4.4.4' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.4.4' ); ?>
+			</p>
+			<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+				'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 6 ), '4.4.3', number_format_i18n( 6 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.4.3' ); ?>
+			</p>
+			<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+				'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 17 ), '4.4.2', number_format_i18n( 17 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.4.2' ); ?>
+			</p>
+			<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+				'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 52 ), '4.4.1', number_format_i18n( 52 ) ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.4.1' ); ?>
 			</p>
 		</div>

-		<div class="about__section changelog">
-			<div class="column has-border has-subtle-background-color">
-				<h2 class="is-smaller-heading"><?php _e( 'Maintenance and Security Releases' ); ?></h2>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.6.12'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '5.6.12' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.6.11'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '5.6.11' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.6.10'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '5.6.10' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.6.9'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '5.6.9' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed one security issue.' ),
-						'5.6.8'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '5.6.8' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.6.7'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '5.6.7' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed one security issue.' ),
-						'5.6.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.6.6' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.6.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.6.5' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed one security issue.' ),
-						'5.6.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.6.4' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'5.6.3'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '5.6.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.',
-							5
-						),
-						'5.6.2',
-						number_format_i18n( 5 )
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL. */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version. */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '5.6.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.',
-							27
-						),
-						'5.6.1',
-						number_format_i18n( 27 )
-					);
-					?>
-					<?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.6.1' )
-						)
-					);
-					?>
-				</p>
-			</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="has-background-image" style="background-image: url('data:image/svg+xml,<?php echo rawurlencode( '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1035 884"><circle cx="503" cy="434" r="310" fill="#E3DAD1"/><circle cx="831" cy="204" r="204" fill="#D1CFE4"/><circle cx="113.5" cy="770.5" r="113.5" fill="#D1DEE4"/></svg>' ); ?>');">
-			<div class="about__section has-2-columns is-wider-left has-transparent-background-color">
-				<div class="column">
-					<h2><?php _e( 'Greater layout flexibility' ); ?></h2>
-					<p><?php _e( 'Bring your stories to life with more tools that let you edit your layout with or without code. Single column blocks, designs using mixed widths and columns, full-width headers, and videos in your cover block—make small changes or big statements with equal ease!' ); ?></p>
-				</div>
+		<div class="headline-feature feature-section one-col">
+			<h2><?php _e( 'Twenty Sixteen' ); ?></h2>
+			<div class="media-container">
+				<img src="https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-2x.png" alt="" srcset="https://s.w.org/images/core/4.4/twenty-sixteen-white-smartphone-1x.png 268w, https://s.w.org/images/core/4.4/twenty-sixteen-white-smartphone-2x.png 536w, https://s.w.org/images/core/4.4/twenty-sixteen-white-tablet-1x.png 558w, https://s.w.org/images/core/4.4/twenty-sixteen-white-desktop-1x.png 840w, https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-1x.png 1086w, https://s.w.org/images/core/4.4/twenty-sixteen-white-tablet-2x.png 1116w, https://s.w.org/images/core/4.4/twenty-sixteen-white-desktop-2x.png 1680w, https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-2x.png 2172w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .8), (max-width: 1290px) calc((100vw - 240px) * .8), 840px" />
 			</div>
-			<div class="about__section has-2-columns is-wider-right has-transparent-background-color">
-				<div class="column"><!-- space for alignment. --></div>
-				<div class="column">
-					<h2><?php _e( 'More block patterns' ); ?></h2>
-					<p><?php _e( 'In select themes, preconfigured block patterns make setting up standard pages on your site a breeze. Find the power of patterns to streamline your workflow, or share some of that power with your clients and save yourself a few clicks.' ); ?></p>
+			<div class="two-col">
+				<div class="col">
+					<h3><?php _e( 'Introducing Twenty Sixteen' ); ?></h3>
+					<p><?php _e( 'Our newest default theme, Twenty Sixteen, is a modern take on a classic blog design.' ); ?></p>
+					<p><?php _e( 'Twenty Sixteen was built to look great on any device. A fluid grid design, flexible header, fun color schemes, and more, will make your content shine.' ); ?></p>
+					<div class="horizontal-image">
+						<div class="content">
+							<img class="feature-image horizontal-screen" src="https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-2x.png?2" alt=""  srcset="https://s.w.org/images/core/4.4/twenty-sixteen-dark-smartphone-1x.png?2 268w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-smartphone-2x.png?2 535w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-desktop-1x.png?2 558w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-1x.png?2 783w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-desktop-2x.png?2 1116w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-2x.png?2 1566w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .5216), (max-width: 1290px) calc((100vw - 240px) * .5216), 548px" />
+						</div>
+					</div>
 				</div>
-			</div>
-			<div class="about__section has-2-columns is-wider-left has-transparent-background-color">
-				<div class="column">
-					<h2><?php _e( 'Upload video captions directly in the block editor' ); ?></h2>
-					<p><?php _e( 'To help you add subtitles or captions to your videos, you can now upload them within your post or page. This makes it easier than ever to make your videos accessible for anyone who needs or prefers to use subtitles.' ); ?></p>
+				<div class="col feature-image">
+					<img class="vertical-screen" src="https://s.w.org/images/core/4.4/twenty-sixteen-red-fullsize-2x.png" alt="" srcset="https://s.w.org/images/core/4.4/twenty-sixteen-red-smartphone-1x.png 107w, https://s.w.org/images/core/4.4/twenty-sixteen-red-smartphone-2x.png 214w, https://s.w.org/images/core/4.4/twenty-sixteen-red-desktop-1x.png 252w, https://s.w.org/images/core/4.4/twenty-sixteen-red-fullsize-1x.png 410w, https://s.w.org/images/core/4.4/twenty-sixteen-red-desktop-2x.png 504w, https://s.w.org/images/core/4.4/twenty-sixteen-red-fullsize-2x.png 820w" sizes="(max-width: 500px) calc((100vw - 40px) * .32), (max-width: 782px) calc((100vw - 70px) * .32), (max-width: 960px) calc((100vw - 116px) * .24), (max-width: 1290px) calc((100vw - 240px) * .24), 252px" />
 				</div>
 			</div>
 		</div>

-		<hr class="is-large" />
-
-		<div class="about__section has-1-column">
-			<h2><?php _e( 'Twenty Twenty-One is here!' ); ?></h2>
-			<p>
-				<?php
-				_e( 'Twenty Twenty-One is a blank canvas for your ideas, and the block editor is the best brush. It is built for the block editor and packed with brand-new block patterns you can only get in the default themes. Try different layouts in a matter of seconds, and let the theme’s eye-catching, yet timeless design make your work shine.' );
-				?>
-			</p>
-		</div>
-
 		<hr />

-		<div class="about__section">
-			<div class="column about__image is-edge-to-edge">
-				<img src="https://s.w.org/images/core/5.6/twentytwentyone-layouts.jpg" alt="" />
+		<div class="feature-section two-col">
+			<div class="col">
+				<div class="media-container">
+					<img src="https://s.w.org/images/core/4.4/responsive-devices-fullsize-2x.png" alt="" srcset="https://s.w.org/images/core/4.4/responsive-devices-smartphone-1x.png 335w, https://s.w.org/images/core/4.4/responsive-devices-desktop-1x.png 500w, https://s.w.org/images/core/4.4/responsive-devices-smartphone-2x.png 670w, https://s.w.org/images/core/4.4/responsive-devices-tablet-1x.png 698w, https://s.w.org/images/core/4.4/responsive-devices-desktop-2x.png 1000w, https://s.w.org/images/core/4.4/responsive-devices-fullsize-1x.png 1200w, https://s.w.org/images/core/4.4/responsive-devices-tablet-2x.png 1396w, https://s.w.org/images/core/4.4/responsive-devices-fullsize-2x.png 2400w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 782px) calc(100vw - 70px), (max-width: 960px) calc((100vw - 116px) * .476), (max-width: 1290px) calc((100vw - 240px) * .476), 500px" />
+				</div>
+			</div>
+			<div class="col">
+				<h3><?php _e( 'Responsive images' ); ?></h3>
+				<p><?php _e( 'WordPress now takes a smarter approach to displaying appropriate image sizes on any device, ensuring a perfect fit every time. You don&#8217;t need to do anything to your theme, it just works.' ); ?></p>
 			</div>
 		</div>

 		<hr />

-		<div class="about__section has-overlap-style">
-			<div class="column is-vertically-aligned-center is-top-layer">
-				<p>
-					<?php
-					printf(
-						/* translators: 1: WordPress accessibility-ready guidelines link, 2: WCAG information link. */
-						__( 'What’s more, this default theme puts accessibility at the heart of your website. It conforms to the <a href="%1$s">WordPress accessibility-ready guidelines</a> and addresses several more specialized standards from the <a href="%2$s">Web Content Accessibility Guidelines (WCAG) 2.1 at level AAA</a>. It will help you meet the highest level of international accessibility standards when you create accessible content and choose plugins which are accessible too!' ),
-						'https://make.wordpress.org/themes/handbook/review/accessibility/',
-						'https://www.w3.org/WAI/WCAG2AAA-Conformance'
-					);
-					?>
-				</p>
+		<div class="feature-section two-col">
+			<div class="col">
+				<div class="embed-container">
+					<blockquote data-secret="OcUe7B6Edh" class="wp-embedded-content"><a href="https://wordpress.org/news/2015/12/clifford/">WordPress 4.4 &ldquo;Clifford&rdquo;</a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;" src="https://wordpress.org/news/2015/12/clifford/embed/#?secret=OcUe7B6Edh" data-secret="OcUe7B6Edh" width="600" height="338" title="<?php esc_attr_e( 'Embedded WordPress Post' ); ?>" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
+				</div>
 			</div>
-			<div class="column about__image aligncenter is-edge-to-edge">
-				<img src="data:image/svg+xml,<?php echo rawurlencode( '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 440 291"><circle cx="294.5" cy="145.5" r="145.5" fill="#E5D1D1"/><circle cx="106.5" cy="106.5" r="106.5" fill="#EEEADD"/></svg>' ); ?>" style="max-width:25em" alt="" />
+			<div class="col">
+				<h3><?php _e( 'Embed your WordPress content' ); ?></h3>
+				<p><?php _e( 'Now you can embed your posts on other sites, even other WordPress sites. Simply drop a post URL into the editor and see an instant embed preview, complete with the title, excerpt, and featured image if you&#8217;ve set one. We&#8217;ll even include your site icon and links for comments and sharing.' ); ?></p>
 			</div>
 		</div>

 		<hr />

-		<div class="about__section has-2-columns">
-			<div class="column is-vertically-aligned-center">
-				<h3 class="is-larger-heading"><?php _e( 'A rainbow of soft pastels' ); ?></h3>
+		<div class="feature-section two-col">
+			<div class="col">
+				<div class="embed-container embed-reverbnation">
+					<iframe width="640" height="150" scrolling="no" frameborder="no" src="https://www.reverbnation.com/widget_code/html_widget/artist_607?widget_id=55&amp;pwc[song_ids]=3731874&amp;pwc[size]=small"></iframe>
+				</div>
 			</div>
-			<div class="column">
-				<p><?php _e( 'Perfect for a new year, Twenty Twenty-One gives you a range of pre-selected color palettes in pastel, all of which meet AAA standards for contrast. You can also choose your own background color for the theme, and the theme chooses accessibility-conscious text colors for you — automatically!' ); ?></p>
-				<p><?php _e( 'Need more flexibility than that? You can also choose your own color palette from the color picker.' ); ?></p>
-			</div>
-		</div>
-
-		<div class="about__section">
-			<div class="column about__image is-edge-to-edge">
-				<img src="https://s.w.org/images/core/5.6/twentytwentyone-rainbow.png" alt="" />
-			</div>
-		</div>
-
-		<hr />
-		<hr class="is-large" />
-
-		<div class="about__section">
-			<header class="column is-edge-to-edge">
-				<h2><?php _e( 'Improvements for everyone' ); ?></h2>
-			</header>
-		</div>
-
-		<div class="about__section has-3-columns has-gutters">
-			<div class="column has-border" style="background-color:#eeeadd;background-color:var(--global--color-yellow)">
-				<h3><?php _e( 'Expanding auto-updates' ); ?></h3>
-				<p><?php _e( 'For years, only developers have been able to update WordPress automatically. But now, you have that option, right in your dashboard. If this is your first site, you have auto-updates ready to go, right now! Upgrading an existing site? No problem! Everything is the same as it was before.' ); ?></p>
-			</div>
-			<div class="column has-border" style="background-color:#e4d1d1;background-color:var(--global--color-red)">
-				<h3><?php _e( 'Accessibility statement template' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Accessibility statement feature plugin link. */
-						__( 'Even if you’re not an expert, you can start letting folks know about your site’s commitment to accessibility at the click of a button! The new <a href="%s">feature plugin</a> includes template copy for you to update and publish, and it’s written to support different contexts and jurisdictions.' ),
-						'https://github.com/10degrees/accessibility-statement-plugin'
-					);
-					?>
-				</p>
-			</div>
-			<div class="column has-border" style="background-color:#d1d1e4;background-color:var(--global--color-purple)">
-				<h3><?php _e( 'Built-in patterns' ); ?></h3>
-				<p><?php _e( 'If you’ve not had the chance to play with block patterns yet, all default themes now feature a range of block patterns that let you master complex layouts with minimal effort. Customize the patterns to your liking with the copy, images and colors that fit your story or brand.' ); ?></p>
+			<div class="col">
+				<h3><?php _e( 'Even more embed providers' ); ?></h3>
+				<p><?php _e( 'In addition to post embeds, WordPress 4.4 also adds support for five new oEmbed providers: Cloudup, Reddit&nbsp;Comments, ReverbNation, Speaker&nbsp;Deck, and VideoPress.' ); ?></p>
 			</div>
 		</div>

 		<hr />

-		<div class="about__section has-2-columns">
-			<h2 class="is-section-header"><?php _e( 'For developers' ); ?></h2>
-			<div class="column">
-				<h3><?php _e( 'REST API authentication with Application Passwords' ); ?></h3>
-				<p><?php _e( 'Thanks to the API’s new Application Passwords authorization feature, third-party apps can connect to your site seamlessly and securely. This new REST API feature lets you see what apps are connecting to your site and control what they do.' ); ?></p>
-			</div>
-			<div class="column">
-				<h3><?php _e( 'More PHP 8 support' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress and PHP 8 dev note link. */
-						__( '5.6 marks the first steps toward WordPress Core support for PHP 8. Now is a great time to start planning how your WordPress products, services and sites can support the latest PHP version. For more information about what to expect next, <a href="%s">read the PHP 8 developer note</a>.' ),
-						'https://make.wordpress.org/core/2020/11/23/wordpress-and-php-8-0/'
-					);
-					?>
-				</p>
-			</div>
-		</div>
-		<div class="about__section">
-			<div class="column">
-				<h3><?php _e( 'jQuery' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: jQuery update test plugin link. */
-						__( 'Updates to jQuery in WordPress take place across three releases: 5.5, 5.6, and 5.7. As we reach the mid-point of this process, run the <a href="%s">update test plugin</a> to check your sites for errors ahead of time.' ),
-						current_user_can( 'install_plugins' ) ?
-							esc_url( network_admin_url( 'plugin-install.php?tab=search&type=term&s=slug:wp-jquery-update-test' ) ) :
-							esc_url( __( 'https://wordpress.org/plugins/wp-jquery-update-test/' ) )
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: jQuery Migrate plugin link. */
-						__( 'If you find issues with the way your site looks (e.g. a slider doesn’t work, a button is stuck — that sort of thing), install the <a href="%s">jQuery Migrate plugin</a>.' ),
-						current_user_can( 'install_plugins' ) ?
-							esc_url( network_admin_url( 'plugin-install.php?tab=search&type=term&s=slug:enable-jquery-migrate-helper' ) ) :
-							esc_url( __( 'https://wordpress.org/plugins/enable-jquery-migrate-helper/' ) )
-					);
-					?>
-				</p>
-			</div>
-		</div>
+		<div class="changelog">
+			<h3><?php _e( 'Under the Hood' ); ?></h3>

-		<hr class="is-small" />
+			<div class="feature-section under-the-hood one-col">
+				<div class="col">
+					<h4><?php _e( 'REST API infrastructure' ); ?></h4>
+					<div class="two-col-text">
+						<p><?php _e( 'Infrastructure for the REST API has been integrated into core, marking a new era in developing with WordPress. The REST API serves to provide developers with a path forward for building and extending RESTful APIs on top of WordPress.' ); ?></p>
+						<p><?php
+							if ( current_user_can( 'install_plugins' ) ) {
+								$url_args = array(
+									'tab'       => 'plugin-information',
+									'plugin'    => 'rest-api',
+									'TB_iframe' => true,
+									'width'     => 600,
+									'height'    => 550
+								);

-		<div class="about__section">
-			<div class="column">
-				<h3><?php _e( 'Check the Field Guide for more!' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress 5.6 Field Guide link. */
-						__( 'Check out the latest version of the WordPress Field Guide. It highlights developer notes for each change you may want to be aware of. <a href="%s">WordPress 5.6 Field Guide.</a>' ),
-						'https://make.wordpress.org/core/2020/11/20/wordpress-5-6-field-guide/'
-					);
-					?>
-				</p>
+								$plugin_link = '<a href="' . esc_url( add_query_arg( $url_args, network_admin_url( 'plugin-install.php' ) ) ) . '" class="thickbox">WordPress REST API</a>';
+							} else {
+								$plugin_link = '<a href="https://wordpress.org/plugins/rest-api">WordPress REST API</a>';
+							}
+
+							/* translators: WordPress REST API plugin link */
+							printf( __( 'Infrastructure is the first part of a multi-stage rollout for the REST API. Inclusion of core endpoints is targeted for an upcoming release. To get a sneak peek of the core endpoints, and for more information on extending the REST API, check out the official %s plugin.' ), $plugin_link );
+						?></p>
+					</div>
+				</div>
 			</div>
-		</div>

-		<hr />
+			<div class="feature-section under-the-hood three-col">
+				<div class="col">
+					<h4><?php _e( 'Term meta' ); ?></h4>
+					<p><?php
+						/* translators: 1: add_term_meta() docs link, 2: get_term_meta() docs link, 3: update_term_meta() docs link */
+						printf( __( 'Terms now support metadata, just like posts. See %1$s, %2$s, and %3$s for more information.' ),
+							'<a href="https://developer.wordpress.org/reference/functions/add_term_meta"><code>add_term_meta()</code></a>',
+							'<a href="https://developer.wordpress.org/reference/functions/get_term_meta"><code>get_term_meta()</code></a>',
+							'<a href="https://developer.wordpress.org/reference/functions/update_term_meta"><code>update_term_meta()</code></a>'
+				         );
+					?></p>
+				</div>
+				<div class="col">
+					<h4><?php _e( 'Comment query improvements' ); ?></h4>
+					<p><?php
+						/* translators: WP_Comment_Query class name */
+						printf( __( 'Comment queries now have cache handling to improve performance. New arguments in %s make crafting robust comment queries simpler.' ), '<code>WP_Comment_Query</code>' );
+					?></p>
+				</div>
+				<div class="col">
+					<h4><?php _e( 'Term, comment, and network objects' ); ?></h4>
+					<p><?php
+						/* translators: 1: WP_Term class name, WP_Comment class name, WP_Network class name */
+						printf( __( 'New %1$s, %2$s, and %3$s objects make interacting with terms, comments, and networks more predictable and intuitive in code.' ),
+							'<code>WP_Term</code>',
+							'<code>WP_Comment</code>',
+							'<code>WP_Network</code>'
+						);
+					?></p>
+				</div>
+			</div>
+
+			<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="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( 'Go to Updates' ) : _e( 'Go 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

-require_once ABSPATH . 'wp-admin/admin-footer.php';
+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;
@@ -533,40 +229,22 @@ __( 'Security Releases' );
 __( 'Maintenance and Security Release' );
 __( 'Maintenance and Security Releases' );

-/* translators: %s: WordPress version number. */
+/* translators: %s: WordPress version number */
 __( '<strong>Version %s</strong> addressed one security issue.' );
-/* translators: %s: WordPress version number. */
+/* translators: %s: WordPress version number */
 __( '<strong>Version %s</strong> addressed some security issues.' );

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

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

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

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

 /**
- * Executing Ajax process.
+ * Executing AJAX process.
 *
 * @since 2.1.0
 */
@@ -19,24 +19,23 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 }

 /** Load WordPress Bootstrap */
-require_once dirname( __DIR__ ) . '/wp-load.php';
+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();

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

 /** Load WordPress Administration APIs */
-require_once ABSPATH . 'wp-admin/includes/admin.php';
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );

 /** Load Ajax Handlers for WordPress Core */
-require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
+require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+
+@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+@header( 'X-Robots-Tag: noindex' );

 send_nosniff_header();
 nocache_headers();
@@ -45,158 +44,59 @@ nocache_headers();
 do_action( 'admin_init' );

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

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

-// Deprecated.
-$core_actions_post_deprecated = array(
-	'wp-fullscreen-save-post',
-	'press-this-save-post',
-	'press-this-add-category',
-	'health-check-dotorg-communication',
-	'health-check-is-in-debug-mode',
-	'health-check-background-updates',
-	'health-check-loopback-requests',
-);
-$core_actions_post            = array_merge( $core_actions_post, $core_actions_post_deprecated );
+// Deprecated
+$core_actions_post[] = 'wp-fullscreen-save-post';

 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get, true ) ) {
+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, true ) ) {
+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' );
+// Default status
+die( '0' );
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -6,15 +6,9 @@
 * @subpackage Administration
 */

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

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

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

 /**
- * Prints scripts or data after the default footer scripts.
+ * Print scripts or data after the default footer scripts.
 *
- * The dynamic portion of the hook name, `$hook_suffix`,
+ * The dynamic portion of the hook name, `$GLOBALS['hook_suffix']`,
 * refers to the global hook suffix of the current page.
 *
 * @since 2.8.0
+ *
+ * @global string $hook_suffix
+ * @param string $hook_suffix The current admin page.
 */
-do_action( "admin_footer-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+do_action( "admin_footer-" . $GLOBALS['hook_suffix'] );

-// get_site_option() won't exist when auto upgrading from <= 2.7.
-if ( function_exists( 'get_site_option' ) ) {
-	if ( false === get_site_option( 'can_compress_scripts' ) ) {
+// 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') )
 		compression_test();
-	}
 }

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

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

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

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

 /**
 * In case admin-header.php is included in a function.
 *
 * @global string    $title
 * @global string    $hook_suffix
- * @global WP_Screen $current_screen     WordPress current screen object.
- * @global WP_Locale $wp_locale          WordPress date and time locale object.
+ * @global WP_Screen $current_screen
+ * @global WP_Locale $wp_locale
 * @global string    $pagenow
+ * @global string    $wp_version
 * @global string    $update_title
 * @global int       $total_update_count
 * @global string    $parent_file
 */
-global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
+global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version,
 	$update_title, $total_update_count, $parent_file;

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

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

-if ( is_network_admin() ) {
-	/* translators: Network admin screen title. %s: Network title. */
-	$admin_title = sprintf( __( 'Network Admin: %s' ), get_network()->site_name );
-} elseif ( is_user_admin() ) {
-	/* translators: User dashboard screen title. %s: Network title. */
-	$admin_title = sprintf( __( 'User Dashboard: %s' ), 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
 *
@@ -71,25 +59,27 @@ wp_user_settings();

 _wp_admin_html_begin();
 ?>
-<title><?php echo esc_html( $admin_title ); ?></title>
+<title><?php echo $admin_title; ?></title>
 <?php

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

-$admin_body_class = preg_replace( '/[^a-z0-9_-]+/i', '-', $hook_suffix );
+$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 <script type="text/javascript">
-addLoadEvent = function(func){if(typeof jQuery!=='undefined')jQuery(document).ready(func);else if(typeof wpOnload!=='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
-	pagenow = '<?php echo esc_js( $current_screen->id ); ?>',
-	typenow = '<?php echo esc_js( $current_screen->post_type ); ?>',
-	adminpage = '<?php echo esc_js( $admin_body_class ); ?>',
-	thousandsSeparator = '<?php echo esc_js( $wp_locale->number_format['thousands_sep'] ); ?>',
-	decimalPoint = '<?php echo esc_js( $wp_locale->number_format['decimal_point'] ); ?>',
+addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
+	pagenow = '<?php echo $current_screen->id; ?>',
+	typenow = '<?php echo $current_screen->post_type; ?>',
+	adminpage = '<?php echo $admin_body_class; ?>',
+	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
 	isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
+<meta name="viewport" content="width=device-width,initial-scale=1.0">
 <?php

 /**
@@ -106,7 +96,7 @@ do_action( 'admin_enqueue_scripts', $hook_suffix );
 *
 * @since 2.6.0
 */
-do_action( "admin_print_styles-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+do_action( "admin_print_styles-$hook_suffix" );

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

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

 /**
 * Fires in head section for all admin pages.
@@ -146,76 +136,45 @@ do_action( "admin_head-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConven
 */
 do_action( 'admin_head' );

-if ( 'f' === get_user_setting( 'mfold' ) ) {
+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( '.', ',' ), '-', (float) 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';
-	}
-}
-
-$error_get_last = error_get_last();
-
-// Print a CSS class to make PHP errors visible.
-if ( $error_get_last && WP_DEBUG && WP_DEBUG_DISPLAY && ini_get( 'display_errors' )
-	// Don't print the class for PHP notices in wp-config.php, as they happen before WP_DEBUG takes effect,
-	// and should not be displayed with the `error_reporting` level previously set in wp-load.php.
-	&& ( E_NOTICE !== $error_get_last['type'] || 'wp-config.php' !== wp_basename( $error_get_last['file'] ) )
-) {
-	$admin_body_class .= ' php-error';
-}
-
-unset( $error_get_last );
-
 ?>
 </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:
@@ -229,9 +188,8 @@ unset( $error_get_last );
 * @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>
@@ -244,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
@@ -258,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
 	 */
@@ -293,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 ( 'options-general.php' === $parent_file ) {
-	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 {
-	require_once dirname( __DIR__ ) . '/wp-load.php';
-}
+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,30 +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( __DIR__ ) . '/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.
@@ -46,18 +42,13 @@ if ( get_option( 'db_upgraded' ) ) {
 	 * @since 2.8.0
 	 */
 	do_action( 'after_db_upgrade' );
-
-} elseif ( ! wp_doing_ajax() && empty( $_POST )
-	&& (int) get_option( 'db_version' ) !== $wp_db_version
-) {
-
-	if ( ! is_multisite() ) {
+} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
+	if ( !is_multisite() ) {
 		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
 		exit;
-	}

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

 		/*
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) === 1 ) ) {
-			require_once ABSPATH . WPINC . '/http.php';
-			$response = wp_remote_get(
-				admin_url( 'upgrade.php?step=1' ),
-				array(
-					'timeout'     => 120,
-					'httpversion' => '1.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' ) );
 			/** 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' );
-}
+// Schedule trash collection
+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! 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
@@ -133,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 ) );
 }

 /**
@@ -168,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' ) ) {
-			// 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 {
+		// 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
 				$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 = '';
@@ -212,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.
@@ -234,40 +223,23 @@ if ( isset( $plugin_page ) ) {
 		 *
 		 * @since 2.1.0
 		 */
-		do_action( "load-{$page_hook}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! isset( $_GET['noheader'] ) ) {
-			require_once ABSPATH . 'wp-admin/admin-header.php';
-		}
+		do_action( 'load-' . $page_hook );
+		if (! isset($_GET['noheader']))
+			require_once(ABSPATH . 'wp-admin/admin-header.php');

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

-		if ( ! ( file_exists( WP_PLUGIN_DIR . "/$plugin_page" ) && is_file( WP_PLUGIN_DIR . "/$plugin_page" ) )
-			&& ! ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) && is_file( WPMU_PLUGIN_DIR . "/$plugin_page" ) )
-		) {
-			/* translators: %s: Admin page generated by a plugin. */
-			wp_die( sprintf( __( 'Cannot load %s.' ), htmlentities( $plugin_page ) ) );
-		}
+		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
+			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));

 		/**
 		 * Fires before a particular screen is loaded.
@@ -281,36 +253,33 @@ if ( isset( $plugin_page ) ) {
 		 *
 		 * @since 1.5.0
 		 */
-		do_action( "load-{$plugin_page}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+		do_action( 'load-' . $plugin_page );

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

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

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

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

 	$importer = $_GET['import'];

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

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

-	if ( ! isset( $wp_importers[ $importer ] ) || ! is_callable( $wp_importers[ $importer ][2] ) ) {
+	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
 		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 		exit;
 	}
@@ -322,19 +291,18 @@ if ( isset( $plugin_page ) ) {
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( "load-importer-{$importer}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+	do_action( 'load-importer-' . $importer );

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

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

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

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

 	/**
 	 * Whether to filter imported data through kses on import.
@@ -344,20 +312,20 @@ 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]);

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

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

-	exit;
+	exit();
 } else {
 	/**
 	 * Fires before a particular screen is loaded.
@@ -371,39 +339,33 @@ if ( isset( $plugin_page ) ) {
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( "load-{$pagenow}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+	do_action( 'load-' . $pagenow );

 	/*
 	 * The following hooks are fired to ensure backward compatibility.
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
-	if ( 'page' === $typenow ) {
-		if ( 'post-new.php' === $pagenow ) {
-			do_action( 'load-page-new.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		} elseif ( 'post.php' === $pagenow ) {
-			do_action( 'load-page.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		}
-	} elseif ( 'edit-tags.php' === $pagenow ) {
-		if ( 'category' === $taxnow ) {
-			do_action( 'load-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		} elseif ( 'link_category' === $taxnow ) {
-			do_action( 'load-edit-link-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		}
-	} elseif ( 'term.php' === $pagenow ) {
-		do_action( 'load-edit-tags.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+	if ( $typenow == 'page' ) {
+		if ( $pagenow == 'post-new.php' )
+			do_action( 'load-page-new.php' );
+		elseif ( $pagenow == 'post.php' )
+			do_action( 'load-page.php' );
+	}  elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' )
+			do_action( 'load-categories.php' );
+		elseif ( $taxnow == 'link_category' )
+			do_action( 'load-edit-link-categories.php' );
 	}
 }

 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,18 +14,28 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 	define( 'WP_ADMIN', true );
 }

-if ( defined( 'ABSPATH' ) ) {
-	require_once ABSPATH . 'wp-load.php';
-} else {
-	require_once dirname( __DIR__ ) . '/wp-load.php';
+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';
+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'] ) {
-	require ABSPATH . 'wp-admin/includes/ajax-actions.php';
+	include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

 	send_nosniff_header();
 	nocache_headers();
@@ -35,77 +45,55 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
 }

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

-// Just fetch the detail form for that attachment.
-if ( isset( $_REQUEST['attachment_id'] ) && (int) $_REQUEST['attachment_id'] && $_REQUEST['fetch'] ) {
-	$id   = (int) $_REQUEST['attachment_id'];
+// just fetch the detail form for that attachment
+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 ( 'attachment' != $post->post_type )
+		wp_die( __( 'Unknown post type.' ) );
+	if ( ! current_user_can( 'edit_post', $id ) )
+		wp_die( __( 'You are not allowed to edit this item.' ) );

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

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

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

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

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

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

 	/**
-	 * Filters the returned ID of an uploaded attachment.
+	 * Filter the returned ID of an uploaded attachment.
 	 *
 	 * The dynamic portion of the hook name, `$type`, refers to the attachment type,
 	 * such as 'image', 'audio', 'video', 'file', etc.
--- a/wp-admin/authorize-application.php
+++ b/wp-admin/authorize-application.php
@@ -1,312 +0,0 @@
-<?php
-/**
- * Authorize Application Screen
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** WordPress Administration Bootstrap */
-require_once __DIR__ . '/admin.php';
-
-$error        = null;
-$new_password = '';
-
-// This is the no-js fallback script.  Generally this will all be handled by `auth-app.js`
-if ( isset( $_POST['action'] ) && 'authorize_application_password' === $_POST['action'] ) {
-	check_admin_referer( 'authorize_application_password' );
-
-	$success_url = $_POST['success_url'];
-	$reject_url  = $_POST['reject_url'];
-	$app_name    = $_POST['app_name'];
-	$app_id      = $_POST['app_id'];
-	$redirect    = '';
-
-	if ( isset( $_POST['reject'] ) ) {
-		if ( $reject_url ) {
-			$redirect = $reject_url;
-		} else {
-			$redirect = admin_url();
-		}
-	} elseif ( isset( $_POST['approve'] ) ) {
-		$created = WP_Application_Passwords::create_new_application_password(
-			get_current_user_id(),
-			array(
-				'name'   => $app_name,
-				'app_id' => $app_id,
-			)
-		);
-
-		if ( is_wp_error( $created ) ) {
-			$error = $created;
-		} else {
-			list( $new_password ) = $created;
-
-			if ( $success_url ) {
-				$redirect = add_query_arg(
-					array(
-						'site_url'   => urlencode( site_url() ),
-						'user_login' => urlencode( wp_get_current_user()->user_login ),
-						'password'   => urlencode( $new_password ),
-					),
-					$success_url
-				);
-			}
-		}
-	}
-
-	if ( $redirect ) {
-		// Explicitly not using wp_safe_redirect b/c sends to arbitrary domain.
-		wp_redirect( $redirect );
-		exit;
-	}
-}
-
-$title = __( 'Authorize Application' );
-
-$app_name    = ! empty( $_REQUEST['app_name'] ) ? $_REQUEST['app_name'] : '';
-$app_id      = ! empty( $_REQUEST['app_id'] ) ? $_REQUEST['app_id'] : '';
-$success_url = ! empty( $_REQUEST['success_url'] ) ? $_REQUEST['success_url'] : null;
-
-if ( ! empty( $_REQUEST['reject_url'] ) ) {
-	$reject_url = $_REQUEST['reject_url'];
-} elseif ( $success_url ) {
-	$reject_url = add_query_arg( 'success', 'false', $success_url );
-} else {
-	$reject_url = null;
-}
-
-$user = wp_get_current_user();
-
-$request  = compact( 'app_name', 'app_id', 'success_url', 'reject_url' );
-$is_valid = wp_is_authorize_application_password_request_valid( $request, $user );
-
-if ( is_wp_error( $is_valid ) ) {
-	wp_die(
-		__( 'The Authorize Application request is not allowed.' ) . ' ' . implode( ' ', $is_valid->get_error_messages() ),
-		__( 'Cannot Authorize Application' )
-	);
-}
-
-if ( wp_is_site_protected_by_basic_auth( 'front' ) ) {
-	wp_die(
-		__( 'Your website appears to use Basic Authentication, which is not currently compatible with Application Passwords.' ),
-		__( 'Cannot Authorize Application' ),
-		array(
-			'response'  => 501,
-			'link_text' => __( 'Go Back' ),
-			'link_url'  => $reject_url ? add_query_arg( 'error', 'disabled', $reject_url ) : admin_url(),
-		)
-	);
-}
-
-if ( ! wp_is_application_passwords_available_for_user( $user ) ) {
-	if ( wp_is_application_passwords_available() ) {
-		$message = __( 'Application passwords are not available for your account. Please contact the site administrator for assistance.' );
-	} else {
-		$message = __( 'Application passwords are not available.' );
-	}
-
-	wp_die(
-		$message,
-		__( 'Cannot Authorize Application' ),
-		array(
-			'response'  => 501,
-			'link_text' => __( 'Go Back' ),
-			'link_url'  => $reject_url ? add_query_arg( 'error', 'disabled', $reject_url ) : admin_url(),
-		)
-	);
-}
-
-wp_enqueue_script( 'auth-app' );
-wp_localize_script(
-	'auth-app',
-	'authApp',
-	array(
-		'site_url'   => site_url(),
-		'user_login' => $user->user_login,
-		'success'    => $success_url,
-		'reject'     => $reject_url ? $reject_url : admin_url(),
-	)
-);
-
-require_once ABSPATH . 'wp-admin/admin-header.php';
-
-?>
-<div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
-
-	<?php if ( is_wp_error( $error ) ) : ?>
-		<div class="notice notice-error"><p><?php echo $error->get_error_message(); ?></p></div>
-	<?php endif; ?>
-
-	<div class="card auth-app-card">
-		<h2 class="title"><?php _e( 'An application would like to connect to your account.' ); ?></h2>
-		<?php if ( $app_name ) : ?>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: Application name. */
-					__( 'Would you like to give the application identifying itself as %s access to your account? You should only do this if you trust the app in question.' ),
-					'<strong>' . esc_html( $app_name ) . '</strong>'
-				);
-				?>
-			</p>
-		<?php else : ?>
-			<p><?php _e( 'Would you like to give this application access to your account? You should only do this if you trust the app in question.' ); ?></p>
-		<?php endif; ?>
-
-		<?php
-		if ( is_multisite() ) {
-			$blogs       = get_blogs_of_user( $user->ID, true );
-			$blogs_count = count( $blogs );
-			if ( $blogs_count > 1 ) {
-				?>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: URL to my-sites.php, 2: Number of blogs the user has. */
-						_n(
-							'This will grant access to <a href="%1$s">the %2$s blog in this installation that you have permissions on</a>.',
-							'This will grant access to <a href="%1$s">all %2$s blogs in this installation that you have permissions on</a>.',
-							$blogs_count
-						),
-						admin_url( 'my-sites.php' ),
-						number_format_i18n( $blogs_count )
-					);
-					?>
-				</p>
-				<?php
-			}
-		}
-		?>
-
-		<?php if ( $new_password ) : ?>
-			<div class="notice notice-success notice-alt below-h2">
-				<p class="application-password-display">
-					<label for="new-application-password-value">
-						<?php
-						printf(
-							/* translators: %s: Application name. */
-							esc_html__( 'Your new password for %s is:' ),
-							'<strong>' . esc_html( $app_name ) . '</strong>'
-						);
-						?>
-					</label>
-					<input id="new-application-password-value" type="text" class="code" readonly="readonly" value="<?php esc_attr( WP_Application_Passwords::chunk_password( $new_password ) ); ?>" />
-				</p>
-				<p><?php _e( 'Be sure to save this in a safe location. You will not be able to retrieve it.' ); ?></p>
-			</div>
-
-			<?php
-			/**
-			 * Fires in the Authorize Application Password new password section in the no-JS version.
-			 *
-			 * In most cases, this should be used in combination with the {@see 'wp_application_passwords_approve_app_request_success'}
-			 * action to ensure that both the JS and no-JS variants are handled.
-			 *
-			 * @since 5.6.0
-			 * @since 5.6.1 Corrected action name and signature.
-			 *
-			 * @param string  $new_password The newly generated application password.
-			 * @param array   $request      The array of request data. All arguments are optional and may be empty.
-			 * @param WP_User $user         The user authorizing the application.
-			 */
-			do_action( 'wp_authorize_application_password_form_approved_no_js', $new_password, $request, $user );
-			?>
-		<?php else : ?>
-			<form action="<?php echo esc_url( admin_url( 'authorize-application.php' ) ); ?>" method="post" class="form-wrap">
-				<?php wp_nonce_field( 'authorize_application_password' ); ?>
-				<input type="hidden" name="action" value="authorize_application_password" />
-				<input type="hidden" name="app_id" value="<?php echo esc_attr( $app_id ); ?>" />
-				<input type="hidden" name="success_url" value="<?php echo esc_url( $success_url ); ?>" />
-				<input type="hidden" name="reject_url" value="<?php echo esc_url( $reject_url ); ?>" />
-
-				<div class="form-field">
-					<label for="app_name"><?php _e( 'New Application Password Name' ); ?></label>
-					<input type="text" id="app_name" name="app_name" value="<?php echo esc_attr( $app_name ); ?>" placeholder="<?php esc_attr_e( 'WordPress App on My Phone' ); ?>" required />
-				</div>
-
-				<?php
-				/**
-				 * Fires in the Authorize Application Password form before the submit buttons.
-				 *
-				 * @since 5.6.0
-				 *
-				 * @param array   $request {
-				 *     The array of request data. All arguments are optional and may be empty.
-				 *
-				 *     @type string $app_name    The suggested name of the application.
-				 *     @type string $success_url The url the user will be redirected to after approving the application.
-				 *     @type string $reject_url  The url the user will be redirected to after rejecting the application.
-				 * }
-				 * @param WP_User $user The user authorizing the application.
-				 */
-				do_action( 'wp_authorize_application_password_form', $request, $user );
-				?>
-
-				<?php
-				submit_button(
-					__( 'Yes, I approve of this connection.' ),
-					'primary',
-					'approve',
-					false,
-					array(
-						'aria-describedby' => 'description-approve',
-					)
-				);
-				?>
-				<p class="description" id="description-approve">
-					<?php
-					if ( $success_url ) {
-						printf(
-							/* translators: %s: The URL the user is being redirected to. */
-							__( 'You will be sent to %s' ),
-							'<strong><kbd>' . esc_html(
-								add_query_arg(
-									array(
-										'site_url'   => site_url(),
-										'user_login' => $user->user_login,
-										'password'   => '[------]',
-									),
-									$success_url
-								)
-							) . '</kbd></strong>'
-						);
-					} else {
-						_e( 'You will be given a password to manually enter into the application in question.' );
-					}
-					?>
-				</p>
-
-				<?php
-				submit_button(
-					__( 'No, I do not approve of this connection.' ),
-					'secondary',
-					'reject',
-					false,
-					array(
-						'aria-describedby' => 'description-reject',
-					)
-				);
-				?>
-				<p class="description" id="description-reject">
-					<?php
-					if ( $reject_url ) {
-						printf(
-							/* translators: %s: The URL the user is being redirected to. */
-							__( 'You will be sent to %s' ),
-							'<strong><kbd>' . esc_html( $reject_url ) . '</kbd></strong>'
-						);
-					} else {
-						_e( 'You will be returned to the WordPress Dashboard, and no changes will be made.' );
-					}
-					?>
-				</p>
-			</form>
-		<?php endif; ?>
-	</div>
-</div>
-<?php
-
-require_once ABSPATH . 'wp-admin/admin-footer.php';
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -7,188 +7,171 @@
 */

 /** Load WordPress Bootstrap */
-require_once __DIR__ . '/admin.php';
+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';
-	}
 }

-if ( isset( $_REQUEST['c'] ) ) {
-	$comment_id = absint( $_REQUEST['c'] );
-	$comment    = get_comment( $comment_id );
+switch( $action ) {

-	// Prevent actions on a comment associated with a trashed post.
-	if ( $comment && 'trash' === get_post_status( $comment->comment_post_ID ) ) {
-		wp_die(
-			__( 'You can&#8217;t edit this comment because the associated post is in the Trash. Please restore the post first, then try again.' )
-		);
+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();
 	}
-} else {
-	$comment = null;
-}

+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+		wp_redirect( admin_url('edit-comments.php?error=2') );
+		die();
+	}
+
+	// No need to re-approve/re-trash/re-spam a comment.
+	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
+		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+		die();
+ 	}
+
+	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+
+	$formaction    = $action . 'comment';
+	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
+	$nonce_action .= $comment_id;
+
+?>
+<div class="wrap">
+
+<h1><?php echo esc_html( $title ); ?></h1>
+
+<?php
 switch ( $action ) {
-
-	case 'editcomment':
-		$title = __( 'Edit Comment' );
-
-		get_current_screen()->add_help_tab(
-			array(
-				'id'      => 'overview',
-				'title'   => __( 'Overview' ),
-				'content' =>
-					'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-					'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>',
-			)
-		);
-
-		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
-		);
-
-		wp_enqueue_script( 'comment' );
-		require_once ABSPATH . 'wp-admin/admin-header.php';
-
-		if ( ! $comment ) {
-			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'javascript:history.go(-1)' ) );
-		}
-
-		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
-			comment_footer_die( __( 'Sorry, you are not allowed to edit this comment.' ) );
-		}
-
-		if ( 'trash' === $comment->comment_approved ) {
-			comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
-		}
-
-		$comment = get_comment_to_edit( $comment_id );
-
-		require 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' );
-
-		if ( ! $comment ) {
-			wp_redirect( admin_url( 'edit-comments.php?error=1' ) );
-			die();
-		}
-
-		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-			wp_redirect( admin_url( 'edit-comments.php?error=2' ) );
-			die();
-		}
-
-		// No need to re-approve/re-trash/re-spam a comment.
-		if ( str_replace( '1', 'approve', $comment->comment_approved ) === $action ) {
-			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 ( '0' !== $comment->comment_approved ) { // 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('Email'); ?></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>
+	<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 ) );
@@ -200,172 +183,143 @@ switch ( $action ) {
 			$parent_link = esc_url( get_comment_link( $parent ) );
 			$name        = get_comment_author( $parent );
 			printf(
-				/* translators: %s: Comment link. */
+				/* translators: %s: comment link */
 				' | ' . __( 'In reply to %s.' ),
 				'<a href="' . $parent_link . '">' . $name . '</a>'
 			);
 		}
-		?>
+	?>
 	</td>
-	</tr>
-	<tr>
+</tr>
+<tr>
 	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
 	<td>
-		<?php
-		$submitted = sprintf(
-			/* translators: 1: Comment date, 2: Comment time. */
-			__( '%1$s at %2$s' ),
-			/* translators: Comment date format. See https://www.php.net/manual/datetime.format.php */
-			get_comment_date( __( 'Y/m/d' ), $comment ),
-			/* translators: Comment time format. See https://www.php.net/manual/datetime.format.php */
-			get_comment_date( __( 'g:i a' ), $comment )
-		);
-		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>
+		<a href="<?php echo esc_url( get_comment_link( $comment ) ); ?>"><?php
+			/* translators: 1: comment date, 2: comment time */
+			printf( __( '%1$s at %2$s' ),
+				/* translators: comment date format. See http://php.net/date */
+				get_comment_date( __( 'Y/m/d' ), $comment ),
+				get_comment_date( get_option( 'time_format' ), $comment )
+			);
+		?></a>
 	</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' ), true ) ) {
-			check_admin_referer( 'approve-comment_' . $comment_id );
-		} else {
-			check_admin_referer( 'delete-comment_' . $comment_id );
-		}
+	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
+		check_admin_referer( 'approve-comment_' . $comment_id );
+	else
+		check_admin_referer( 'delete-comment_' . $comment_id );

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

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

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

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

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

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

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

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

-		$updated = edit_comment();
-		if ( is_wp_error( $updated ) ) {
-			wp_die( $updated->get_error_message() );
-		}
+	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 );
+	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;

-		wp_redirect( $location );
-		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();

-} // End switch.
+default:
+	wp_die( __('Unknown action.') );

-require_once ABSPATH . 'wp-admin/admin-footer.php';
+} // end switch
+
+include( ABSPATH . 'wp-admin/admin-footer.php' );
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -7,150 +7,122 @@
 */

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

 $title = __( 'Credits' );

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

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

-	<div class="about__header">
-		<div class="about__header-image">
-			<picture>
-				<source media="(max-width: 782px)" srcset="data:image/svg+xml,<?php echo rawurlencode( '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 205 109" width="205"><g fill="none" fill-rule="evenodd"><path fill="#000" fill-rule="nonzero" d="M65.901 108.433c2.546-5.254 4.927-9.195 7.143-11.822H1.246v-5.173h71.798c-2.216-2.627-4.597-6.568-7.143-11.822h4.31c5.173 5.993 10.592 10.427 16.257 13.3v2.217c-5.665 2.791-11.084 7.225-16.256 13.3h-4.31z"/><path fill="#000" fill-rule="nonzero" d="M29.345 26.834c-.129 1.365-.633 2.432-1.512 3.2-.879.76-2.048 1.142-3.507 1.142-1.02 0-1.919-.24-2.698-.72-.773-.487-1.371-1.176-1.793-2.066-.422-.891-.641-1.925-.659-3.103v-1.195c0-1.207.214-2.27.642-3.19.427-.92 1.04-1.63 1.836-2.128.803-.498 1.729-.747 2.778-.747 1.412 0 2.549.384 3.41 1.152.861.767 1.362 1.851 1.503 3.252H27.13c-.105-.92-.375-1.582-.809-1.987-.427-.41-1.057-.615-1.89-.615-.966 0-1.71.355-2.232 1.064-.515.703-.779 1.737-.79 3.102v1.134c0 1.383.245 2.437.738 3.164.498.727 1.224 1.09 2.18 1.09.872 0 1.529-.197 1.968-.59.44-.392.718-1.045.835-1.959h2.215zm14.008-1.898c0 1.253-.217 2.355-.65 3.304-.434.944-1.055 1.67-1.864 2.18-.803.504-1.728.756-2.777.756-1.037 0-1.963-.252-2.777-.756-.809-.51-1.436-1.234-1.881-2.171-.44-.938-.662-2.018-.668-3.243v-.72c0-1.249.22-2.35.659-3.306.445-.955 1.07-1.684 1.872-2.188.809-.51 1.734-.765 2.777-.765 1.043 0 1.966.252 2.769.756.808.498 1.432 1.219 1.872 2.162.44.938.662 2.03.668 3.279v.712zm-2.224-.668c0-1.418-.27-2.505-.808-3.261-.534-.756-1.292-1.134-2.277-1.134-.96 0-1.714.378-2.258 1.134-.54.75-.815 1.813-.827 3.19v.739c0 1.406.273 2.493.818 3.26.55.768 1.312 1.152 2.285 1.152.984 0 1.74-.375 2.267-1.125.534-.75.8-1.846.8-3.287v-.668zM47.368 31V18.203h3.78c1.13 0 2.132.252 3.005.756a5.146 5.146 0 012.039 2.145c.48.925.72 1.986.72 3.181v.642c0 1.213-.243 2.28-.729 3.199a5.057 5.057 0 01-2.065 2.127c-.89.498-1.913.747-3.068.747h-3.682zm2.223-11.004v9.229h1.45c1.167 0 2.06-.364 2.681-1.09.627-.733.947-1.782.958-3.147v-.712c0-1.388-.302-2.449-.905-3.181-.604-.733-1.48-1.099-2.628-1.099h-1.556zm18.816 5.291h-5.256v3.938h6.144V31h-8.368V18.203h8.306v1.793h-6.082v3.533h5.256v1.758zM81.534 31H79.32V18.203h2.215V31zm11.222-3.296c0-.562-.199-.996-.597-1.3-.393-.305-1.105-.613-2.136-.924-1.031-.31-1.852-.656-2.461-1.037-1.166-.732-1.75-1.687-1.75-2.865 0-1.031.42-1.88 1.258-2.549.843-.668 1.936-1.002 3.278-1.002.89 0 1.685.164 2.382.492a3.898 3.898 0 011.643 1.407c.399.603.598 1.274.598 2.013h-2.215c0-.669-.21-1.19-.633-1.565-.416-.38-1.013-.571-1.793-.571-.726 0-1.292.155-1.696.466-.398.31-.598.744-.598 1.3 0 .47.217.862.65 1.178.434.31 1.15.615 2.145.914.996.293 1.796.63 2.4 1.01.603.376 1.046.81 1.327 1.302.281.486.422 1.057.422 1.713 0 1.067-.41 1.916-1.23 2.55-.815.626-1.923.94-3.323.94-.926 0-1.778-.17-2.558-.51-.773-.346-1.376-.82-1.81-1.424-.428-.603-.642-1.306-.642-2.11h2.224c0 .727.24 1.29.72 1.688.481.399 1.17.598 2.066.598.774 0 1.354-.155 1.74-.466.393-.316.59-.732.59-1.248zm14.481-1.459V31h-2.224V18.203h4.896c1.43 0 2.563.372 3.401 1.116.844.745 1.266 1.729 1.266 2.954 0 1.253-.413 2.229-1.239 2.926-.821.697-1.972 1.046-3.454 1.046h-2.646zm0-1.784h2.672c.791 0 1.395-.185 1.811-.554.416-.375.624-.914.624-1.617 0-.691-.211-1.242-.633-1.652-.422-.416-1.002-.63-1.74-.642h-2.734v4.465zm21.303.475c0 1.253-.217 2.355-.65 3.304-.434.944-1.055 1.67-1.864 2.18-.802.504-1.728.756-2.777.756-1.037 0-1.963-.252-2.777-.756-.809-.51-1.436-1.234-1.881-2.171-.44-.938-.662-2.018-.668-3.243v-.72c0-1.249.22-2.35.659-3.306.445-.955 1.069-1.684 1.872-2.188.809-.51 1.734-.765 2.777-.765 1.043 0 1.966.252 2.769.756.809.498 1.433 1.219 1.872 2.162.44.938.662 2.03.668 3.279v.712zm-2.224-.668c0-1.418-.269-2.505-.808-3.261-.533-.756-1.292-1.134-2.277-1.134-.96 0-1.713.378-2.258 1.134-.539.75-.815 1.813-.827 3.19v.739c0 1.406.273 2.493.818 3.26.551.768 1.312 1.152 2.285 1.152.984 0 1.74-.375 2.268-1.125.533-.75.799-1.846.799-3.287v-.668zm13.718 1.02h-5.255v3.937h6.143V31h-8.367V18.203h8.306v1.793h-6.082v3.533h5.255v1.758zm13.92-5.292h-3.99V31h-2.206V19.996h-3.955v-1.793h10.151v1.793zm8.19 6.073h-2.478V31h-2.224V18.203h4.5c1.477 0 2.616.331 3.419.993.803.662 1.204 1.62 1.204 2.874 0 .856-.208 1.574-.624 2.154-.41.574-.984 1.016-1.723 1.327l2.874 5.335V31h-2.381l-2.567-4.93zm-2.478-1.784h2.285c.75 0 1.336-.187 1.758-.562.421-.381.632-.9.632-1.556 0-.686-.196-1.216-.588-1.59-.387-.376-.967-.57-1.741-.58h-2.346v4.288zm14.561-.017l2.945-6.065h2.461l-4.289 8.086V31h-2.233v-4.71l-4.298-8.087h2.47l2.944 6.065z"/><path stroke="#000" stroke-width="2" d="M2 1h201v46H2z"/></g></svg>' ); ?>" />
-				<img alt="<?php _e( 'Code is Poetry' ); ?>" src="data:image/svg+xml,<?php echo rawurlencode( '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1210 48"><path fill="#000" d="M65.875 39.875c2.583-5.333 5-9.333 7.25-12H.25v-5.25h72.875c-2.25-2.667-4.667-6.667-7.25-12h4.375c5.25 6.083 10.75 10.583 16.5 13.5v2.25c-5.75 2.833-11.25 7.333-16.5 13.5h-4.375zM1035.34 26.834c-.12 1.365-.63 2.432-1.51 3.2-.88.76-2.04 1.142-3.5 1.142-1.02 0-1.92-.24-2.7-.72-.78-.487-1.37-1.176-1.79-2.066-.43-.891-.65-1.925-.66-3.103v-1.195c0-1.207.21-2.27.64-3.19.43-.92 1.04-1.63 1.83-2.128.81-.498 1.73-.747 2.78-.747 1.41 0 2.55.384 3.41 1.152.86.767 1.36 1.851 1.5 3.252h-2.21c-.11-.92-.37-1.582-.81-1.987-.43-.41-1.06-.615-1.89-.615-.96 0-1.71.355-2.23 1.064-.52.703-.78 1.737-.79 3.102v1.134c0 1.383.24 2.437.74 3.164.49.727 1.22 1.09 2.18 1.09.87 0 1.53-.197 1.97-.59.43-.392.71-1.045.83-1.959h2.21zm14.01-1.898c0 1.253-.21 2.355-.65 3.304-.43.944-1.05 1.67-1.86 2.18-.8.504-1.73.756-2.78.756-1.04 0-1.96-.252-2.78-.756-.8-.51-1.43-1.234-1.88-2.171-.44-.938-.66-2.018-.66-3.243v-.72c0-1.249.22-2.35.65-3.306.45-.955 1.07-1.684 1.88-2.188.81-.51 1.73-.765 2.77-.765 1.05 0 1.97.252 2.77.756.81.498 1.44 1.219 1.87 2.162.44.938.67 2.03.67 3.279v.712zm-2.22-.668c0-1.418-.27-2.505-.81-3.261-.53-.756-1.29-1.134-2.28-1.134-.96 0-1.71.378-2.25 1.134-.54.75-.82 1.813-.83 3.19v.739c0 1.406.27 2.493.82 3.26.55.768 1.31 1.152 2.28 1.152.99 0 1.74-.375 2.27-1.125s.8-1.846.8-3.287v-.668zm6.24 6.732V18.203h3.78c1.13 0 2.13.252 3 .756a5.138 5.138 0 012.04 2.145c.48.925.72 1.986.72 3.181v.642c0 1.213-.24 2.28-.73 3.199a5.08 5.08 0 01-2.06 2.127c-.89.498-1.92.747-3.07.747h-3.68zm2.22-11.004v9.229h1.45c1.17 0 2.06-.364 2.68-1.09.63-.733.95-1.782.96-3.147v-.712c0-1.388-.3-2.449-.9-3.181-.61-.733-1.48-1.099-2.63-1.099h-1.56zm18.82 5.291h-5.26v3.938h6.14V31h-8.36V18.203h8.3v1.793h-6.08v3.533h5.26v1.758zM1087.53 31h-2.21V18.203h2.21V31zm11.23-3.296c0-.562-.2-.996-.6-1.3-.39-.305-1.11-.613-2.14-.924-1.03-.31-1.85-.656-2.46-1.037-1.16-.732-1.75-1.687-1.75-2.865 0-1.031.42-1.88 1.26-2.549.84-.668 1.94-1.002 3.28-1.002.89 0 1.68.164 2.38.492.7.329 1.25.797 1.64 1.407.4.603.6 1.274.6 2.013h-2.21c0-.669-.21-1.19-.64-1.565-.41-.38-1.01-.571-1.79-.571-.73 0-1.29.155-1.7.466-.39.31-.59.744-.59 1.3 0 .47.21.862.65 1.178.43.31 1.15.615 2.14.914 1 .293 1.8.63 2.4 1.01.6.376 1.05.81 1.33 1.302.28.486.42 1.057.42 1.713 0 1.067-.41 1.916-1.23 2.55-.82.626-1.92.94-3.32.94-.93 0-1.78-.17-2.56-.51-.77-.346-1.38-.82-1.81-1.424-.43-.603-.64-1.306-.64-2.11h2.22c0 .727.24 1.29.72 1.688.48.399 1.17.598 2.07.598.77 0 1.35-.155 1.74-.466.39-.316.59-.732.59-1.248zm14.48-1.459V31h-2.23V18.203h4.9c1.43 0 2.56.372 3.4 1.116.84.745 1.27 1.729 1.27 2.954 0 1.253-.42 2.229-1.24 2.926-.82.697-1.97 1.046-3.46 1.046h-2.64zm0-1.784h2.67c.79 0 1.39-.185 1.81-.554.42-.375.62-.914.62-1.617 0-.691-.21-1.242-.63-1.652-.42-.416-1-.63-1.74-.642h-2.73v4.465zm21.3.475c0 1.253-.22 2.355-.65 3.304-.43.944-1.06 1.67-1.86 2.18-.81.504-1.73.756-2.78.756-1.04 0-1.96-.252-2.78-.756-.81-.51-1.43-1.234-1.88-2.171-.44-.938-.66-2.018-.67-3.243v-.72c0-1.249.22-2.35.66-3.306.45-.955 1.07-1.684 1.87-2.188.81-.51 1.74-.765 2.78-.765 1.04 0 1.97.252 2.77.756.81.498 1.43 1.219 1.87 2.162.44.938.66 2.03.67 3.279v.712zm-2.22-.668c0-1.418-.27-2.505-.81-3.261-.54-.756-1.29-1.134-2.28-1.134-.96 0-1.71.378-2.26 1.134-.54.75-.81 1.813-.82 3.19v.739c0 1.406.27 2.493.81 3.26.55.768 1.32 1.152 2.29 1.152.98 0 1.74-.375 2.27-1.125s.8-1.846.8-3.287v-.668zm13.71 1.02h-5.25v3.937h6.14V31h-8.37V18.203h8.31v1.793h-6.08v3.533h5.25v1.758zm13.92-5.292h-3.99V31h-2.2V19.996h-3.96v-1.793h10.15v1.793zm8.19 6.073h-2.47V31h-2.23V18.203h4.5c1.48 0 2.62.331 3.42.993.8.662 1.21 1.62 1.21 2.874 0 .856-.21 1.574-.63 2.154-.41.574-.98 1.016-1.72 1.327l2.87 5.335V31h-2.38l-2.57-4.93zm-2.47-1.784h2.28c.75 0 1.34-.187 1.76-.562.42-.381.63-.9.63-1.556 0-.686-.19-1.216-.59-1.59-.38-.376-.96-.57-1.74-.58h-2.34v4.288zm14.56-.017l2.94-6.065h2.46l-4.29 8.086V31h-2.23v-4.71l-4.3-8.087h2.47l2.95 6.065z"/><path stroke="#000" stroke-width="2" d="M1008 1h201v46h-201z"/></svg>' ); ?>" />
-			</picture>
-		</div>
+<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

-		<div class="about__header-container">
-			<div class="about__header-title">
-				<p>
-					<?php _e( 'WordPress' ); ?>
-					<?php echo $display_version; ?>
-				</p>
-			</div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes your site more connected and responsive.' ), $display_version ); ?></div>

-			<div class="about__header-text">
-				<?php _e( 'Sharing your stories has never been easier' ); ?>
-			</div>
-			<div class="about__header-badge">
-				<img alt="<?php _e( 'New' ); ?>" src="data:image/svg+xml,<?php echo rawurlencode( '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 153 153" width="115"><circle cx="76.5" cy="76.5" r="76.5" fill="#000"/><path fill="#D1CFE4" d="M53.333 86h-2.827L39.769 69.564V86H36.94V64.672h2.828L50.535 81.18V64.67h2.798V86zm26.05-9.858h-9.242V83.7h10.737V86h-13.55V64.672h13.403v2.314h-10.59v6.856h9.243v2.3zm18.596 3.134l.41 2.813.6-2.534 4.219-14.883h2.373l4.116 14.883.586 2.578.454-2.871 3.311-14.59h2.827L111.704 86h-2.563l-4.395-15.542-.337-1.626-.337 1.626L99.517 86h-2.564l-5.156-21.328h2.812l3.37 14.604z"/></svg>' ); ?>" />
-			</div>
-		</div>
+<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

-		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-			<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-		</nav>
-	</div>
-
-	<div class="about__section is-feature">
-		<div class="column">
-			<h1><?php _e( 'Credits' ); ?></h1>
-
-			<?php if ( ! $credits ) : ?>
-
-			<p>
-				<?php
-				printf(
-					/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-					__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
-					__( 'https://wordpress.org/about/' ),
-					__( 'https://make.wordpress.org/' )
-				);
-				?>
-			</p>
-
-			<?php else : ?>
-
-			<p>
-				<?php _e( 'WordPress is created by a worldwide team of passionate individuals.' ); ?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: https://make.wordpress.org/ */
-					__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-					__( 'https://make.wordpress.org/' )
-				);
-				?>
-			</p>
-
-			<?php endif; ?>
-		</div>
-	</div>
+<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>

 <?php
+
+$credits = wp_credits();
+
 if ( ! $credits ) {
-	echo '</div>';
-	require_once ABSPATH . 'wp-admin/admin-footer.php';
+	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/',
+		/* 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";
+
+foreach ( $credits['groups'] as $group_slug => $group_data ) {
+	if ( $group_data['name'] ) {
+		if ( 'Translators' == $group_data['name'] ) {
+			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
+			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
+		} elseif ( isset( $group_data['placeholders'] ) ) {
+			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+		} else {
+			$title = translate( $group_data['name'] );
+		}
+
+		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
+	}
+
+	if ( ! empty( $group_data['shuffle'] ) )
+		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+
+	switch ( $group_data['type'] ) {
+		case 'list' :
+			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
+			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			break;
+		case 'libraries' :
+			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
+			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			break;
+		default:
+			$compact = 'compact' == $group_data['type'];
+			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
+			echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
+			foreach ( $group_data['data'] as $person_data ) {
+				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
+				echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">';
+				$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="' . 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;
+	}
+}
+
 ?>
+<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>

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

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

 return;

-// These are strings returned by the API that we want to be translatable.
+// 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' );
+__( 'Docs Committer' );
+__( 'XML-RPC' );
+__( 'Internationalization' );
 __( 'External Libraries' );
+__( 'Icon Design' );
--- a/wp-admin/css/about-rtl.css
+++ b/wp-admin/css/about-rtl.css
--- a/wp-admin/css/about-rtl.min.css
+++ b/wp-admin/css/about-rtl.min.css
--- a/wp-admin/css/about.css
+++ b/wp-admin/css/about.css
--- a/wp-admin/css/about.min.css
+++ b/wp-admin/css/about.min.css
--- a/wp-admin/css/admin-menu-rtl.css
+++ b/wp-admin/css/admin-menu-rtl.css
@@ -1,4 +1,3 @@
-/*! This file is auto-generated */
 #adminmenuback,
 #adminmenuwrap,
 #adminmenu,
@@ -14,15 +13,6 @@
 	z-index: 1; /* positive z-index to avoid elastic scrolling woes in Safari */
 }

-.php-error #adminmenuback {
-	position: absolute;
-}
-
-.php-error #adminmenuback,
-.php-error #adminmenuwrap {
-	margin-top: 2em;
-}
-
 #adminmenu {
 	clear: right;
 	margin: 12px 0;
@@ -48,15 +38,16 @@
 /* New Menu icons */

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

@@ -106,7 +97,7 @@
 }

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

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

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

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

 #adminmenu .wp-submenu a:hover,
@@ -216,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,
@@ -239,6 +227,7 @@
 	bottom: auto;
 	border: 0 none;
 	margin-top: 0;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	background-color: #32373c;
 }
@@ -275,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;
 }
@@ -292,6 +281,13 @@
 	width: auto;
 }

+#adminmenu .wp-submenu a {
+	font-size: 13px;
+	line-height: 1.2;
+	margin: 0;
+	padding: 6px 0;
+}
+
 #adminmenu .wp-submenu li.current,
 #adminmenu .wp-submenu li.current a,
 #adminmenu .opensub .wp-submenu li.current a,
@@ -305,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;
 }

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

 #adminmenu .wp-menu-image img {
@@ -347,14 +344,7 @@
 }

 #adminmenu div.wp-menu-name {
-	padding: 8px 36px 8px 8px;
-	overflow-wrap: break-word;
-	word-wrap: break-word;
-	-ms-word-break: break-all;
-	word-break: break-word;
-	-ms-hyphens: auto;
-	-webkit-hyphens: auto;
-	hyphens: auto;
+	padding: 8px 0;
 }

 #adminmenu div.wp-menu-image {
@@ -368,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,
@@ -399,6 +391,11 @@ div.wp-menu-image:before {
 	color: #00b9eb;
 }

+/* IE8 doesn't redraw the pseudo elements unless you make a change to the content, this restore the initial color after hover */
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
+	color: #a0a5aa;
+}
+
 .folded #adminmenu div.wp-menu-image {
 	width: 35px;
 	height: 30px;
@@ -410,6 +407,20 @@ div.wp-menu-image:before {
 	height: 34px;
 }

+/* No @font-face support */
+.no-font-face #adminmenu .wp-menu-image {
+	display: none;
+}
+
+.no-font-face #adminmenu div.wp-menu-name {
+	padding: 8px 12px;
+}
+
+.no-font-face.auto-fold #adminmenu .wp-menu-name {
+	margin-right: 0;
+}
+/* End no @font-face support */
+
 /* Sticky admin menu */
 .sticky-menu #adminmenuwrap {
 	position: fixed;
@@ -505,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;
 }

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

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

-#collapse-button:hover {
+#collapse-menu:hover,
+#collapse-menu:hover #collapse-button div:after {
 	color: #00b9eb;
 }

-#collapse-button:focus {
-	color: #00b9eb;
-	/* Only visible in Windows High Contrast mode */
-	outline: 1px solid transparent;
-	outline-offset: -1px;
-}
-
-#collapse-button .collapse-button-icon,
-#collapse-button .collapse-button-label {
-	/* absolutely positioned to avoid 1px shift in IE when button is pressed */
-	display: block;
-	position: absolute;
-	top: 0;
-	right: 0;
-}
-
-#collapse-button .collapse-button-label {
-	top: 8px;
-}
-
-#collapse-button .collapse-button-icon {
-	width: 36px;
-	height: 34px;
-}
-
-#collapse-button .collapse-button-label {
-	padding: 0 36px 0 0;
-}
-
-.folded #collapse-button .collapse-button-label {
+.folded #collapse-menu span {
 	display: none;
 }

-#collapse-button .collapse-button-icon:after {
+#collapse-button,
+#collapse-button div {
+	width: 15px;
+	height: 15px;
+}
+
+#collapse-button {
+	float: right;
+	height: 15px;
+	margin: 10px 11px 10px 8px;
+	width: 15px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+
+#wpwrap #collapse-button div {
+	padding: 0;
+}
+
+#collapse-button div:after {
 	content: "\f148";
 	display: block;
-	position: relative;
-	top: 7px;
-	text-align: center;
+	line-height: 15px;
+	right: -3px;
+	top: -3px;
+	color: #a0a5aa;
+	color: rgba(240,245,250,0.6);
 	font: normal 20px/1 dashicons !important;
-	speak: never;
+	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
 */
@@ -644,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;
 	}
@@ -690,7 +698,7 @@ li#wp-admin-bar-menu-toggle {
 	}

 	.auto-fold #adminmenu a.menu-top {
-		min-height: 34px;
+		height: 34px;
 	}

 	.auto-fold #adminmenu li.wp-menu-open {
@@ -723,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;
@@ -760,10 +776,6 @@ li#wp-admin-bar-menu-toggle {
 		z-index: 100;
 	}

-	.auto-fold #adminmenuback {
-		position: fixed;
-	}
-
 	.auto-fold #adminmenuback,
 	.auto-fold #adminmenuwrap {
 		display: none;
@@ -791,6 +803,7 @@ li#wp-admin-bar-menu-toggle {
 	/* Restore the menu names */
 	.auto-fold #adminmenu .wp-menu-name {
 		position: static;
+		margin-right: 35px;
 	}

 	/* Switch the arrow side */
@@ -816,6 +829,7 @@ li#wp-admin-bar-menu-toggle {
 		display: block;
 		top: 0;
 		right: -1px;
+		-webkit-box-shadow: none;
 		box-shadow: none;
 	}

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

@@ -900,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
@@ -13,15 +13,6 @@
 	z-index: 1; /* positive z-index to avoid elastic scrolling woes in Safari */
 }

-.php-error #adminmenuback {
-	position: absolute;
-}
-
-.php-error #adminmenuback,
-.php-error #adminmenuwrap {
-	margin-top: 2em;
-}
-
 #adminmenu {
 	clear: left;
 	margin: 12px 0;
@@ -47,15 +38,16 @@
 /* New Menu icons */

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

@@ -105,7 +97,7 @@
 }

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

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

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

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

 #adminmenu .wp-submenu a:hover,
@@ -215,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,
@@ -238,6 +227,7 @@
 	bottom: auto;
 	border: 0 none;
 	margin-top: 0;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	background-color: #32373c;
 }
@@ -274,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;
 }
@@ -291,6 +281,13 @@
 	width: auto;
 }

+#adminmenu .wp-submenu a {
+	font-size: 13px;
+	line-height: 1.2;
+	margin: 0;
+	padding: 6px 0;
+}
+
 #adminmenu .wp-submenu li.current,
 #adminmenu .wp-submenu li.current a,
 #adminmenu .opensub .wp-submenu li.current a,
@@ -304,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;
 }

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

 #adminmenu .wp-menu-image img {
@@ -346,14 +344,7 @@
 }

 #adminmenu div.wp-menu-name {
-	padding: 8px 8px 8px 36px;
-	overflow-wrap: break-word;
-	word-wrap: break-word;
-	-ms-word-break: break-all;
-	word-break: break-word;
-	-ms-hyphens: auto;
-	-webkit-hyphens: auto;
-	hyphens: auto;
+	padding: 8px 0;
 }

 #adminmenu div.wp-menu-image {
@@ -367,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,
@@ -398,6 +391,11 @@ div.wp-menu-image:before {
 	color: #00b9eb;
 }

+/* IE8 doesn't redraw the pseudo elements unless you make a change to the content, this restore the initial color after hover */
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
+	color: #a0a5aa;
+}
+
 .folded #adminmenu div.wp-menu-image {
 	width: 35px;
 	height: 30px;
@@ -409,6 +407,20 @@ div.wp-menu-image:before {
 	height: 34px;
 }

+/* No @font-face support */
+.no-font-face #adminmenu .wp-menu-image {
+	display: none;
+}
+
+.no-font-face #adminmenu div.wp-menu-name {
+	padding: 8px 12px;
+}
+
+.no-font-face.auto-fold #adminmenu .wp-menu-name {
+	margin-left: 0;
+}
+/* End no @font-face support */
+
 /* Sticky admin menu */
 .sticky-menu #adminmenuwrap {
 	position: fixed;
@@ -504,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;
 }

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

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

-#collapse-button:hover {
+#collapse-menu:hover,
+#collapse-menu:hover #collapse-button div:after {
 	color: #00b9eb;
 }

-#collapse-button:focus {
-	color: #00b9eb;
-	/* Only visible in Windows High Contrast mode */
-	outline: 1px solid transparent;
-	outline-offset: -1px;
-}
-
-#collapse-button .collapse-button-icon,
-#collapse-button .collapse-button-label {
-	/* absolutely positioned to avoid 1px shift in IE when button is pressed */
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-
-#collapse-button .collapse-button-label {
-	top: 8px;
-}
-
-#collapse-button .collapse-button-icon {
-	width: 36px;
-	height: 34px;
-}
-
-#collapse-button .collapse-button-label {
-	padding: 0 0 0 36px;
-}
-
-.folded #collapse-button .collapse-button-label {
+.folded #collapse-menu span {
 	display: none;
 }

-#collapse-button .collapse-button-icon:after {
+#collapse-button,
+#collapse-button div {
+	width: 15px;
+	height: 15px;
+}
+
+#collapse-button {
+	float: left;
+	height: 15px;
+	margin: 10px 8px 10px 11px;
+	width: 15px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+
+#wpwrap #collapse-button div {
+	padding: 0;
+}
+
+#collapse-button div:after {
 	content: "\f148";
 	display: block;
-	position: relative;
-	top: 7px;
-	text-align: center;
+	line-height: 15px;
+	left: -3px;
+	top: -3px;
+	color: #a0a5aa;
+	color: rgba(240,245,250,0.6);
 	font: normal 20px/1 dashicons !important;
-	speak: never;
+	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
 */
@@ -643,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;
 	}
@@ -689,7 +698,7 @@ li#wp-admin-bar-menu-toggle {
 	}

 	.auto-fold #adminmenu a.menu-top {
-		min-height: 34px;
+		height: 34px;
 	}

 	.auto-fold #adminmenu li.wp-menu-open {
@@ -722,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;
@@ -759,10 +776,6 @@ li#wp-admin-bar-menu-toggle {
 		z-index: 100;
 	}

-	.auto-fold #adminmenuback {
-		position: fixed;
-	}
-
 	.auto-fold #adminmenuback,
 	.auto-fold #adminmenuwrap {
 		display: none;
@@ -790,6 +803,7 @@ li#wp-admin-bar-menu-toggle {
 	/* Restore the menu names */
 	.auto-fold #adminmenu .wp-menu-name {
 		position: static;
+		margin-left: 35px;
 	}

 	/* Switch the arrow side */
@@ -815,6 +829,7 @@ li#wp-admin-bar-menu-toggle {
 		display: block;
 		top: 0;
 		left: -1px;
+		-webkit-box-shadow: none;
 		box-shadow: none;
 	}

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

@@ -899,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,77 +0,0 @@
-/*! This file is auto-generated */
-.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,31 +1,48 @@
-/*! This file is auto-generated */
-/* rtl:ignore */
 .wp-color-picker {
 	width: 80px;
-	direction: ltr;
 }

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

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

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

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

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

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

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

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

 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -86,33 +92,27 @@
 }

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

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

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

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

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

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

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

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

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

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

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

 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -85,33 +92,27 @@
 }

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

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

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

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

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

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

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

-.wp-core-ui .button-link {
-	color: $link;
-
-	&:hover,
-	&:active,
-	&:focus {
-		color: $link-focus;
-	}
-}
-
-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-	color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-	color: #dc3232;
-}

 /* Forms */

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

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

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

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

 /* Core UI */

 .wp-core-ui {
-
-	.button {
-		border-color: #7e8993;
-		color: #32373c;
-	}
-
-	.button.hover,
-	.button:hover,
-	.button.focus,
-	.button:focus {
-		border-color: darken( #7e8993, 5% );
-		color: darken( #32373c, 5% );
-	}
-
-	.button.focus,
-	.button:focus {
-		border-color: #7e8993;
-		color: darken( #32373c, 5% );
-		box-shadow: 0 0 0 1px #32373c;
-	}
-
-	.button:active {
-		border-color: #7e8993;
-		color: darken( #32373c, 5% );
-		box-shadow: none;
-	}
-
-	.button.active,
-	.button.active:focus,
-	.button.active:hover {
-		border-color: $button-color;
-		color: darken( #32373c, 5% );
-		box-shadow: inset 0 2px 5px -3px $button-color;
-	}
-
-	.button.active:focus {
-		box-shadow: 0 0 0 1px #32373c;
-	}
-
-	@if ( $low-contrast-theme != "true" ) {
-		.button,
-		.button-secondary {
-			color: $highlight-color;
-			border-color: $highlight-color;
-		}
-
-		.button.hover,
-		.button:hover,
-		.button-secondary:hover{
-			border-color: darken($highlight-color, 10);
-			color: darken($highlight-color, 10);
-		}
-
-		.button.focus,
-		.button:focus,
-		.button-secondary:focus {
-			border-color: lighten($highlight-color, 10);
-			color: darken($highlight-color, 20);;
-			box-shadow: 0 0 0 1px lighten($highlight-color, 10);
-		}
-
-		.button-primary {
-			&:hover {
-				color: #fff;
-			}
-		}
-	}
-
 	.button-primary {
 		@include button( $button-color );
 	}

-	.button-group > .button.active {
-		border-color: $button-color;
-	}
-
 	.wp-ui-primary {
 		color: $text-color;
 		background-color: $base-color;
@@ -208,28 +82,13 @@ textarea:focus {


 /* List tables */
-@if $low-contrast-theme == "true" {
-	.wrap .page-title-action:hover {
-		color: $menu-text;
-		background-color: $menu-background;
-	}
-} @else {
-	.wrap .page-title-action,
-	.wrap .page-title-action:active {
-		border: 1px solid $highlight-color;
-		color: $highlight-color;
-	}

-	.wrap .page-title-action:hover {
-		color: darken($highlight-color, 10);
-		border-color: darken($highlight-color, 10);
-	}
-
-	.wrap .page-title-action:focus {
-		border-color: lighten($highlight-color, 10);
-		color: darken($highlight-color, 20);;
-		box-shadow: 0 0 0 1px lighten($highlight-color, 10);
-	}
+.wrap .add-new-h2:hover, /* deprecated */
+.wrap .page-title-action:hover,
+.tablenav .tablenav-pages a:hover,
+.tablenav .tablenav-pages a:focus {
+	color: $menu-text;
+	background-color: $menu-background;
 }

 .view-switch a.current:before {
@@ -273,7 +132,7 @@ textarea:focus {

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

-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
 	background-color: $body-background;
@@ -343,7 +202,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
 	color: $menu-current-icon;
 }

@@ -367,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 {
@@ -456,7 +324,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -490,25 +357,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 */

@@ -568,7 +421,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;
 }


@@ -622,6 +480,13 @@ 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;
+}
+
 /* Responsive Component */

 div#wp-responsive-toggle a:before {
@@ -651,111 +516,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
 	background: $highlight-color;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-	color: $highlight-color;
-	border-left-color: $highlight-color;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-	color: $highlight-color;
-	border-top-color: $highlight-color;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-	color: $highlight-color;
-	border-left-color: $highlight-color;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-	color: $highlight-color;
-}
-
-.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 lighten($highlight-color, 10),
-		0 0 2px 1px $highlight-color;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-	color: $highlight-color;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-	border-left-color: $highlight-color;
-	color: $highlight-color;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-	background: $highlight-color;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-	color: $highlight-color;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-	color: $highlight-color;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-	background-color: #fbfbfc;
-	border-color: $highlight-color;
-	border-style: solid;
-	box-shadow: 0 0 0 1px $highlight-color;
-	outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-	border-bottom-color: $highlight-color;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-	color: $highlight-color;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-	box-shadow:
-		0 0 0 1px lighten($highlight-color, 10),
-		0 0 2px 1px $highlight-color;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-	color: $highlight-color;
-}
--- a/wp-admin/css/colors/_mixins.scss
+++ b/wp-admin/css/colors/_mixins.scss
@@ -1,37 +1,51 @@
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-@mixin button( $button-color, $button-text-color: #fff ) {
+@mixin button( $button-color, $text-color: white ) {
 	background: $button-color;
-	border-color: $button-color;
-	color: $button-text-color;
+	border-color: darken( $button-color, 10% ) darken( $button-color, 15% ) darken( $button-color, 15% );
+	color: $text-color;
+	box-shadow: 0 1px 0 darken( $button-color, 15% );
+	text-shadow: 0 -1px 1px darken( $button-color, 15% ),
+		1px 0 1px darken( $button-color, 15% ),
+		0 1px 1px darken( $button-color, 15% ),
+		-1px 0 1px darken( $button-color, 15% );

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

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

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

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

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

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

 // admin menu & admin-bar

@@ -56,10 +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;
-
-$low-contrast-theme: "false" !default;
--- a/wp-admin/css/colors/blue/colors-rtl.css
+++ b/wp-admin/css/colors/blue/colors-rtl.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #096484;
 }

-input[type=radio]:checked::before {
-  background: #7e8993;
+input[type=radio]:checked:before {
+  background: #096484;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #096484;
-  box-shadow: 0 0 0 1px #096484;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #e1a948;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #e1a948;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #096484;
-  border-color: #096484;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #064054;
-  color: #064054;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #0c88b4;
-  color: #021c25;
-  box-shadow: 0 0 0 1px #0c88b4;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #e1a948;
-  border-color: #e1a948;
-  color: #fff;
+  border-color: #d39323 #bd831f #bd831f;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #bd831f;
+  box-shadow: 0 1px 0 #bd831f;
+  text-shadow: 0 -1px 1px #bd831f, -1px 0 1px #bd831f, 0 1px 1px #bd831f, 1px 0 1px #bd831f;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e3af55;
-  border-color: #dfa33b;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e1a948;
-}
-.wp-core-ui .button-primary:active {
-  background: #dd9f32;
-  border-color: #dd9f32;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #e1a948;
-  color: #fff;
  border-color: #bd831f;
-  box-shadow: inset 0 2px 5px -3px #241906;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #bd831f;
+  box-shadow: 0 1px 0 #bd831f;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #e1a948;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #d39323;
+  border-color: #bd831f;
+  -webkit-box-shadow: inset 0 2px 0 #bd831f;
+  box-shadow: inset 0 2px 0 #bd831f;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #d1cdc7 !important;
+  background: #db9925 !important;
+  border-color: #bd831f !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #bd831f !important;
+  box-shadow: 0 2px 0 #bd831f !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #bd831f !important;
+  box-shadow: inset 0 3px 0 #bd831f !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #52accc;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #52accc;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #096484;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #096484;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #e1a948;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #e1a948;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #e5f8ff;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #096484;
-  color: #096484;
-}
-
-.wrap .page-title-action:hover {
-  color: #064054;
-  border-color: #064054;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #0c88b4;
-  color: #021c25;
-  box-shadow: 0 0 0 1px #0c88b4;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #e2ecf1;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -342,12 +259,19 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #096484;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #e5f8ff;
@@ -607,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #096484;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #096484;
-  border-right-color: #096484;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #096484;
-  border-top-color: #096484;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #096484;
-  border-right-color: #096484;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #096484;
-}
-
-.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 #0c88b4, 0 0 2px 1px #096484;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #096484;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-right-color: #096484;
-  color: #096484;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #096484;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #096484;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #096484;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #096484;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #096484;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #096484;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #096484;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #0c88b4, 0 0 2px 1px #096484;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #096484;
-}
--- a/wp-admin/css/colors/blue/colors-rtl.min.css
+++ b/wp-admin/css/colors/blue/colors-rtl.min.css
--- a/wp-admin/css/colors/blue/colors.css
+++ b/wp-admin/css/colors/blue/colors.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #096484;
 }

-input[type=radio]:checked::before {
-  background: #7e8993;
+input[type=radio]:checked:before {
+  background: #096484;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #096484;
-  box-shadow: 0 0 0 1px #096484;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #e1a948;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #e1a948;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #096484;
-  border-color: #096484;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #064054;
-  color: #064054;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #0c88b4;
-  color: #021c25;
-  box-shadow: 0 0 0 1px #0c88b4;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #e1a948;
-  border-color: #e1a948;
-  color: #fff;
+  border-color: #d39323 #bd831f #bd831f;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #bd831f;
+  box-shadow: 0 1px 0 #bd831f;
+  text-shadow: 0 -1px 1px #bd831f, 1px 0 1px #bd831f, 0 1px 1px #bd831f, -1px 0 1px #bd831f;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e3af55;
-  border-color: #dfa33b;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e1a948;
-}
-.wp-core-ui .button-primary:active {
-  background: #dd9f32;
-  border-color: #dd9f32;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #e1a948;
-  color: #fff;
  border-color: #bd831f;
-  box-shadow: inset 0 2px 5px -3px #241906;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #bd831f;
+  box-shadow: 0 1px 0 #bd831f;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #e1a948;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #d39323;
+  border-color: #bd831f;
+  -webkit-box-shadow: inset 0 2px 0 #bd831f;
+  box-shadow: inset 0 2px 0 #bd831f;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #d1cdc7 !important;
+  background: #db9925 !important;
+  border-color: #bd831f !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #bd831f !important;
+  box-shadow: 0 2px 0 #bd831f !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #bd831f !important;
+  box-shadow: inset 0 3px 0 #bd831f !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #52accc;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #52accc;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #096484;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #096484;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #e1a948;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #e1a948;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #e5f8ff;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #096484;
-  color: #096484;
-}
-
-.wrap .page-title-action:hover {
-  color: #064054;
-  border-color: #064054;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #0c88b4;
-  color: #021c25;
-  box-shadow: 0 0 0 1px #0c88b4;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #e2ecf1;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -342,12 +259,19 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #096484;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #e5f8ff;
@@ -607,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #096484;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #096484;
-  border-left-color: #096484;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #096484;
-  border-top-color: #096484;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #096484;
-  border-left-color: #096484;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #096484;
-}
-
-.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 #0c88b4, 0 0 2px 1px #096484;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #096484;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-left-color: #096484;
-  color: #096484;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #096484;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #096484;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #096484;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #096484;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #096484;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #096484;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #096484;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #0c88b4, 0 0 2px 1px #096484;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #096484;
-}
--- a/wp-admin/css/colors/blue/colors.min.css
+++ b/wp-admin/css/colors/blue/colors.min.css
--- a/wp-admin/css/colors/coffee/colors-rtl.css
+++ b/wp-admin/css/colors/coffee/colors-rtl.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%2359524c%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #59524c;
 }

-input[type=radio]:checked::before {
+input[type=radio]:checked:before {
  background: #59524c;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #c7a589;
-  box-shadow: 0 0 0 1px #c7a589;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #c7a589;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #c7a589;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #c7a589;
-  border-color: #c7a589;
-  color: #fff;
+  border-color: #b78b66 #ae7d55 #ae7d55;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ae7d55;
+  box-shadow: 0 1px 0 #ae7d55;
+  text-shadow: 0 -1px 1px #ae7d55, -1px 0 1px #ae7d55, 0 1px 1px #ae7d55, 1px 0 1px #ae7d55;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #ccad93;
-  border-color: #c29d7f;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #c7a589;
-}
-.wp-core-ui .button-primary:active {
-  background: #bf9878;
-  border-color: #bf9878;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #c7a589;
-  color: #fff;
  border-color: #ae7d55;
-  box-shadow: inset 0 2px 5px -3px #37271a;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ae7d55;
+  box-shadow: 0 1px 0 #ae7d55;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #c7a589;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #b78b66;
+  border-color: #ae7d55;
+  -webkit-box-shadow: inset 0 2px 0 #ae7d55;
+  box-shadow: inset 0 2px 0 #ae7d55;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #d1ccc7 !important;
+  background: #ba906d !important;
+  border-color: #ae7d55 !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ae7d55 !important;
+  box-shadow: 0 2px 0 #ae7d55 !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ae7d55 !important;
+  box-shadow: inset 0 3px 0 #ae7d55 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #59524c;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #59524c;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #c7a589;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #c7a589;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #9ea476;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #9ea476;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f2f1;
 }

 /* List tables */
-.wrap .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;
 }
@@ -213,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -244,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cdcbc9;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -262,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -289,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -309,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -395,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -427,23 +383,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 */
@@ -488,16 +445,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 */
@@ -548,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #c7a589;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f2f1;
@@ -574,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #c7a589;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #c7a589;
-  border-right-color: #c7a589;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #c7a589;
-  border-top-color: #c7a589;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #c7a589;
-  border-right-color: #c7a589;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #c7a589;
-}
-
-.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 #d7bfac, 0 0 2px 1px #c7a589;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #c7a589;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-right-color: #c7a589;
-  color: #c7a589;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #c7a589;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #c7a589;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #c7a589;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #c7a589;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #c7a589;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #c7a589;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #c7a589;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #d7bfac, 0 0 2px 1px #c7a589;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #c7a589;
-}
--- a/wp-admin/css/colors/coffee/colors-rtl.min.css
+++ b/wp-admin/css/colors/coffee/colors-rtl.min.css
--- a/wp-admin/css/colors/coffee/colors.css
+++ b/wp-admin/css/colors/coffee/colors.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%2359524c%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #59524c;
 }

-input[type=radio]:checked::before {
+input[type=radio]:checked:before {
  background: #59524c;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #c7a589;
-  box-shadow: 0 0 0 1px #c7a589;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #c7a589;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #c7a589;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
 .wp-core-ui .button-primary {
  background: #c7a589;
-  border-color: #c7a589;
-  color: #fff;
+  border-color: #b78b66 #ae7d55 #ae7d55;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ae7d55;
+  box-shadow: 0 1px 0 #ae7d55;
+  text-shadow: 0 -1px 1px #ae7d55, 1px 0 1px #ae7d55, 0 1px 1px #ae7d55, -1px 0 1px #ae7d55;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #ccad93;
-  border-color: #c29d7f;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #c7a589;
-}
-.wp-core-ui .button-primary:active {
-  background: #bf9878;
-  border-color: #bf9878;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #c7a589;
-  color: #fff;
  border-color: #ae7d55;
-  box-shadow: inset 0 2px 5px -3px #37271a;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ae7d55;
+  box-shadow: 0 1px 0 #ae7d55;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #c7a589;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #b78b66;
+  border-color: #ae7d55;
+  -webkit-box-shadow: inset 0 2px 0 #ae7d55;
+  box-shadow: inset 0 2px 0 #ae7d55;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #d1ccc7 !important;
+  background: #ba906d !important;
+  border-color: #ae7d55 !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ae7d55 !important;
+  box-shadow: 0 2px 0 #ae7d55 !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ae7d55 !important;
+  box-shadow: inset 0 3px 0 #ae7d55 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #59524c;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #59524c;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #c7a589;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #c7a589;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #9ea476;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #9ea476;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f2f1;
 }

 /* List tables */
-.wrap .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;
 }
@@ -213,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -244,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cdcbc9;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -262,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -289,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -309,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -395,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -427,23 +383,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 */
@@ -488,16 +445,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 */
@@ -548,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #c7a589;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f2f1;
@@ -574,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #c7a589;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #c7a589;
-  border-left-color: #c7a589;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #c7a589;
-  border-top-color: #c7a589;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #c7a589;
-  border-left-color: #c7a589;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #c7a589;
-}
-
-.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 #d7bfac, 0 0 2px 1px #c7a589;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #c7a589;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-left-color: #c7a589;
-  color: #c7a589;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #c7a589;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #c7a589;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #c7a589;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #c7a589;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #c7a589;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #c7a589;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #c7a589;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #d7bfac, 0 0 2px 1px #c7a589;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #c7a589;
-}
--- a/wp-admin/css/colors/coffee/colors.min.css
+++ b/wp-admin/css/colors/coffee/colors.min.css
--- a/wp-admin/css/colors/coffee/colors.scss
+++ b/wp-admin/css/colors/coffee/colors.scss
@@ -1,7 +1,6 @@
 $base-color: #59524c;
 $highlight-color: #c7a589;
 $notification-color: #9ea476;
-$low-contrast-theme: "true";

 $form-checked: $base-color;

--- a/wp-admin/css/colors/ectoplasm/colors-rtl.css
+++ b/wp-admin/css/colors/ectoplasm/colors-rtl.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23523f6d%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #523f6d;
 }

-input[type=radio]:checked::before {
+input[type=radio]:checked:before {
  background: #523f6d;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #a3b745;
-  box-shadow: 0 0 0 1px #a3b745;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #a3b745;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #a3b745;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #a3b745;
-  border-color: #a3b745;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #829237;
-  color: #829237;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #b6c669;
-  color: #616d29;
-  box-shadow: 0 0 0 1px #b6c669;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #a3b745;
-  border-color: #a3b745;
-  color: #fff;
+  border-color: #829237 #727f30 #727f30;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #727f30;
+  box-shadow: 0 1px 0 #727f30;
+  text-shadow: 0 -1px 1px #727f30, -1px 0 1px #727f30, 0 1px 1px #727f30, 1px 0 1px #727f30;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a9bd4f;
-  border-color: #99ac41;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #a3b745;
-}
-.wp-core-ui .button-primary:active {
-  background: #93a43e;
-  border-color: #93a43e;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #a3b745;
-  color: #fff;
  border-color: #727f30;
-  box-shadow: inset 0 2px 5px -3px black;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #727f30;
+  box-shadow: 0 1px 0 #727f30;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #a3b745;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #829237;
+  border-color: #727f30;
+  -webkit-box-shadow: inset 0 2px 0 #727f30;
+  box-shadow: inset 0 2px 0 #727f30;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #cfd1c7 !important;
+  background: #89993a !important;
+  border-color: #727f30 !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #727f30 !important;
+  box-shadow: 0 2px 0 #727f30 !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #727f30 !important;
+  box-shadow: inset 0 3px 0 #727f30 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #523f6d;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #523f6d;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #a3b745;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #a3b745;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d46f15;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #d46f15;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #ece6f6;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #a3b745;
-  color: #a3b745;
-}
-
-.wrap .page-title-action:hover {
-  color: #829237;
-  border-color: #829237;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #b6c669;
-  color: #616d29;
-  box-shadow: 0 0 0 1px #b6c669;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cbc5d3;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -342,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #a3b745;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #ece6f6;
@@ -607,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #a3b745;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #a3b745;
-  border-right-color: #a3b745;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #a3b745;
-  border-top-color: #a3b745;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #a3b745;
-  border-right-color: #a3b745;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #a3b745;
-}
-
-.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 #b6c669, 0 0 2px 1px #a3b745;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #a3b745;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-right-color: #a3b745;
-  color: #a3b745;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #a3b745;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #a3b745;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #a3b745;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #a3b745;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #a3b745;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #a3b745;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #a3b745;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #b6c669, 0 0 2px 1px #a3b745;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #a3b745;
-}
--- a/wp-admin/css/colors/ectoplasm/colors-rtl.min.css
+++ b/wp-admin/css/colors/ectoplasm/colors-rtl.min.css
--- a/wp-admin/css/colors/ectoplasm/colors.css
+++ b/wp-admin/css/colors/ectoplasm/colors.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23523f6d%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #523f6d;
 }

-input[type=radio]:checked::before {
+input[type=radio]:checked:before {
  background: #523f6d;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #a3b745;
-  box-shadow: 0 0 0 1px #a3b745;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #a3b745;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #a3b745;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #a3b745;
-  border-color: #a3b745;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #829237;
-  color: #829237;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #b6c669;
-  color: #616d29;
-  box-shadow: 0 0 0 1px #b6c669;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #a3b745;
-  border-color: #a3b745;
-  color: #fff;
+  border-color: #829237 #727f30 #727f30;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #727f30;
+  box-shadow: 0 1px 0 #727f30;
+  text-shadow: 0 -1px 1px #727f30, 1px 0 1px #727f30, 0 1px 1px #727f30, -1px 0 1px #727f30;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #a9bd4f;
-  border-color: #99ac41;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #a3b745;
-}
-.wp-core-ui .button-primary:active {
-  background: #93a43e;
-  border-color: #93a43e;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #a3b745;
-  color: #fff;
  border-color: #727f30;
-  box-shadow: inset 0 2px 5px -3px black;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #727f30;
+  box-shadow: 0 1px 0 #727f30;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #a3b745;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #829237;
+  border-color: #727f30;
+  -webkit-box-shadow: inset 0 2px 0 #727f30;
+  box-shadow: inset 0 2px 0 #727f30;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #cfd1c7 !important;
+  background: #89993a !important;
+  border-color: #727f30 !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #727f30 !important;
+  box-shadow: 0 2px 0 #727f30 !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #727f30 !important;
+  box-shadow: inset 0 3px 0 #727f30 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #523f6d;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #523f6d;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #a3b745;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #a3b745;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d46f15;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #d46f15;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #ece6f6;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #a3b745;
-  color: #a3b745;
-}
-
-.wrap .page-title-action:hover {
-  color: #829237;
-  border-color: #829237;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #b6c669;
-  color: #616d29;
-  box-shadow: 0 0 0 1px #b6c669;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #cbc5d3;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -342,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #a3b745;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #ece6f6;
@@ -607,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #a3b745;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #a3b745;
-  border-left-color: #a3b745;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #a3b745;
-  border-top-color: #a3b745;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #a3b745;
-  border-left-color: #a3b745;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #a3b745;
-}
-
-.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 #b6c669, 0 0 2px 1px #a3b745;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #a3b745;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-left-color: #a3b745;
-  color: #a3b745;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #a3b745;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #a3b745;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #a3b745;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #a3b745;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #a3b745;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #a3b745;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #a3b745;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #b6c669, 0 0 2px 1px #a3b745;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #a3b745;
-}
--- a/wp-admin/css/colors/ectoplasm/colors.min.css
+++ b/wp-admin/css/colors/ectoplasm/colors.min.css
--- a/wp-admin/css/colors/light/colors-rtl.css
+++ b/wp-admin/css/colors/light/colors-rtl.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f5f5f5;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #04a4cc;
 }

-input[type=radio]:checked::before {
-  background: #7e8993;
+input[type=radio]:checked:before {
+  background: #04a4cc;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #04a4cc;
-  box-shadow: 0 0 0 1px #04a4cc;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #04a4cc;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #04a4cc;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #04a4cc;
-  border-color: #04a4cc;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #037c9a;
-  color: #037c9a;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #09cafa;
-  color: #025468;
-  box-shadow: 0 0 0 1px #09cafa;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #04a4cc;
-  border-color: #04a4cc;
-  color: #fff;
+  border-color: #037c9a #036881 #036881;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #036881;
+  box-shadow: 0 1px 0 #036881;
+  text-shadow: 0 -1px 1px #036881, -1px 0 1px #036881, 0 1px 1px #036881, 1px 0 1px #036881;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #04b0db;
-  border-color: #0498bd;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #04a4cc;
-}
-.wp-core-ui .button-primary:active {
-  background: #0490b3;
-  border-color: #0490b3;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #04a4cc;
-  color: #fff;
  border-color: #036881;
-  box-shadow: inset 0 2px 5px -3px black;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #036881;
+  box-shadow: 0 1px 0 #036881;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #04a4cc;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #037c9a;
+  border-color: #036881;
+  -webkit-box-shadow: inset 0 2px 0 #036881;
+  box-shadow: inset 0 2px 0 #036881;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #c7cfd1 !important;
+  background: #0384a4 !important;
+  border-color: #036881 !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #036881 !important;
+  box-shadow: 0 2px 0 #036881 !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #036881 !important;
+  box-shadow: inset 0 3px 0 #036881 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #333;
  background-color: #e5e5e5;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #e5e5e5;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #888;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #888;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d64e07;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #d64e07;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #999;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #04a4cc;
-  color: #04a4cc;
-}
-
-.wrap .page-title-action:hover {
-  color: #037c9a;
-  border-color: #037c9a;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #09cafa;
-  color: #025468;
-  box-shadow: 0 0 0 1px #09cafa;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f5f5f5;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #686868;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #333;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #ccc;
 }

@@ -342,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #888;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #999;
@@ -608,110 +541,6 @@ div#wp-responsive-toggle a:before {
  background: #04a4cc;
 }

-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #04a4cc;
-  border-right-color: #04a4cc;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #04a4cc;
-  border-top-color: #04a4cc;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #04a4cc;
-  border-right-color: #04a4cc;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #04a4cc;
-}
-
-.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 #09cafa, 0 0 2px 1px #04a4cc;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #04a4cc;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-right-color: #04a4cc;
-  color: #04a4cc;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #04a4cc;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #04a4cc;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #04a4cc;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #04a4cc;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #04a4cc;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #04a4cc;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #04a4cc;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #09cafa, 0 0 2px 1px #04a4cc;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #04a4cc;
-}
-
 /* temporary fix for admin-bar hover color */
 #wpadminbar .ab-top-menu > li:hover > .ab-item,
 #wpadminbar .ab-top-menu > li.hover > .ab-item,
@@ -728,4 +557,4 @@ div#wp-responsive-toggle a:before {
 .theme-section.current,
 .theme-filter.current {
  border-bottom-color: #04a4cc;
-}
+}
--- a/wp-admin/css/colors/light/colors-rtl.min.css
+++ b/wp-admin/css/colors/light/colors-rtl.min.css
--- a/wp-admin/css/colors/light/colors.css
+++ b/wp-admin/css/colors/light/colors.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f5f5f5;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #04a4cc;
 }

-input[type=radio]:checked::before {
-  background: #7e8993;
+input[type=radio]:checked:before {
+  background: #04a4cc;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #04a4cc;
-  box-shadow: 0 0 0 1px #04a4cc;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #04a4cc;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #04a4cc;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #04a4cc;
-  border-color: #04a4cc;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #037c9a;
-  color: #037c9a;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #09cafa;
-  color: #025468;
-  box-shadow: 0 0 0 1px #09cafa;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #04a4cc;
-  border-color: #04a4cc;
-  color: #fff;
+  border-color: #037c9a #036881 #036881;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #036881;
+  box-shadow: 0 1px 0 #036881;
+  text-shadow: 0 -1px 1px #036881, 1px 0 1px #036881, 0 1px 1px #036881, -1px 0 1px #036881;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #04b0db;
-  border-color: #0498bd;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #04a4cc;
-}
-.wp-core-ui .button-primary:active {
-  background: #0490b3;
-  border-color: #0490b3;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #04a4cc;
-  color: #fff;
  border-color: #036881;
-  box-shadow: inset 0 2px 5px -3px black;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #036881;
+  box-shadow: 0 1px 0 #036881;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #04a4cc;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #037c9a;
+  border-color: #036881;
+  -webkit-box-shadow: inset 0 2px 0 #036881;
+  box-shadow: inset 0 2px 0 #036881;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #c7cfd1 !important;
+  background: #0384a4 !important;
+  border-color: #036881 !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #036881 !important;
+  box-shadow: 0 2px 0 #036881 !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #036881 !important;
+  box-shadow: inset 0 3px 0 #036881 !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #333;
  background-color: #e5e5e5;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #e5e5e5;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #888;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #888;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #d64e07;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #d64e07;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #999;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #04a4cc;
-  color: #04a4cc;
-}
-
-.wrap .page-title-action:hover {
-  color: #037c9a;
-  border-color: #037c9a;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #09cafa;
-  color: #025468;
-  box-shadow: 0 0 0 1px #09cafa;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f5f5f5;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #686868;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #333;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #ccc;
 }

@@ -342,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #888;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #999;
@@ -608,110 +541,6 @@ div#wp-responsive-toggle a:before {
  background: #04a4cc;
 }

-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #04a4cc;
-  border-left-color: #04a4cc;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #04a4cc;
-  border-top-color: #04a4cc;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #04a4cc;
-  border-left-color: #04a4cc;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #04a4cc;
-}
-
-.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 #09cafa, 0 0 2px 1px #04a4cc;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #04a4cc;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-left-color: #04a4cc;
-  color: #04a4cc;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #04a4cc;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #04a4cc;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #04a4cc;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #04a4cc;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #04a4cc;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #04a4cc;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #04a4cc;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #09cafa, 0 0 2px 1px #04a4cc;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #04a4cc;
-}
-
 /* temporary fix for admin-bar hover color */
 #wpadminbar .ab-top-menu > li:hover > .ab-item,
 #wpadminbar .ab-top-menu > li.hover > .ab-item,
@@ -728,4 +557,4 @@ div#wp-responsive-toggle a:before {
 .theme-section.current,
 .theme-filter.current {
  border-bottom-color: #04a4cc;
-}
+}
--- a/wp-admin/css/colors/light/colors.min.css
+++ b/wp-admin/css/colors/light/colors.min.css
--- a/wp-admin/css/colors/midnight/colors-rtl.css
+++ b/wp-admin/css/colors/midnight/colors-rtl.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #e14d43;
 }

-input[type=radio]:checked::before {
-  background: #7e8993;
+input[type=radio]:checked:before {
+  background: #e14d43;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #e14d43;
-  box-shadow: 0 0 0 1px #e14d43;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #e14d43;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #e14d43;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #e14d43;
-  border-color: #e14d43;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #d02c21;
-  color: #d02c21;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #e8776f;
-  color: #a4231a;
-  box-shadow: 0 0 0 1px #e8776f;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #e14d43;
-  border-color: #e14d43;
-  color: #fff;
+  border-color: #d02c21 #ba281e #ba281e;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ba281e;
+  box-shadow: 0 1px 0 #ba281e;
+  text-shadow: 0 -1px 1px #ba281e, -1px 0 1px #ba281e, 0 1px 1px #ba281e, 1px 0 1px #ba281e;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e35950;
-  border-color: #df4136;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e14d43;
-}
-.wp-core-ui .button-primary:active {
-  background: #dd382d;
-  border-color: #dd382d;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #e14d43;
-  color: #fff;
  border-color: #ba281e;
-  box-shadow: inset 0 2px 5px -3px #200705;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ba281e;
+  box-shadow: 0 1px 0 #ba281e;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #e14d43;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #d02c21;
+  border-color: #ba281e;
+  -webkit-box-shadow: inset 0 2px 0 #ba281e;
+  box-shadow: inset 0 2px 0 #ba281e;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #d1c8c7 !important;
+  background: #d92e23 !important;
+  border-color: #ba281e !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ba281e !important;
+  box-shadow: 0 2px 0 #ba281e !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ba281e !important;
+  box-shadow: inset 0 3px 0 #ba281e !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #363b3f;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #363b3f;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #e14d43;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #e14d43;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #69a8bb;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #69a8bb;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f1f2f3;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #e14d43;
-  color: #e14d43;
-}
-
-.wrap .page-title-action:hover {
-  color: #d02c21;
-  border-color: #d02c21;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #e8776f;
-  color: #a4231a;
-  box-shadow: 0 0 0 1px #e8776f;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #c3c4c5;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -342,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #e14d43;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f1f2f3;
@@ -607,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #e14d43;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #e14d43;
-  border-right-color: #e14d43;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #e14d43;
-  border-top-color: #e14d43;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #e14d43;
-  border-right-color: #e14d43;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #e14d43;
-}
-
-.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 #e8776f, 0 0 2px 1px #e14d43;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #e14d43;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-right-color: #e14d43;
-  color: #e14d43;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #e14d43;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #e14d43;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #e14d43;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #e14d43;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #e14d43;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #e14d43;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #e14d43;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #e8776f, 0 0 2px 1px #e14d43;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #e14d43;
-}
--- a/wp-admin/css/colors/midnight/colors-rtl.min.css
+++ b/wp-admin/css/colors/midnight/colors-rtl.min.css
--- a/wp-admin/css/colors/midnight/colors.css
+++ b/wp-admin/css/colors/midnight/colors.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #e14d43;
 }

-input[type=radio]:checked::before {
-  background: #7e8993;
+input[type=radio]:checked:before {
+  background: #e14d43;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #e14d43;
-  box-shadow: 0 0 0 1px #e14d43;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #e14d43;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #e14d43;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #e14d43;
-  border-color: #e14d43;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #d02c21;
-  color: #d02c21;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #e8776f;
-  color: #a4231a;
-  box-shadow: 0 0 0 1px #e8776f;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #e14d43;
-  border-color: #e14d43;
-  color: #fff;
+  border-color: #d02c21 #ba281e #ba281e;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ba281e;
+  box-shadow: 0 1px 0 #ba281e;
+  text-shadow: 0 -1px 1px #ba281e, 1px 0 1px #ba281e, 0 1px 1px #ba281e, -1px 0 1px #ba281e;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #e35950;
-  border-color: #df4136;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #e14d43;
-}
-.wp-core-ui .button-primary:active {
-  background: #dd382d;
-  border-color: #dd382d;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #e14d43;
-  color: #fff;
  border-color: #ba281e;
-  box-shadow: inset 0 2px 5px -3px #200705;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ba281e;
+  box-shadow: 0 1px 0 #ba281e;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #e14d43;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #d02c21;
+  border-color: #ba281e;
+  -webkit-box-shadow: inset 0 2px 0 #ba281e;
+  box-shadow: inset 0 2px 0 #ba281e;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #d1c8c7 !important;
+  background: #d92e23 !important;
+  border-color: #ba281e !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ba281e !important;
+  box-shadow: 0 2px 0 #ba281e !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ba281e !important;
+  box-shadow: inset 0 3px 0 #ba281e !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #363b3f;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #363b3f;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #e14d43;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #e14d43;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #69a8bb;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #69a8bb;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f1f2f3;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #e14d43;
-  color: #e14d43;
-}
-
-.wrap .page-title-action:hover {
-  color: #d02c21;
-  border-color: #d02c21;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #e8776f;
-  color: #a4231a;
-  box-shadow: 0 0 0 1px #e8776f;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #c3c4c5;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -342,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #e14d43;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f1f2f3;
@@ -607,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #e14d43;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #e14d43;
-  border-left-color: #e14d43;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #e14d43;
-  border-top-color: #e14d43;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #e14d43;
-  border-left-color: #e14d43;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #e14d43;
-}
-
-.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 #e8776f, 0 0 2px 1px #e14d43;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #e14d43;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-left-color: #e14d43;
-  color: #e14d43;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #e14d43;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #e14d43;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #e14d43;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #e14d43;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #e14d43;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #e14d43;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #e14d43;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #e8776f, 0 0 2px 1px #e14d43;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #e14d43;
-}
--- a/wp-admin/css/colors/midnight/colors.min.css
+++ b/wp-admin/css/colors/midnight/colors.min.css
--- a/wp-admin/css/colors/modern/colors-rtl.css
+++ b/wp-admin/css/colors/modern/colors-rtl.css
@@ -1,713 +0,0 @@
-/*! This file is auto-generated */
-/*
- * Button mixin- creates a button effect with correct
- * highlights/shadows, based on a base color.
- */
-body {
-  background: #f1f1f1;
-}
-
-/* Links */
-a {
-  color: #3858e9;
-}
-a:hover, a:active, a:focus {
-  color: #183ad6;
-}
-
-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-.wp-core-ui .button-link {
-  color: #3858e9;
-}
-.wp-core-ui .button-link:hover, .wp-core-ui .button-link:active, .wp-core-ui .button-link:focus {
-  color: #183ad6;
-}
-
-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
-  color: #183ad6;
-}
-
-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #3858e9;
-  box-shadow: 0 0 0 1px #3858e9;
-}
-
-/* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #3858e9;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #3858e9;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #3858e9;
-  border-color: #3858e9;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #183ad6;
-  color: #183ad6;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #667fee;
-  color: #132ea8;
-  box-shadow: 0 0 0 1px #667fee;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
-.wp-core-ui .button-primary {
-  background: #3858e9;
-  border-color: #3858e9;
-  color: #fff;
-}
-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #4664eb;
-  border-color: #2a4ce7;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #3858e9;
-}
-.wp-core-ui .button-primary:active {
-  background: #2145e6;
-  border-color: #2145e6;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #3858e9;
-  color: #fff;
-  border-color: #1534bf;
-  box-shadow: inset 0 2px 5px -3px #03081f;
-}
-.wp-core-ui .button-group > .button.active {
-  border-color: #3858e9;
-}
-.wp-core-ui .wp-ui-primary {
-  color: #fff;
-  background-color: #1e1e1e;
-}
-.wp-core-ui .wp-ui-text-primary {
-  color: #1e1e1e;
-}
-.wp-core-ui .wp-ui-highlight {
-  color: #fff;
-  background-color: #3858e9;
-}
-.wp-core-ui .wp-ui-text-highlight {
-  color: #3858e9;
-}
-.wp-core-ui .wp-ui-notification {
-  color: #fff;
-  background-color: #3858e9;
-}
-.wp-core-ui .wp-ui-text-notification {
-  color: #3858e9;
-}
-.wp-core-ui .wp-ui-text-icon {
-  color: #f3f1f1;
-}
-
-/* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #3858e9;
-  color: #3858e9;
-}
-
-.wrap .page-title-action:hover {
-  color: #183ad6;
-  border-color: #183ad6;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #667fee;
-  color: #132ea8;
-  box-shadow: 0 0 0 1px #667fee;
-}
-
-.view-switch a.current:before {
-  color: #1e1e1e;
-}
-
-.view-switch a:hover:before {
-  color: #3858e9;
-}
-
-/* Admin Menu */
-#adminmenuback,
-#adminmenuwrap,
-#adminmenu {
-  background: #1e1e1e;
-}
-
-#adminmenu a {
-  color: #fff;
-}
-
-#adminmenu div.wp-menu-image:before {
-  color: #f3f1f1;
-}
-
-#adminmenu a:hover,
-#adminmenu li.menu-top:hover,
-#adminmenu li.opensub > a.menu-top,
-#adminmenu li > a.menu-top:focus {
-  color: #fff;
-  background-color: #3858e9;
-}
-
-#adminmenu li.menu-top:hover div.wp-menu-image:before,
-#adminmenu li.opensub > a.menu-top div.wp-menu-image:before {
-  color: #fff;
-}
-
-/* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
-.nav-tab-active,
-.nav-tab-active:hover {
-  background-color: #f1f1f1;
-  border-bottom-color: #f1f1f1;
-}
-
-/* Admin Menu: submenu */
-#adminmenu .wp-submenu,
-#adminmenu .wp-has-current-submenu .wp-submenu,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu {
-  background: #0c0c0c;
-}
-
-#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after {
-  border-left-color: #0c0c0c;
-}
-
-#adminmenu .wp-submenu .wp-submenu-head {
-  color: #bcbcbc;
-}
-
-#adminmenu .wp-submenu a,
-#adminmenu .wp-has-current-submenu .wp-submenu a,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu a,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
-  color: #bcbcbc;
-}
-#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 {
-  color: #33f078;
-}
-
-/* Admin Menu: current */
-#adminmenu .wp-submenu li.current a,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
-  color: #fff;
-}
-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
-#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: #33f078;
-}
-
-ul#adminmenu a.wp-has-current-submenu:after,
-ul#adminmenu > li.current > a.current:after {
-  border-left-color: #f1f1f1;
-}
-
-#adminmenu li.current a.menu-top,
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,
-.folded #adminmenu li.current.menu-top {
-  color: #fff;
-  background: #3858e9;
-}
-
-#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,
-#adminmenu a.current:hover div.wp-menu-image:before,
-#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,
-#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
-#adminmenu li:hover div.wp-menu-image:before,
-#adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
-  color: #fff;
-}
-
-/* Admin Menu: bubble */
-#adminmenu .awaiting-mod,
-#adminmenu .update-plugins {
-  color: #fff;
-  background: #3858e9;
-}
-
-#adminmenu li.current a .awaiting-mod,
-#adminmenu li a.wp-has-current-submenu .update-plugins,
-#adminmenu li:hover a .awaiting-mod,
-#adminmenu li.menu-top:hover > a .update-plugins {
-  color: #fff;
-  background: #0c0c0c;
-}
-
-/* Admin Menu: collapse button */
-#collapse-button {
-  color: #f3f1f1;
-}
-
-#collapse-button:hover,
-#collapse-button:focus {
-  color: #33f078;
-}
-
-/* Admin Bar */
-#wpadminbar {
-  color: #fff;
-  background: #1e1e1e;
-}
-
-#wpadminbar .ab-item,
-#wpadminbar a.ab-item,
-#wpadminbar > #wp-toolbar span.ab-label,
-#wpadminbar > #wp-toolbar span.noticon {
-  color: #fff;
-}
-
-#wpadminbar .ab-icon,
-#wpadminbar .ab-icon:before,
-#wpadminbar .ab-item:before,
-#wpadminbar .ab-item:after {
-  color: #f3f1f1;
-}
-
-#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus,
-#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus,
-#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item,
-#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item {
-  color: #33f078;
-  background: #0c0c0c;
-}
-
-#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label,
-#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label,
-#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label {
-  color: #33f078;
-}
-
-#wpadminbar:not(.mobile) li:hover .ab-icon:before,
-#wpadminbar:not(.mobile) li:hover .ab-item:before,
-#wpadminbar:not(.mobile) li:hover .ab-item:after,
-#wpadminbar:not(.mobile) li:hover #adminbarsearch:before {
-  color: #fff;
-}
-
-/* Admin Bar: submenu */
-#wpadminbar .menupop .ab-sub-wrapper {
-  background: #0c0c0c;
-}
-
-#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,
-#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu {
-  background: #303030;
-}
-
-#wpadminbar .ab-submenu .ab-item,
-#wpadminbar .quicklinks .menupop ul li a,
-#wpadminbar .quicklinks .menupop.hover ul li a,
-#wpadminbar.nojs .quicklinks .menupop:hover ul li a {
-  color: #bcbcbc;
-}
-
-#wpadminbar .quicklinks li .blavatar,
-#wpadminbar .menupop .menupop > .ab-item:before {
-  color: #f3f1f1;
-}
-
-#wpadminbar .quicklinks .menupop ul li a:hover,
-#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,
-#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,
-#wpadminbar li:hover .ab-icon:before,
-#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,
-#wpadminbar li #adminbarsearch.adminbar-focused:before {
-  color: #33f078;
-}
-
-#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 {
-  color: #33f078;
-}
-
-#wpadminbar.mobile .quicklinks .hover .ab-icon:before,
-#wpadminbar.mobile .quicklinks .hover .ab-item:before {
-  color: #f3f1f1;
-}
-
-/* Admin Bar: search */
-#wpadminbar #adminbarsearch:before {
-  color: #f3f1f1;
-}
-
-#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
-  color: #fff;
-  background: #303030;
-}
-
-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #3858e9;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #324fd2;
-}
-
-/* Admin Bar: my account */
-#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #303030;
-  background-color: #303030;
-}
-
-#wpadminbar #wp-admin-bar-user-info .display-name {
-  color: #fff;
-}
-
-#wpadminbar #wp-admin-bar-user-info a:hover .display-name {
-  color: #33f078;
-}
-
-#wpadminbar #wp-admin-bar-user-info .username {
-  color: #bcbcbc;
-}
-
-/* Pointers */
-.wp-pointer .wp-pointer-content h3 {
-  background-color: #3858e9;
-  border-color: #2145e6;
-}
-
-.wp-pointer .wp-pointer-content h3:before {
-  color: #3858e9;
-}
-
-.wp-pointer.wp-pointer-top .wp-pointer-arrow,
-.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,
-.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,
-.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner {
-  border-bottom-color: #3858e9;
-}
-
-/* Media */
-.media-item .bar,
-.media-progress-bar div {
-  background-color: #3858e9;
-}
-
-.details.attachment {
-  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #3858e9;
-}
-
-.attachment.details .check {
-  background-color: #3858e9;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #3858e9;
-}
-
-.media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #3858e9;
-}
-
-/* Themes */
-.theme-browser .theme.active .theme-name,
-.theme-browser .theme.add-new-theme a:hover:after,
-.theme-browser .theme.add-new-theme a:focus:after {
-  background: #3858e9;
-}
-
-.theme-browser .theme.add-new-theme a:hover span:after,
-.theme-browser .theme.add-new-theme a:focus span:after {
-  color: #3858e9;
-}
-
-.theme-section.current,
-.theme-filter.current {
-  border-bottom-color: #1e1e1e;
-}
-
-body.more-filters-opened .more-filters {
-  color: #fff;
-  background-color: #1e1e1e;
-}
-
-body.more-filters-opened .more-filters:before {
-  color: #fff;
-}
-
-body.more-filters-opened .more-filters:hover,
-body.more-filters-opened .more-filters:focus {
-  background-color: #3858e9;
-  color: #fff;
-}
-
-body.more-filters-opened .more-filters:hover:before,
-body.more-filters-opened .more-filters:focus:before {
-  color: #fff;
-}
-
-/* Widgets */
-.widgets-chooser li.widgets-chooser-selected {
-  background-color: #3858e9;
-  color: #fff;
-}
-
-.widgets-chooser li.widgets-chooser-selected:before,
-.widgets-chooser li.widgets-chooser-selected:focus:before {
-  color: #fff;
-}
-
-/* Responsive Component */
-div#wp-responsive-toggle a:before {
-  color: #f3f1f1;
-}
-
-.wp-responsive-open div#wp-responsive-toggle a {
-  border-color: transparent;
-  background: #3858e9;
-}
-
-.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a {
-  background: #0c0c0c;
-}
-
-.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before {
-  color: #f3f1f1;
-}
-
-/* TinyMCE */
-.mce-container.mce-menu .mce-menu-item:hover,
-.mce-container.mce-menu .mce-menu-item.mce-selected,
-.mce-container.mce-menu .mce-menu-item:focus,
-.mce-container.mce-menu .mce-menu-item-normal.mce-active,
-.mce-container.mce-menu .mce-menu-item-preview.mce-active {
-  background: #3858e9;
-}
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #3858e9;
-  border-right-color: #3858e9;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #3858e9;
-  border-top-color: #3858e9;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #3858e9;
-  border-right-color: #3858e9;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #3858e9;
-}
-
-.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 #667fee, 0 0 2px 1px #3858e9;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #3858e9;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-right-color: #3858e9;
-  color: #3858e9;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #3858e9;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #3858e9;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #3858e9;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #3858e9;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #3858e9;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #3858e9;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #3858e9;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #667fee, 0 0 2px 1px #3858e9;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #3858e9;
-}
--- a/wp-admin/css/colors/modern/colors-rtl.min.css
+++ b/wp-admin/css/colors/modern/colors-rtl.min.css
--- a/wp-admin/css/colors/modern/colors.css
+++ b/wp-admin/css/colors/modern/colors.css
@@ -1,713 +0,0 @@
-/*! This file is auto-generated */
-/*
- * Button mixin- creates a button effect with correct
- * highlights/shadows, based on a base color.
- */
-body {
-  background: #f1f1f1;
-}
-
-/* Links */
-a {
-  color: #3858e9;
-}
-a:hover, a:active, a:focus {
-  color: #183ad6;
-}
-
-#post-body .misc-pub-post-status:before,
-#post-body #visibility:before,
-.curtime #timestamp:before,
-#post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
-  color: currentColor;
-}
-
-.wp-core-ui .button-link {
-  color: #3858e9;
-}
-.wp-core-ui .button-link:hover, .wp-core-ui .button-link:active, .wp-core-ui .button-link:focus {
-  color: #183ad6;
-}
-
-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
-/* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
-}
-
-input[type=radio]:checked::before {
-  background: #7e8993;
-}
-
-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
-  color: #183ad6;
-}
-
-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #3858e9;
-  box-shadow: 0 0 0 1px #3858e9;
-}
-
-/* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #3858e9;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #3858e9;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #3858e9;
-  border-color: #3858e9;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #183ad6;
-  color: #183ad6;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #667fee;
-  color: #132ea8;
-  box-shadow: 0 0 0 1px #667fee;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
-.wp-core-ui .button-primary {
-  background: #3858e9;
-  border-color: #3858e9;
-  color: #fff;
-}
-.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-  background: #4664eb;
-  border-color: #2a4ce7;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #3858e9;
-}
-.wp-core-ui .button-primary:active {
-  background: #2145e6;
-  border-color: #2145e6;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #3858e9;
-  color: #fff;
-  border-color: #1534bf;
-  box-shadow: inset 0 2px 5px -3px #03081f;
-}
-.wp-core-ui .button-group > .button.active {
-  border-color: #3858e9;
-}
-.wp-core-ui .wp-ui-primary {
-  color: #fff;
-  background-color: #1e1e1e;
-}
-.wp-core-ui .wp-ui-text-primary {
-  color: #1e1e1e;
-}
-.wp-core-ui .wp-ui-highlight {
-  color: #fff;
-  background-color: #3858e9;
-}
-.wp-core-ui .wp-ui-text-highlight {
-  color: #3858e9;
-}
-.wp-core-ui .wp-ui-notification {
-  color: #fff;
-  background-color: #3858e9;
-}
-.wp-core-ui .wp-ui-text-notification {
-  color: #3858e9;
-}
-.wp-core-ui .wp-ui-text-icon {
-  color: #f3f1f1;
-}
-
-/* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #3858e9;
-  color: #3858e9;
-}
-
-.wrap .page-title-action:hover {
-  color: #183ad6;
-  border-color: #183ad6;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #667fee;
-  color: #132ea8;
-  box-shadow: 0 0 0 1px #667fee;
-}
-
-.view-switch a.current:before {
-  color: #1e1e1e;
-}
-
-.view-switch a:hover:before {
-  color: #3858e9;
-}
-
-/* Admin Menu */
-#adminmenuback,
-#adminmenuwrap,
-#adminmenu {
-  background: #1e1e1e;
-}
-
-#adminmenu a {
-  color: #fff;
-}
-
-#adminmenu div.wp-menu-image:before {
-  color: #f3f1f1;
-}
-
-#adminmenu a:hover,
-#adminmenu li.menu-top:hover,
-#adminmenu li.opensub > a.menu-top,
-#adminmenu li > a.menu-top:focus {
-  color: #fff;
-  background-color: #3858e9;
-}
-
-#adminmenu li.menu-top:hover div.wp-menu-image:before,
-#adminmenu li.opensub > a.menu-top div.wp-menu-image:before {
-  color: #fff;
-}
-
-/* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
-.nav-tab-active,
-.nav-tab-active:hover {
-  background-color: #f1f1f1;
-  border-bottom-color: #f1f1f1;
-}
-
-/* Admin Menu: submenu */
-#adminmenu .wp-submenu,
-#adminmenu .wp-has-current-submenu .wp-submenu,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu {
-  background: #0c0c0c;
-}
-
-#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after {
-  border-right-color: #0c0c0c;
-}
-
-#adminmenu .wp-submenu .wp-submenu-head {
-  color: #bcbcbc;
-}
-
-#adminmenu .wp-submenu a,
-#adminmenu .wp-has-current-submenu .wp-submenu a,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu a,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
-  color: #bcbcbc;
-}
-#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 {
-  color: #33f078;
-}
-
-/* Admin Menu: current */
-#adminmenu .wp-submenu li.current a,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a,
-#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
-  color: #fff;
-}
-#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
-#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
-#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: #33f078;
-}
-
-ul#adminmenu a.wp-has-current-submenu:after,
-ul#adminmenu > li.current > a.current:after {
-  border-right-color: #f1f1f1;
-}
-
-#adminmenu li.current a.menu-top,
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,
-.folded #adminmenu li.current.menu-top {
-  color: #fff;
-  background: #3858e9;
-}
-
-#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,
-#adminmenu a.current:hover div.wp-menu-image:before,
-#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,
-#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
-#adminmenu li:hover div.wp-menu-image:before,
-#adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
-  color: #fff;
-}
-
-/* Admin Menu: bubble */
-#adminmenu .awaiting-mod,
-#adminmenu .update-plugins {
-  color: #fff;
-  background: #3858e9;
-}
-
-#adminmenu li.current a .awaiting-mod,
-#adminmenu li a.wp-has-current-submenu .update-plugins,
-#adminmenu li:hover a .awaiting-mod,
-#adminmenu li.menu-top:hover > a .update-plugins {
-  color: #fff;
-  background: #0c0c0c;
-}
-
-/* Admin Menu: collapse button */
-#collapse-button {
-  color: #f3f1f1;
-}
-
-#collapse-button:hover,
-#collapse-button:focus {
-  color: #33f078;
-}
-
-/* Admin Bar */
-#wpadminbar {
-  color: #fff;
-  background: #1e1e1e;
-}
-
-#wpadminbar .ab-item,
-#wpadminbar a.ab-item,
-#wpadminbar > #wp-toolbar span.ab-label,
-#wpadminbar > #wp-toolbar span.noticon {
-  color: #fff;
-}
-
-#wpadminbar .ab-icon,
-#wpadminbar .ab-icon:before,
-#wpadminbar .ab-item:before,
-#wpadminbar .ab-item:after {
-  color: #f3f1f1;
-}
-
-#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus,
-#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus,
-#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item,
-#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item {
-  color: #33f078;
-  background: #0c0c0c;
-}
-
-#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label,
-#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label,
-#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label {
-  color: #33f078;
-}
-
-#wpadminbar:not(.mobile) li:hover .ab-icon:before,
-#wpadminbar:not(.mobile) li:hover .ab-item:before,
-#wpadminbar:not(.mobile) li:hover .ab-item:after,
-#wpadminbar:not(.mobile) li:hover #adminbarsearch:before {
-  color: #fff;
-}
-
-/* Admin Bar: submenu */
-#wpadminbar .menupop .ab-sub-wrapper {
-  background: #0c0c0c;
-}
-
-#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,
-#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu {
-  background: #303030;
-}
-
-#wpadminbar .ab-submenu .ab-item,
-#wpadminbar .quicklinks .menupop ul li a,
-#wpadminbar .quicklinks .menupop.hover ul li a,
-#wpadminbar.nojs .quicklinks .menupop:hover ul li a {
-  color: #bcbcbc;
-}
-
-#wpadminbar .quicklinks li .blavatar,
-#wpadminbar .menupop .menupop > .ab-item:before {
-  color: #f3f1f1;
-}
-
-#wpadminbar .quicklinks .menupop ul li a:hover,
-#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,
-#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,
-#wpadminbar li:hover .ab-icon:before,
-#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,
-#wpadminbar li #adminbarsearch.adminbar-focused:before {
-  color: #33f078;
-}
-
-#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 {
-  color: #33f078;
-}
-
-#wpadminbar.mobile .quicklinks .hover .ab-icon:before,
-#wpadminbar.mobile .quicklinks .hover .ab-item:before {
-  color: #f3f1f1;
-}
-
-/* Admin Bar: search */
-#wpadminbar #adminbarsearch:before {
-  color: #f3f1f1;
-}
-
-#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
-  color: #fff;
-  background: #303030;
-}
-
-/* Admin Bar: recovery mode */
-#wpadminbar #wp-admin-bar-recovery-mode {
-  color: #fff;
-  background-color: #3858e9;
-}
-
-#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
-#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
-  color: #fff;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-  color: #fff;
-  background-color: #324fd2;
-}
-
-/* Admin Bar: my account */
-#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #303030;
-  background-color: #303030;
-}
-
-#wpadminbar #wp-admin-bar-user-info .display-name {
-  color: #fff;
-}
-
-#wpadminbar #wp-admin-bar-user-info a:hover .display-name {
-  color: #33f078;
-}
-
-#wpadminbar #wp-admin-bar-user-info .username {
-  color: #bcbcbc;
-}
-
-/* Pointers */
-.wp-pointer .wp-pointer-content h3 {
-  background-color: #3858e9;
-  border-color: #2145e6;
-}
-
-.wp-pointer .wp-pointer-content h3:before {
-  color: #3858e9;
-}
-
-.wp-pointer.wp-pointer-top .wp-pointer-arrow,
-.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,
-.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,
-.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner {
-  border-bottom-color: #3858e9;
-}
-
-/* Media */
-.media-item .bar,
-.media-progress-bar div {
-  background-color: #3858e9;
-}
-
-.details.attachment {
-  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #3858e9;
-}
-
-.attachment.details .check {
-  background-color: #3858e9;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #3858e9;
-}
-
-.media-selection .attachment.selection.details .thumbnail {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #3858e9;
-}
-
-/* Themes */
-.theme-browser .theme.active .theme-name,
-.theme-browser .theme.add-new-theme a:hover:after,
-.theme-browser .theme.add-new-theme a:focus:after {
-  background: #3858e9;
-}
-
-.theme-browser .theme.add-new-theme a:hover span:after,
-.theme-browser .theme.add-new-theme a:focus span:after {
-  color: #3858e9;
-}
-
-.theme-section.current,
-.theme-filter.current {
-  border-bottom-color: #1e1e1e;
-}
-
-body.more-filters-opened .more-filters {
-  color: #fff;
-  background-color: #1e1e1e;
-}
-
-body.more-filters-opened .more-filters:before {
-  color: #fff;
-}
-
-body.more-filters-opened .more-filters:hover,
-body.more-filters-opened .more-filters:focus {
-  background-color: #3858e9;
-  color: #fff;
-}
-
-body.more-filters-opened .more-filters:hover:before,
-body.more-filters-opened .more-filters:focus:before {
-  color: #fff;
-}
-
-/* Widgets */
-.widgets-chooser li.widgets-chooser-selected {
-  background-color: #3858e9;
-  color: #fff;
-}
-
-.widgets-chooser li.widgets-chooser-selected:before,
-.widgets-chooser li.widgets-chooser-selected:focus:before {
-  color: #fff;
-}
-
-/* Responsive Component */
-div#wp-responsive-toggle a:before {
-  color: #f3f1f1;
-}
-
-.wp-responsive-open div#wp-responsive-toggle a {
-  border-color: transparent;
-  background: #3858e9;
-}
-
-.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a {
-  background: #0c0c0c;
-}
-
-.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before {
-  color: #f3f1f1;
-}
-
-/* TinyMCE */
-.mce-container.mce-menu .mce-menu-item:hover,
-.mce-container.mce-menu .mce-menu-item.mce-selected,
-.mce-container.mce-menu .mce-menu-item:focus,
-.mce-container.mce-menu .mce-menu-item-normal.mce-active,
-.mce-container.mce-menu .mce-menu-item-preview.mce-active {
-  background: #3858e9;
-}
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #3858e9;
-  border-left-color: #3858e9;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #3858e9;
-  border-top-color: #3858e9;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #3858e9;
-  border-left-color: #3858e9;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #3858e9;
-}
-
-.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 #667fee, 0 0 2px 1px #3858e9;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #3858e9;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-left-color: #3858e9;
-  color: #3858e9;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #3858e9;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #3858e9;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #3858e9;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #3858e9;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #3858e9;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #3858e9;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #3858e9;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #667fee, 0 0 2px 1px #3858e9;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #3858e9;
-}
--- a/wp-admin/css/colors/modern/colors.min.css
+++ b/wp-admin/css/colors/modern/colors.min.css
--- a/wp-admin/css/colors/modern/colors.scss
+++ b/wp-admin/css/colors/modern/colors.scss
@@ -1,9 +0,0 @@
-$base-color: #1e1e1e;
-$highlight-color: #3858e9;
-$menu-submenu-focus-text: #33f078;
-$notification-color: $highlight-color;
-
-$link: $highlight-color;
-$link-focus: darken($highlight-color, 10%);
-
-@import "../_admin.scss";
--- a/wp-admin/css/colors/ocean/colors-rtl.css
+++ b/wp-admin/css/colors/ocean/colors-rtl.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23738e96%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #738e96;
 }

-input[type=radio]:checked::before {
+input[type=radio]:checked:before {
  background: #738e96;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

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

 /* List tables */
-.wrap .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;
 }
@@ -213,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -244,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #d5dde0;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -262,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -289,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -309,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -395,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -427,23 +383,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 */
@@ -488,16 +445,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 */
@@ -548,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #9ebaa0;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f2fcff;
@@ -574,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #9ebaa0;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #9ebaa0;
-  border-right-color: #9ebaa0;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #9ebaa0;
-  border-top-color: #9ebaa0;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #9ebaa0;
-  border-right-color: #9ebaa0;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #9ebaa0;
-}
-
-.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 #bccfbd, 0 0 2px 1px #9ebaa0;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #9ebaa0;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-right-color: #9ebaa0;
-  color: #9ebaa0;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #9ebaa0;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #9ebaa0;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #9ebaa0;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #9ebaa0;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #9ebaa0;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #9ebaa0;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #9ebaa0;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #bccfbd, 0 0 2px 1px #9ebaa0;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #9ebaa0;
-}
--- a/wp-admin/css/colors/ocean/colors-rtl.min.css
+++ b/wp-admin/css/colors/ocean/colors-rtl.min.css
--- a/wp-admin/css/colors/ocean/colors.css
+++ b/wp-admin/css/colors/ocean/colors.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23738e96%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #738e96;
 }

-input[type=radio]:checked::before {
+input[type=radio]:checked:before {
  background: #738e96;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

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

 /* List tables */
-.wrap .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;
 }
@@ -213,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -244,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #d5dde0;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -262,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -289,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -309,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -395,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -427,23 +383,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 */
@@ -488,16 +445,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 */
@@ -548,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #9ebaa0;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f2fcff;
@@ -574,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #9ebaa0;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #9ebaa0;
-  border-left-color: #9ebaa0;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #9ebaa0;
-  border-top-color: #9ebaa0;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #9ebaa0;
-  border-left-color: #9ebaa0;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #9ebaa0;
-}
-
-.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 #bccfbd, 0 0 2px 1px #9ebaa0;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #9ebaa0;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-left-color: #9ebaa0;
-  color: #9ebaa0;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #9ebaa0;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #9ebaa0;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #9ebaa0;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #9ebaa0;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #9ebaa0;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #9ebaa0;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #9ebaa0;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #bccfbd, 0 0 2px 1px #9ebaa0;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #9ebaa0;
-}
--- a/wp-admin/css/colors/ocean/colors.min.css
+++ b/wp-admin/css/colors/ocean/colors.min.css
--- a/wp-admin/css/colors/ocean/colors.scss
+++ b/wp-admin/css/colors/ocean/colors.scss
@@ -2,7 +2,6 @@ $base-color: #738e96;
 $icon-color: #f2fcff;
 $highlight-color: #9ebaa0;
 $notification-color: #aa9d88;
-$low-contrast-theme: "true";

 $form-checked: $base-color;

--- a/wp-admin/css/colors/sunrise/colors-rtl.css
+++ b/wp-admin/css/colors/sunrise/colors-rtl.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #dd823b;
 }

-input[type=radio]:checked::before {
-  background: #7e8993;
+input[type=radio]:checked:before {
+  background: #dd823b;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #dd823b;
-  box-shadow: 0 0 0 1px #dd823b;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #dd823b;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #dd823b;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #dd823b;
-  border-color: #dd823b;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #c36922;
-  color: #c36922;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #e59e66;
-  color: #98511a;
-  box-shadow: 0 0 0 1px #e59e66;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #dd823b;
-  border-color: #dd823b;
-  color: #fff;
+  border-color: #c36922 #ad5d1e #ad5d1e;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ad5d1e;
+  box-shadow: 0 1px 0 #ad5d1e;
+  text-shadow: 0 -1px 1px #ad5d1e, -1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, 1px 0 1px #ad5d1e;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #df8a48;
-  border-color: #db7a2e;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #dd823b;
-}
-.wp-core-ui .button-primary:active {
-  background: #d97426;
-  border-color: #d97426;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #dd823b;
-  color: #fff;
  border-color: #ad5d1e;
-  box-shadow: inset 0 2px 5px -3px #150b04;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ad5d1e;
+  box-shadow: 0 1px 0 #ad5d1e;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #dd823b;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #c36922;
+  border-color: #ad5d1e;
+  -webkit-box-shadow: inset 0 2px 0 #ad5d1e;
+  box-shadow: inset 0 2px 0 #ad5d1e;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #d1cbc7 !important;
+  background: #cc6d23 !important;
+  border-color: #ad5d1e !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ad5d1e !important;
+  box-shadow: 0 2px 0 #ad5d1e !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ad5d1e !important;
+  box-shadow: inset 0 3px 0 #ad5d1e !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #cf4944;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #cf4944;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #dd823b;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #dd823b;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #ccaf0b;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #ccaf0b;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f1f1;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #dd823b;
-  color: #dd823b;
-}
-
-.wrap .page-title-action:hover {
-  color: #c36922;
-  border-color: #c36922;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #e59e66;
-  color: #98511a;
-  box-shadow: 0 0 0 1px #e59e66;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #f1c8c7;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -342,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #dd823b;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f1f1;
@@ -607,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #dd823b;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #dd823b;
-  border-right-color: #dd823b;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #dd823b;
-  border-top-color: #dd823b;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #dd823b;
-  border-right-color: #dd823b;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #dd823b;
-}
-
-.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 #e59e66, 0 0 2px 1px #dd823b;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #dd823b;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-right-color: #dd823b;
-  color: #dd823b;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #dd823b;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #dd823b;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #dd823b;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #dd823b;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #dd823b;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #dd823b;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #dd823b;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #e59e66, 0 0 2px 1px #dd823b;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #dd823b;
-}
--- a/wp-admin/css/colors/sunrise/colors-rtl.min.css
+++ b/wp-admin/css/colors/sunrise/colors-rtl.min.css
--- a/wp-admin/css/colors/sunrise/colors.css
+++ b/wp-admin/css/colors/sunrise/colors.css
@@ -1,9 +1,8 @@
-/*! This file is auto-generated */
 /*
- * Button mixin- creates a button effect with correct
+ * Button mixin- creates 3d-ish button effect with correct
 * highlights/shadows, based on a base color.
 */
-body {
+html {
  background: #f1f1f1;
 }

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

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

-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
-.media-modal .untrash-attachment,
-.wp-core-ui .button-link-delete {
-  color: #a00;
-}
-
-.media-modal .delete-attachment:hover,
-.media-modal .trash-attachment:hover,
-.media-modal .untrash-attachment:hover,
-.media-modal .delete-attachment:focus,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:focus,
-.wp-core-ui .button-link-delete:hover,
-.wp-core-ui .button-link-delete:focus {
-  color: #dc3232;
-}
-
 /* Forms */
-input[type=checkbox]:checked::before {
-  content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%237e8993%27%2F%3E%3C%2Fsvg%3E");
+input[type=checkbox]:checked:before {
+  color: #dd823b;
 }

-input[type=radio]:checked::before {
-  background: #7e8993;
+input[type=radio]:checked:before {
+  background: #dd823b;
 }

-.wp-core-ui input[type=reset]:hover,
-.wp-core-ui input[type=reset]:active {
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
  color: #0096dd;
 }

-input[type=text]:focus,
-input[type=password]:focus,
-input[type=color]:focus,
-input[type=date]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=radio]:focus,
-select:focus,
-textarea:focus {
-  border-color: #dd823b;
-  box-shadow: 0 0 0 1px #dd823b;
-}
-
 /* Core UI */
-.wp-core-ui .button {
-  border-color: #7e8993;
-  color: #32373c;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #717c87;
-  color: #262a2e;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button:active {
-  border-color: #7e8993;
-  color: #262a2e;
-  box-shadow: none;
-}
-.wp-core-ui .button.active,
-.wp-core-ui .button.active:focus,
-.wp-core-ui .button.active:hover {
-  border-color: #dd823b;
-  color: #262a2e;
-  box-shadow: inset 0 2px 5px -3px #dd823b;
-}
-.wp-core-ui .button.active:focus {
-  box-shadow: 0 0 0 1px #32373c;
-}
-.wp-core-ui .button,
-.wp-core-ui .button-secondary {
-  color: #dd823b;
-  border-color: #dd823b;
-}
-.wp-core-ui .button.hover,
-.wp-core-ui .button:hover,
-.wp-core-ui .button-secondary:hover {
-  border-color: #c36922;
-  color: #c36922;
-}
-.wp-core-ui .button.focus,
-.wp-core-ui .button:focus,
-.wp-core-ui .button-secondary:focus {
-  border-color: #e59e66;
-  color: #98511a;
-  box-shadow: 0 0 0 1px #e59e66;
-}
-.wp-core-ui .button-primary:hover {
-  color: #fff;
-}
 .wp-core-ui .button-primary {
  background: #dd823b;
-  border-color: #dd823b;
-  color: #fff;
+  border-color: #c36922 #ad5d1e #ad5d1e;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ad5d1e;
+  box-shadow: 0 1px 0 #ad5d1e;
+  text-shadow: 0 -1px 1px #ad5d1e, 1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, -1px 0 1px #ad5d1e;
 }
+
 .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
  background: #df8a48;
-  border-color: #db7a2e;
-  color: #fff;
-}
-.wp-core-ui .button-primary:focus {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 3px #dd823b;
-}
-.wp-core-ui .button-primary:active {
-  background: #d97426;
-  border-color: #d97426;
-  color: #fff;
-}
-.wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary.active:hover {
-  background: #dd823b;
-  color: #fff;
  border-color: #ad5d1e;
-  box-shadow: inset 0 2px 5px -3px #150b04;
+  color: white;
+  -webkit-box-shadow: 0 1px 0 #ad5d1e;
+  box-shadow: 0 1px 0 #ad5d1e;
 }
-.wp-core-ui .button-group > .button.active {
-  border-color: #dd823b;
+
+.wp-core-ui .button-primary:focus {
+  -webkit-box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
+  box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db;
 }
+
+.wp-core-ui .button-primary:active {
+  background: #c36922;
+  border-color: #ad5d1e;
+  -webkit-box-shadow: inset 0 2px 0 #ad5d1e;
+  box-shadow: inset 0 2px 0 #ad5d1e;
+}
+
+.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
+  color: #d1cbc7 !important;
+  background: #cc6d23 !important;
+  border-color: #ad5d1e !important;
+  text-shadow: none !important;
+}
+
+.wp-core-ui .button-primary.button-hero {
+  -webkit-box-shadow: 0 2px 0 #ad5d1e !important;
+  box-shadow: 0 2px 0 #ad5d1e !important;
+}
+
+.wp-core-ui .button-primary.button-hero:active {
+  -webkit-box-shadow: inset 0 3px 0 #ad5d1e !important;
+  box-shadow: inset 0 3px 0 #ad5d1e !important;
+}
+
 .wp-core-ui .wp-ui-primary {
  color: #fff;
  background-color: #cf4944;
 }
+
 .wp-core-ui .wp-ui-text-primary {
  color: #cf4944;
 }
+
 .wp-core-ui .wp-ui-highlight {
  color: #fff;
  background-color: #dd823b;
 }
+
 .wp-core-ui .wp-ui-text-highlight {
  color: #dd823b;
 }
+
 .wp-core-ui .wp-ui-notification {
  color: #fff;
  background-color: #ccaf0b;
 }
+
 .wp-core-ui .wp-ui-text-notification {
  color: #ccaf0b;
 }
+
 .wp-core-ui .wp-ui-text-icon {
  color: #f3f1f1;
 }

 /* List tables */
-.wrap .page-title-action,
-.wrap .page-title-action:active {
-  border: 1px solid #dd823b;
-  color: #dd823b;
-}
-
-.wrap .page-title-action:hover {
-  color: #c36922;
-  border-color: #c36922;
-}
-
-.wrap .page-title-action:focus {
-  border-color: #e59e66;
-  color: #98511a;
-  box-shadow: 0 0 0 1px #e59e66;
+.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;
 }

 .view-switch a.current:before {
@@ -246,7 +160,7 @@ textarea:focus {
 }

 /* Active tabs use a bottom border color that matches the page background color. */
-.about-wrap .nav-tab-active,
+.about-wrap h2 .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
  background-color: #f1f1f1;
@@ -277,6 +191,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
  color: #f1c8c7;
 }
+
 #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
 #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
@@ -295,6 +210,7 @@ textarea:focus {
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
  color: #fff;
 }
+
 #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
@@ -322,7 +238,8 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
 #adminmenu li:hover div.wp-menu-image:before,
 #adminmenu li a:focus div.wp-menu-image:before,
-#adminmenu li.opensub div.wp-menu-image:before {
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
  color: #fff;
 }

@@ -342,13 +259,20 @@ ul#adminmenu > li.current > a.current:after {
 }

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

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

 /* Admin Bar */
@@ -428,7 +352,6 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
 #wpadminbar li.hover .ab-icon:before,
 #wpadminbar li.hover .ab-item:before,
 #wpadminbar li:hover #adminbarsearch:before,
@@ -460,23 +383,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 */
@@ -521,16 +445,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 */
@@ -581,6 +508,12 @@ body.more-filters-opened .more-filters:focus:before {
  color: #fff;
 }

+/* Customize */
+#customize-theme-controls .widget-area-select .selected {
+  background-color: #dd823b;
+  color: #fff;
+}
+
 /* Responsive Component */
 div#wp-responsive-toggle a:before {
  color: #f3f1f1;
@@ -607,107 +540,3 @@ div#wp-responsive-toggle a:before {
 .mce-container.mce-menu .mce-menu-item-preview.mce-active {
  background: #dd823b;
 }
-
-/* Customizer */
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title:focus {
-  color: #dd823b;
-  border-left-color: #dd823b;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.customize-controls-preview-toggle:focus,
-.customize-controls-preview-toggle:hover {
-  color: #dd823b;
-  border-top-color: #dd823b;
-}
-
-.customize-panel-back:hover,
-.customize-panel-back:focus,
-.customize-section-back:hover,
-.customize-section-back:focus {
-  color: #dd823b;
-  border-left-color: #dd823b;
-}
-
-.customize-screen-options-toggle:hover,
-.customize-screen-options-toggle:active,
-.customize-screen-options-toggle:focus,
-.active-menu-screen-options .customize-screen-options-toggle,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
-#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-  color: #dd823b;
-}
-
-.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 #e59e66, 0 0 2px 1px #dd823b;
-}
-
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-  color: #dd823b;
-}
-
-.control-panel-themes .customize-themes-section-title:focus,
-.control-panel-themes .customize-themes-section-title:hover {
-  border-left-color: #dd823b;
-  color: #dd823b;
-}
-
-.control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-  background: #dd823b;
-}
-
-.control-panel-themes .customize-themes-section-title.selected {
-  color: #dd823b;
-}
-
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-  color: #dd823b;
-}
-
-.customize-control .attachment-media-view .button-add-media:focus {
-  background-color: #fbfbfc;
-  border-color: #dd823b;
-  border-style: solid;
-  box-shadow: 0 0 0 1px #dd823b;
-  outline: 2px solid transparent;
-}
-
-.wp-full-overlay-footer .devices button:focus,
-.wp-full-overlay-footer .devices button.active:hover {
-  border-bottom-color: #dd823b;
-}
-
-.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
-.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
-  color: #dd823b;
-}
-
-.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
-.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
-  box-shadow: 0 0 0 1px #e59e66, 0 0 2px 1px #dd823b;
-}
-
-.wp-full-overlay-footer .devices button:hover:before,
-.wp-full-overlay-footer .devices button:focus:before {
-  color: #dd823b;
-}
--- a/wp-admin/css/colors/sunrise/colors.min.css
+++ b/wp-admin/css/colors/sunrise/colors.min.css
--- a/wp-admin/css/common-rtl.css
+++ b/wp-admin/css/common-rtl.css
--- a/wp-admin/css/common-rtl.min.css
+++ b/wp-admin/css/common-rtl.min.css
--- a/wp-admin/css/common.css
+++ b/wp-admin/css/common.css
--- a/wp-admin/css/common.min.css
+++ b/wp-admin/css/common.min.css
--- a/wp-admin/css/customize-controls-rtl.css
+++ b/wp-admin/css/customize-controls-rtl.css
--- a/wp-admin/css/customize-controls-rtl.min.css
+++ b/wp-admin/css/customize-controls-rtl.min.css
--- a/wp-admin/css/customize-controls.css
+++ b/wp-admin/css/customize-controls.css
--- a/wp-admin/css/customize-controls.min.css
+++ b/wp-admin/css/customize-controls.min.css
--- a/wp-admin/css/customize-nav-menus-rtl.css
+++ b/wp-admin/css/customize-nav-menus-rtl.css
@@ -1,23 +1,6 @@
-/*! This file is auto-generated */
-#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,
@@ -29,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;
 }

@@ -66,7 +32,6 @@

 .wp-customizer .menu-item-bar .menu-item-handle {
 	width: 100%;
-	max-width: 100%;
 	background: #fff;
 }

@@ -80,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;
@@ -122,12 +78,17 @@
 }

 .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
@@ -141,6 +102,51 @@
 	left: 0;
 }

+.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";
 }
@@ -149,6 +155,28 @@
 	content: "\f341";
 }

+.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-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,
 .reordering .menu-item .item-type {
 	display: none;
@@ -160,6 +188,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 {
@@ -170,14 +199,14 @@
 	width: 30px;
 	height: 38px;
 	margin-left: 0 !important;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	overflow: hidden;
 	cursor: pointer;
-	text-align: center;
 }

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

@@ -203,31 +232,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 {
@@ -271,8 +282,7 @@

 .customize-screen-options-toggle:focus,
 #customize-controls .customize-info .customize-help-toggle:focus {
-	/* Only visible in Windows High Contrast mode */
-	outline: 1px solid transparent;
+	outline: none;
 }

 .customize-screen-options-toggle:before {
@@ -292,6 +302,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%;
 }

@@ -313,39 +326,48 @@
 	display: inline-block;
 	font-size: 20px;
 	line-height: 1;
+	text-indent: -1px; /* account for the dashicon alignment */
 }

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

-.wp-customizer .menu-item .item-edit .toggle-indicator:before,
-#available-menu-items .accordion-section-title .toggle-indicator:before {
+.wp-customizer .toggle-indicator:after {
 	content: "\f140";
-	display: block;
-	padding: 1px 0px 1px 2px;
-	speak: never;
+	speak: none;
+	vertical-align: top;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
-	color: #72777c;
+	color: #a0a5aa;
 	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 {
+.wp-customizer button:focus .toggle-indicator:after {
+	-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);
+}
+
+#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;
 }

@@ -418,17 +440,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;
@@ -439,7 +462,7 @@
 	float: none;
 }

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

@@ -447,6 +470,11 @@
 * 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;
 }
@@ -456,6 +484,24 @@
 	opacity: 1;
 }

+.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;
@@ -472,17 +518,32 @@
 	position: absolute;
 	top: 9px;
 	right: 5px;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	font: normal 20px/1 dashicons;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

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

 .adding-menu-items .menu-item-bar .item-edit {
@@ -493,9 +554,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 */
@@ -510,12 +588,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,
@@ -528,18 +602,15 @@
 	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:hover .toggle-indicator:after {
+	color: #777;
 }

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

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

 #available-menu-items .accordion-section-title .no-items,
@@ -569,31 +640,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 {
@@ -602,12 +672,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 {
@@ -622,7 +702,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;
 }
@@ -643,10 +732,10 @@
 	color: #82878c;
 	width: 30px;
 	height: 38px;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	cursor: pointer;
-	text-align: center;
 }

 #available-menu-items .menu-item-handle .item-add:focus {
@@ -660,10 +749,20 @@
 	top: 3px;
 	display: inline-block;
 	height: 20px;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	font: normal 20px/1.05 dashicons; /* line height is to account for the dashicon's vertical alignment */
 }

+#available-menu-items .item-add:focus:before {
+	-webkit-box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
+}
+
 #available-menu-items .menu-item-handle.item-added .item-type,
 #available-menu-items .menu-item-handle.item-added .item-title,
 #available-menu-items .menu-item-handle.item-added:hover .item-add,
@@ -681,28 +780,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 {
@@ -723,6 +854,7 @@
 }

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

@@ -739,10 +871,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;
@@ -767,33 +895,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 {
@@ -802,15 +936,12 @@ 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;
 }
@@ -819,6 +950,23 @@ li.assigned-to-menu-location .add-new-menu-item {
 	margin-bottom: 1em;
 }

+.menu-delete {
+	color: #a00;
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+.menu-delete:hover,
+.menu-delete:focus {
+	color: #f00;
+	text-decoration: none;
+}
+
+.menu-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 {
 	margin-top: -1px;
 }
@@ -847,40 +995,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;
 }

@@ -65,7 +32,6 @@

 .wp-customizer .menu-item-bar .menu-item-handle {
 	width: 100%;
-	max-width: 100%;
 	background: #fff;
 }

@@ -79,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;
@@ -121,12 +78,17 @@
 }

 .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
@@ -140,6 +102,51 @@
 	right: 0;
 }

+.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";
 }
@@ -148,6 +155,28 @@
 	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-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,
 .reordering .menu-item .item-type {
 	display: none;
@@ -159,6 +188,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 {
@@ -169,14 +199,14 @@
 	width: 30px;
 	height: 38px;
 	margin-right: 0 !important;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	overflow: hidden;
 	cursor: pointer;
-	text-align: center;
 }

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

@@ -202,31 +232,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 {
@@ -270,8 +282,7 @@

 .customize-screen-options-toggle:focus,
 #customize-controls .customize-info .customize-help-toggle:focus {
-	/* Only visible in Windows High Contrast mode */
-	outline: 1px solid transparent;
+	outline: none;
 }

 .customize-screen-options-toggle:before {
@@ -291,6 +302,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%;
 }

@@ -312,39 +326,48 @@
 	display: inline-block;
 	font-size: 20px;
 	line-height: 1;
+	text-indent: -1px; /* account for the dashicon alignment */
 }

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

-.wp-customizer .menu-item .item-edit .toggle-indicator:before,
-#available-menu-items .accordion-section-title .toggle-indicator:before {
+.wp-customizer .toggle-indicator:after {
 	content: "\f140";
-	display: block;
-	padding: 1px 2px 1px 0px;
-	speak: never;
+	speak: none;
+	vertical-align: top;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
-	color: #72777c;
+	color: #a0a5aa;
 	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 {
+.wp-customizer button:focus .toggle-indicator:after {
+	-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);
+}
+
+#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;
 }

@@ -417,17 +440,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;
@@ -438,7 +462,7 @@
 	float: none;
 }

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

@@ -446,6 +470,11 @@
 * 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;
 }
@@ -455,6 +484,24 @@
 	opacity: 1;
 }

+.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;
@@ -471,17 +518,32 @@
 	position: absolute;
 	top: 9px;
 	left: 5px;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	font: normal 20px/1 dashicons;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

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

 .adding-menu-items .menu-item-bar .item-edit {
@@ -492,9 +554,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 */
@@ -509,12 +588,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,
@@ -527,18 +602,15 @@
 	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:hover .toggle-indicator:after {
+	color: #777;
 }

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

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

 #available-menu-items .accordion-section-title .no-items,
@@ -568,31 +640,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 {
@@ -601,12 +672,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 {
@@ -621,7 +702,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;
 }
@@ -642,10 +732,10 @@
 	color: #82878c;
 	width: 30px;
 	height: 38px;
+	-webkit-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	cursor: pointer;
-	text-align: center;
 }

 #available-menu-items .menu-item-handle .item-add:focus {
@@ -659,10 +749,20 @@
 	top: 3px;
 	display: inline-block;
 	height: 20px;
+	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	font: normal 20px/1.05 dashicons; /* line height is to account for the dashicon's vertical alignment */
 }

+#available-menu-items .item-add:focus:before {
+	-webkit-box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
+}
+
 #available-menu-items .menu-item-handle.item-added .item-type,
 #available-menu-items .menu-item-handle.item-added .item-title,
 #available-menu-items .menu-item-handle.item-added:hover .item-add,
@@ -680,28 +780,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 {
@@ -722,6 +854,7 @@
 }

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

@@ -738,10 +871,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;
@@ -766,33 +895,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 {
@@ -801,15 +936,12 @@ 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;
 }
@@ -818,6 +950,23 @@ li.assigned-to-menu-location .add-new-menu-item {
 	margin-bottom: 1em;
 }

+.menu-delete {
+	color: #a00;
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+.menu-delete:hover,
+.menu-delete:focus {
+	color: #f00;
+	text-decoration: none;
+}
+
+.menu-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 {
 	margin-top: -1px;
 }
@@ -846,40 +995,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
@@ -1,4 +1,3 @@
-/*! This file is auto-generated */
 .wp-full-overlay-sidebar {
 	overflow: visible;
 }
@@ -19,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;
 }
@@ -76,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,
@@ -86,18 +76,22 @@
 .widget-inside {
 	padding: 1px 10px 10px 10px;
 	border-top: none;
-	line-height: 1.23076923;
+	line-height: 16px;
 }

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

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

-.widget-top,
 .customize-control-widget_form .widget .customize-control-title {
 	cursor: move;
 }
@@ -113,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;
 }
@@ -132,14 +126,61 @@
 	background-color: #fafafa;
 }

+.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;
+}
+
+.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;
 }
@@ -190,7 +231,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;
 }

@@ -211,46 +252,108 @@
 	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
 */

-/* override widgets admin page rules in wp-admin/css/widgets.css */
+.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%;
+}
+
+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;
+}
+
+#available-widgets .widget-top,
+#available-widgets .widget-top:hover {
+	border: none;
+	background: transparent;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }

 #customize-controls .widget-title h3 {
@@ -264,10 +367,11 @@

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

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

@@ -306,81 +410,83 @@ body.adding-widget #customize-preview {
 	color: #32373c;
 	font: normal 20px/1 dashicons;
 	text-align: center;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

-/* dashicons-smiley */
+/* smiley */
 #available-widgets [class*="easy"] .widget-title:before { content: "\f328"; top: -4px; }

-/* dashicons-star-filled */
+/* star-filled */
 #available-widgets [class*="super"] .widget-title:before,
 #available-widgets [class*="like"] .widget-title:before { content: "\f155"; top: -4px; }

-/* dashicons-wordpress */
+/* wordpress */
 #available-widgets [class*="meta"] .widget-title:before { content: "\f120"; }

-/* dashicons-archive */
+/* archive-box */
 #available-widgets [class*="archives"] .widget-title:before { content: "\f480"; top: -4px; }

-/* dashicons-category */
+/* category */
 #available-widgets [class*="categor"] .widget-title:before { content: "\f318"; top: -4px; }

-/* dashicons-admin-comments */
+/* comments */
 #available-widgets [class*="comment"] .widget-title:before,
 #available-widgets [class*="testimonial"] .widget-title:before,
 #available-widgets [class*="chat"] .widget-title:before { content: "\f101"; }

-/* dashicons-admin-post */
+/* post */
 #available-widgets [class*="post"] .widget-title:before { content: "\f109"; }

-/* dashicons-admin-page */
+/* admin-page */
 #available-widgets [class*="page"] .widget-title:before { content: "\f105"; }

-/* dashicons-text */
+/* text */
 #available-widgets [class*="text"] .widget-title:before { content: "\f478"; }

-/* dashicons-admin-links */
+/* links */
 #available-widgets [class*="link"] .widget-title:before { content: "\f103"; }

-/* dashicons-search */
+/* search */
 #available-widgets [class*="search"] .widget-title:before { content: "\f179"; }

-/* dashicons-menu */
+/* menu */
 #available-widgets [class*="menu"] .widget-title:before,
 #available-widgets [class*="nav"] .widget-title:before { content: "\f333"; }

-/* dashicons-tagcloud */
+/* tag-cloud */
 #available-widgets [class*="tag"] .widget-title:before { content: "\f479"; }

-/* dashicons-rss */
+/* rss */
 #available-widgets [class*="rss"] .widget-title:before { content: "\f303"; top: -6px; }

-/* dashicons-calendar */
+/* calendar */
 #available-widgets [class*="event"] .widget-title:before,
 #available-widgets [class*="calendar"] .widget-title:before { content: "\f145"; top: -4px;}

-/* dashicons-format-image */
+/* format-image */
 #available-widgets [class*="image"] .widget-title:before,
 #available-widgets [class*="photo"] .widget-title:before,
 #available-widgets [class*="slide"] .widget-title:before,
 #available-widgets [class*="instagram"] .widget-title:before { content: "\f128"; }

-/* dashicons-format-gallery */
+/* format-gallery */
 #available-widgets [class*="album"] .widget-title:before,
 #available-widgets [class*="galler"] .widget-title:before { content: "\f161"; }

-/* dashicons-format-video */
+/* format-video */
 #available-widgets [class*="video"] .widget-title:before,
 #available-widgets [class*="tube"] .widget-title:before { content: "\f126"; }

-/* dashicons-format-audio */
+/* format-audio */
 #available-widgets [class*="music"] .widget-title:before,
 #available-widgets [class*="radio"] .widget-title:before,
 #available-widgets [class*="audio"] .widget-title:before { content: "\f127"; }

-/* dashicons-admin-users */
+/* admin-users */
 #available-widgets [class*="login"] .widget-title:before,
 #available-widgets [class*="user"] .widget-title:before,
 #available-widgets [class*="member"] .widget-title:before,
@@ -389,96 +495,139 @@ body.adding-widget #customize-preview {
 #available-widgets [class*="profile"] .widget-title:before,
 #available-widgets [class*="grofile"] .widget-title:before { content: "\f110"; }

-/* dashicons-cart */
+/* cart */
 #available-widgets [class*="commerce"] .widget-title:before,
 #available-widgets [class*="shop"] .widget-title:before,
 #available-widgets [class*="cart"] .widget-title:before { content: "\f174"; top: -4px; }

-/* dashicons-shield */
+/* shield */
 #available-widgets [class*="secur"] .widget-title:before,
 #available-widgets [class*="firewall"] .widget-title:before { content: "\f332"; }

-/* dashicons-chart-bar */
+/* chart-bar */
 #available-widgets [class*="analytic"] .widget-title:before,
 #available-widgets [class*="stat"] .widget-title:before,
 #available-widgets [class*="poll"] .widget-title:before { content: "\f185"; }

-/* dashicons-feedback */
+/* feedback */
 #available-widgets [class*="form"] .widget-title:before { content: "\f175"; }

-/* dashicons-email-alt */
+/* email-alt */
 #available-widgets [class*="subscribe"] .widget-title:before,
 #available-widgets [class*="news"] .widget-title:before,
 #available-widgets [class*="contact"] .widget-title:before,
 #available-widgets [class*="mail"] .widget-title:before { content: "\f466"; }

-/* dashicons-share */
+/* share */
 #available-widgets [class*="share"] .widget-title:before,
 #available-widgets [class*="socia"] .widget-title:before { content: "\f237"; }

-/* dashicons-translation */
+/* translation */
 #available-widgets [class*="lang"] .widget-title:before,
 #available-widgets [class*="translat"] .widget-title:before { content: "\f326"; }

-/* dashicons-location-alt */
+/* location-alt */
 #available-widgets [class*="locat"] .widget-title:before,
 #available-widgets [class*="map"] .widget-title:before { content: "\f231"; }

-/* dashicons-download */
+/* download */
 #available-widgets [class*="download"] .widget-title:before { content: "\f316"; }

-/* dashicons-cloud */
+/* cloud */
 #available-widgets [class*="weather"] .widget-title:before { content: "\f176"; top: -4px;}

-/* dashicons-facebook */
+/* facebook */
 #available-widgets [class*="facebook"] .widget-title:before { content: "\f304"; }

-/* dashicons-twitter */
+/* twitter */
 #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 {
 		padding: 13px 15px;
 	}
-
-	.widget-top .widget-action {
-		padding: 8px 10px;
-	}
-
 	.widget-reorder-nav span {
 		height: 39px;
 	}
-
 	.widget-reorder-nav span:before {
 		line-height: 39px;
 	}
-
-	/* Compact the move widget areas. */
 	#customize-theme-controls .widget-area-select li {
 		padding: 9px 42px 11px 15px;
 	}
-
 	#customize-theme-controls .widget-area-select li:before {
 		top: 8px;
 	}
 }
+
+@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,
@@ -85,18 +76,22 @@
 .widget-inside {
 	padding: 1px 10px 10px 10px;
 	border-top: none;
-	line-height: 1.23076923;
+	line-height: 16px;
 }

-.customize-control-widget_form.expanded .widget-action .toggle-indicator:before {
+.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;
 }
@@ -131,14 +126,61 @@
 	background-color: #fafafa;
 }

+.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;
+}
+
+.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;
 }
@@ -189,7 +231,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,46 +252,108 @@
 	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
 */

-/* override widgets admin page rules in wp-admin/css/widgets.css */
+.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%;
+}
+
+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;
+}
+
+#available-widgets .widget-top,
+#available-widgets .widget-top:hover {
+	border: none;
+	background: transparent;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }

 #customize-controls .widget-title h3 {
@@ -263,10 +367,11 @@

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

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

@@ -305,81 +410,83 @@ body.adding-widget #customize-preview {
 	color: #32373c;
 	font: normal 20px/1 dashicons;
 	text-align: center;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

-/* dashicons-smiley */
+/* smiley */
 #available-widgets [class*="easy"] .widget-title:before { content: "\f328"; top: -4px; }

-/* dashicons-star-filled */
+/* star-filled */
 #available-widgets [class*="super"] .widget-title:before,
 #available-widgets [class*="like"] .widget-title:before { content: "\f155"; top: -4px; }

-/* dashicons-wordpress */
+/* wordpress */
 #available-widgets [class*="meta"] .widget-title:before { content: "\f120"; }

-/* dashicons-archive */
+/* archive-box */
 #available-widgets [class*="archives"] .widget-title:before { content: "\f480"; top: -4px; }

-/* dashicons-category */
+/* category */
 #available-widgets [class*="categor"] .widget-title:before { content: "\f318"; top: -4px; }

-/* dashicons-admin-comments */
+/* comments */
 #available-widgets [class*="comment"] .widget-title:before,
 #available-widgets [class*="testimonial"] .widget-title:before,
 #available-widgets [class*="chat"] .widget-title:before { content: "\f101"; }

-/* dashicons-admin-post */
+/* post */
 #available-widgets [class*="post"] .widget-title:before { content: "\f109"; }

-/* dashicons-admin-page */
+/* admin-page */
 #available-widgets [class*="page"] .widget-title:before { content: "\f105"; }

-/* dashicons-text */
+/* text */
 #available-widgets [class*="text"] .widget-title:before { content: "\f478"; }

-/* dashicons-admin-links */
+/* links */
 #available-widgets [class*="link"] .widget-title:before { content: "\f103"; }

-/* dashicons-search */
+/* search */
 #available-widgets [class*="search"] .widget-title:before { content: "\f179"; }

-/* dashicons-menu */
+/* menu */
 #available-widgets [class*="menu"] .widget-title:before,
 #available-widgets [class*="nav"] .widget-title:before { content: "\f333"; }

-/* dashicons-tagcloud */
+/* tag-cloud */
 #available-widgets [class*="tag"] .widget-title:before { content: "\f479"; }

-/* dashicons-rss */
+/* rss */
 #available-widgets [class*="rss"] .widget-title:before { content: "\f303"; top: -6px; }

-/* dashicons-calendar */
+/* calendar */
 #available-widgets [class*="event"] .widget-title:before,
 #available-widgets [class*="calendar"] .widget-title:before { content: "\f145"; top: -4px;}

-/* dashicons-format-image */
+/* format-image */
 #available-widgets [class*="image"] .widget-title:before,
 #available-widgets [class*="photo"] .widget-title:before,
 #available-widgets [class*="slide"] .widget-title:before,
 #available-widgets [class*="instagram"] .widget-title:before { content: "\f128"; }

-/* dashicons-format-gallery */
+/* format-gallery */
 #available-widgets [class*="album"] .widget-title:before,
 #available-widgets [class*="galler"] .widget-title:before { content: "\f161"; }

-/* dashicons-format-video */
+/* format-video */
 #available-widgets [class*="video"] .widget-title:before,
 #available-widgets [class*="tube"] .widget-title:before { content: "\f126"; }

-/* dashicons-format-audio */
+/* format-audio */
 #available-widgets [class*="music"] .widget-title:before,
 #available-widgets [class*="radio"] .widget-title:before,
 #available-widgets [class*="audio"] .widget-title:before { content: "\f127"; }

-/* dashicons-admin-users */
+/* admin-users */
 #available-widgets [class*="login"] .widget-title:before,
 #available-widgets [class*="user"] .widget-title:before,
 #available-widgets [class*="member"] .widget-title:before,
@@ -388,96 +495,139 @@ body.adding-widget #customize-preview {
 #available-widgets [class*="profile"] .widget-title:before,
 #available-widgets [class*="grofile"] .widget-title:before { content: "\f110"; }

-/* dashicons-cart */
+/* cart */
 #available-widgets [class*="commerce"] .widget-title:before,
 #available-widgets [class*="shop"] .widget-title:before,
 #available-widgets [class*="cart"] .widget-title:before { content: "\f174"; top: -4px; }

-/* dashicons-shield */
+/* shield */
 #available-widgets [class*="secur"] .widget-title:before,
 #available-widgets [class*="firewall"] .widget-title:before { content: "\f332"; }

-/* dashicons-chart-bar */
+/* chart-bar */
 #available-widgets [class*="analytic"] .widget-title:before,
 #available-widgets [class*="stat"] .widget-title:before,
 #available-widgets [class*="poll"] .widget-title:before { content: "\f185"; }

-/* dashicons-feedback */
+/* feedback */
 #available-widgets [class*="form"] .widget-title:before { content: "\f175"; }

-/* dashicons-email-alt */
+/* email-alt */
 #available-widgets [class*="subscribe"] .widget-title:before,
 #available-widgets [class*="news"] .widget-title:before,
 #available-widgets [class*="contact"] .widget-title:before,
 #available-widgets [class*="mail"] .widget-title:before { content: "\f466"; }

-/* dashicons-share */
+/* share */
 #available-widgets [class*="share"] .widget-title:before,
 #available-widgets [class*="socia"] .widget-title:before { content: "\f237"; }

-/* dashicons-translation */
+/* translation */
 #available-widgets [class*="lang"] .widget-title:before,
 #available-widgets [class*="translat"] .widget-title:before { content: "\f326"; }

-/* dashicons-location-alt */
+/* location-alt */
 #available-widgets [class*="locat"] .widget-title:before,
 #available-widgets [class*="map"] .widget-title:before { content: "\f231"; }

-/* dashicons-download */
+/* download */
 #available-widgets [class*="download"] .widget-title:before { content: "\f316"; }

-/* dashicons-cloud */
+/* cloud */
 #available-widgets [class*="weather"] .widget-title:before { content: "\f176"; top: -4px;}

-/* dashicons-facebook */
+/* facebook */
 #available-widgets [class*="facebook"] .widget-title:before { content: "\f304"; }

-/* dashicons-twitter */
+/* twitter */
 #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 {
 		padding: 13px 15px;
 	}
-
-	.widget-top .widget-action {
-		padding: 8px 10px;
-	}
-
 	.widget-reorder-nav span {
 		height: 39px;
 	}
-
 	.widget-reorder-nav span:before {
 		line-height: 39px;
 	}
-
-	/* Compact the move widget areas. */
 	#customize-theme-controls .widget-area-select li {
 		padding: 9px 15px 11px 42px;
 	}
-
 	#customize-theme-controls .widget-area-select li:before {
 		top: 8px;
 	}
 }
+
+@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
@@ -1,12 +1,11 @@
-/*! This file is auto-generated */
 /* Styles for the media library iframe (not used on the Library screen) */

 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;
 }

@@ -20,7 +19,7 @@ div#media-upload-header {
 	padding-right: 10px;
 	list-style: none;
 	font-size: 12px;
-	font-weight: 400;
+	font-weight: normal;
 }

 #sidemenu a {
@@ -29,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;
 }

@@ -46,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;
@@ -62,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;
 }
@@ -89,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 {
@@ -108,19 +103,19 @@ th {
 /* specific to the image upload form */

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

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

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

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

 tr.image-size td {
@@ -152,8 +147,7 @@ thead.media-item-info tr {
 	border: 8px solid #fff;
 }

-abbr.required,
-span.required {
+abbr.required {
 	text-decoration: none;
 	border: none;
 }
@@ -187,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 {
@@ -207,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;
@@ -292,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;
@@ -310,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;
 }

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

@@ -353,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 {
@@ -381,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;
 }
@@ -410,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.css
+++ b/wp-admin/css/farbtastic-rtl.css
@@ -1,4 +1,3 @@
-/*! This file is auto-generated */

 .farbtastic {
  position: relative;
--- 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/Show More
+++ b/Show More