Tag 3.9.22

Built from https://develop.svn.wordpress.org/tags/3.9.22@42339 git-svn-id: http://core.svn.wordpress.org/tags/3.9.22@42168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Bump 3.9 branch to version 3.9.22.
2017-11-29 22:06:08 +00:00 · 2017-11-29 19:04:15 +00:00 · 2017-11-29 16:42:29 +00:00 · 2017-11-29 16:42:15 +00:00 · 2017-11-29 16:41:04 +00:00 · 2017-11-29 16:40:50 +00:00
816 changed files with 24569 additions and 61569 deletions
--- a/license.txt
+++ b/license.txt
@@ -1,6 +1,6 @@
 WordPress - Web publishing software

-Copyright 2015 by the contributors
+Copyright 2017 by the contributors

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/readme.html
+++ b/readme.html
@@ -9,7 +9,6 @@
 <body>
 <h1 id="logo">
 	<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
-	<br /> Version 4.1.2
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>

@@ -70,7 +69,7 @@
 		<dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.</dd>
 	<dt><a href="https://wordpress.org/news/">The WordPress Blog</a></dt>
 		<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>
+	<dt><a href="http://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/">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>
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -84,7 +84,7 @@ get_header();
 	<?php } else {

 		$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
-		$result = wpmu_activate_signup( $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();
@@ -105,17 +105,18 @@ get_header();
 			    echo '<p>'.$result->get_error_message().'</p>';
 			}
 		} else {
-			$url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
-			$user = get_userdata( (int) $result['user_id'] );
+			extract($result);
+			$url = get_blogaddress_by_id( (int) $blog_id);
+			$user = get_userdata( (int) $user_id);
 			?>
 			<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('Password:'); ?></span> <?php echo $password; ?></p>
 			</div>

-			<?php if ( $url && $url != network_home_url( '', 'http' ) ) : ?>
+			<?php if ( $url != network_home_url('', 'http') ) : ?>
 				<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>'), $url, $url . 'wp-login.php' ); ?></p>
 			<?php else: ?>
 				<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p>
@@ -128,4 +129,4 @@ get_header();
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php get_footer();
+<?php get_footer(); ?>
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -10,11 +10,8 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );

 wp_enqueue_style( 'wp-mediaelement' );
-wp_enqueue_script( 'wp-mediaelement' );
-wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
-	'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
-	'pauseOtherPlayers' => ''
-) );
+wp_enqueue_script( 'wp-playlist' );
+add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );

 $title = __( 'About' );

@@ -27,7 +24,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

 <h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>

-<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you focus on your writing, and the new default theme lets you show it off in style.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s has lots of refinements we think you&#8217;ll love.' ), $display_version ); ?></div>

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

@@ -42,152 +39,300 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 </h2>

 <div class="changelog point-releases">
-	<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 2 ); ?></h3>
+	<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 22 ); ?></h3>
 	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
-         '<strong>Version %1$s</strong> addressed some security issues.', 8 ), '4.1.2' ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_4.1.2' ); ?>
+			'<strong>Version %1$s</strong> addressed some security issues.', 4 ), '3.9.22' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.22' ); ?>
+	</p>
+	<p><?php printf( __( '<strong>Version %s</strong> addressed one security issue.' ), '3.9.21' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.21' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+			'<strong>Version %1$s</strong> addressed some security issues.', 7 ), '3.9.20' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.20' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+			'<strong>Version %1$s</strong> addressed some security issues.', 5 ), '3.9.19' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.19' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
+			'<strong>Version %1$s</strong> addressed %2$s bugs.', 1 ), '3.9.18', number_format_i18n( 1 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.18' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 5 ), '3.9.17' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.17' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 3 ), '3.9.16' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.16' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 8 ), '3.9.15' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.15' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 2 ), '3.9.14' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.14' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 9 ), '3.9.13' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.13' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 6 ), '3.9.12' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.12' ); ?>
+ 	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 2 ), '3.9.11' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.11' ); ?>
+ 	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 1 ), '3.9.10' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.10' ); ?>
+ 	</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.', 2 ), '3.9.9', number_format_i18n( 2 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.9' ); ?>
+	</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.', 2 ), '3.9.8', number_format_i18n( 2 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.8' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 2 ), '3.9.7' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.7' ); ?>
+ 	</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.', 3 ), '3.9.6', number_format_i18n( 3 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.6' ); ?>
+	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed %2$s bugs.', 1 ), '3.9.5', number_format_i18n( 1 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.5' ); ?>
+ 	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 8 ), '3.9.4' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.4' ); ?>
+ 	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 9 ), '3.9.3', number_format_i18n( 9 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.3' ); ?>
+ 	</p>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
+         '<strong>Version %1$s</strong> addressed some security issues.', 6 ), '3.9.2', number_format_i18n( 6 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.2' ); ?>
 	</p>
 	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.', 21 ), '4.1.1', number_format_i18n( 21 ) ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_4.1.1' ); ?>
+         '<strong>Version %1$s</strong> addressed %2$s bugs.', 34 ), '3.9.1', number_format_i18n( 34 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.1' ); ?>
 	</p>
 </div>

-<div class="changelog headline-feature">
-	<h2><?php _e( 'Introducing Twenty&nbsp;Fifteen' ); ?></h2>
-	<div class="featured-image">
-		<img src="//s.w.org/images/core/4.1/theme.png?0" />
+<div class="changelog">
+	<div class="about-overview">
+	<?php
+	if ( ! is_ssl() && ( $locale = get_locale() ) && 'en_' === substr( $locale, 0, 3 ) ) : ?>
+		<embed src="//v0.wordpress.com/player.swf?v=1.03" type="application/x-shockwave-flash" width="640" height="360" wmode="direct" seamlesstabbing="true" allowfullscreen="true" allowscriptaccess="always" overstretch="true" flashvars="guid=sAiXhCfV&amp;isDynamicSeeking=true" title=""></embed>
+	<?php else : ?>
+		<img class="about-overview-img" src="//s.w.org/images/core/3.9/overview.png?0" />
+	<?php endif; ?>
 	</div>
-
-	<div class="feature-section">
-		<div class="col">
-			<h3><?php _e( 'Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.' ); ?></h3>
-			<p><?php printf( __( 'Twenty Fifteen has flawless language support, with help from <a href="%s">Google&#8217;s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?></p>
-			<p><?php _e( 'The straightforward typography is readable on any screen size.' ); ?></p>
-			 <p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p>
+	<h2 class="about-headline-callout"><?php _e( 'A smoother media editing&nbsp;experience' ); ?></h2>
+	<div class="feature-section col three-col">
+		<div class="col-1">
+			<img src="//s.w.org/images/core/3.9/editor.jpg?0" />
+			<h4><?php _e( 'Improved visual editing' ); ?></h4>
+			<p><?php _e( 'The updated visual editor has improved speed, accessibility, and mobile support.' );
+				echo ' ' . __( 'You can paste into the visual editor from your word processor without wasting time to clean up messy styling. (Yeah, we&#8217;re talking about you, Microsoft Word.)' ); ?></p>
 		</div>
-		<div class="col">
-			<img class="" src="//s.w.org/images/core/4.1/mobile.png?0" />
+		<div class="col-2">
+			<img src="//s.w.org/images/core/3.9/image.gif?0" />
+			<h4><?php _e( 'Edit images easily' ); ?></h4>
+			<p><?php _e( 'With quicker access to crop and rotation tools, it&#8217;s now much easier to edit your images while editing posts. You can also scale images directly in the editor to find just the right fit.' ); ?></p>
+		</div>
+		<div class="col-3 last-feature">
+			<img src="//s.w.org/images/core/3.9/drop.jpg?0" />
+			<h4><?php _e( 'Drag and drop your images' ); ?></h4>
+			<p><?php _e( 'Uploading your images is easier than ever. Just grab them from your desktop and drop them onto the editor.' ); ?></p>
 		</div>
 	</div>

-	<div class="clear"></div>
-</div>
-
-<hr />
-
-<div class="changelog headline-feature dfw">
-	<h2><?php _e( 'Distraction-free writing' ); ?></h2>
-	<div class="feature-section">
-		<div class="dfw-container">
-			<img src="//s.w.org/images/core/4.1/focus.png?0" class="base-image" />
-			<img src="//s.w.org/images/core/4.1/focus1.png?0" class="overlay-image fade-in" />
-			<img src="//s.w.org/images/core/4.1/focus2.png?0" class="overlay-image fade-in" />
-			<img src="//s.w.org/images/core/4.1/focus3.png?0" class="overlay-image from-left" />
-		</div>
-		<h3><em><?php _e( 'Just write.' ); ?></em></h3>
-		<p><?php _e( 'Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>distraction-free writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p>
-	</div>
-</div>
-
-<hr />
-
-<div class="changelog feature-list finer-points">
-	<h2><?php _e( 'The Finer Points' ); ?></h2>
+	<hr>

 	<div class="feature-section col two-col">
-		<div>
-			<svg viewBox="-30 -30 160 160"><path d="M57.9,28.9h-7.9c-1.6,0-3.2,0.3-4.7,1c-1.5,0.7-2.7,1.6-3.7,2.7l-4.7-14.2H21.7L9.2,55.3h8.9l3.9-10.5h14.9v21.1H10.5 c-2.9,0-5.4-1-7.4-3.1C1,60.6,0,58.1,0,55.3V18.4c0-2.9,1-5.4,3.1-7.4c2.1-2.1,4.5-3.1,7.4-3.1h36.8c2.9,0,5.4,1,7.4,3.1 c2.1,2.1,3.1,4.5,3.1,7.4V28.9z M34.3,39.5H23.6l5.3-15.4L34.3,39.5z M52.6,34.2h36.8c2.9,0,5.4,1,7.4,3.1c2.1,2.1,3.1,4.5,3.1,7.4 v36.8c0,2.9-1,5.4-3.1,7.4c-2.1,2.1-4.5,3.1-7.4,3.1H52.6c-2.9,0-5.4-1-7.4-3.1c-2.1-2.1-3.1-4.5-3.1-7.4V44.7c0-2.9,1-5.4,3.1-7.4 C47.3,35.2,49.8,34.2,52.6,34.2z M90.8,60.5v-5.7H74.1V43.4H68v11.4H51.3v5.7h6.7c0.3,2.3,1.1,4.7,2.2,7.2c1.2,2.5,2.7,4.7,4.5,6.6 c-2.2,0.9-4.5,1.7-6.9,2.3s-4.1,0.9-5.2,0.9l0.3,1.4c0.2,0.9,0.4,2,0.6,3.3c0.2,1.3,0.3,2.3,0.2,3.1c2.2,0,4.9-0.6,8.1-1.7 c3.2-1.1,6.3-2.6,9.2-4.3c2.9,1.8,6,3.2,9.3,4.3c3.3,1.1,6.1,1.7,8.3,1.7c0-0.5,0-1.1,0.1-1.8c0.1-0.7,0.2-1.4,0.3-2 c0.1-0.7,0.2-1.3,0.3-1.9c0.1-0.6,0.2-1.1,0.3-1.4l0.1-0.6c-1.2,0-3-0.3-5.4-1c-2.5-0.7-4.8-1.4-7.1-2.3c1.8-2,3.3-4.2,4.4-6.6 s1.9-4.8,2.2-7.1H90.8z M70.7,70.7c-2.7-2.5-4.4-5.8-5.3-10.2h11c-0.9,4.4-2.7,7.7-5.3,10.2l-0.2,0.2 C70.8,70.8,70.8,70.7,70.7,70.7z"/></svg>
-			<h4><?php _e( 'Choose a language' ); ?></h4>
-			<p><?php
-				$count = '<span id="translations-count">' . 40 . '</span>';
-				$string = __( 'Right now, WordPress %1$s is already translated into %2$s languages, with more always in progress. You can switch to any translation on the <a href="%3$s">General Settings</a> screen.' );
-				if ( ! current_user_can( 'manage_options' ) ) {
-					$string = strip_tags( $string );
-				}
-				echo sprintf( $string, $display_version, $count, admin_url( 'options-general.php' ) );
-			?></p>
+		<div class="col-1">
+			<img src="//s.w.org/images/core/3.9/gallery.jpg?0" />
+			<h4><?php _e( 'Gallery previews' ); ?></h4>
+			<p><?php _e( 'Galleries display a beautiful grid of images right in the editor, just like they do in your published post.' ); ?></p>
 		</div>
+		<div class="col-2 last-feature">
+			<div class="wp-playlist wp-audio-playlist wp-playlist-light">
+				<div class="wp-playlist-current-item"></div>
+				<audio controls="controls" preload="metadata"></audio>
+				<div class="wp-playlist-next"></div>
+				<div class="wp-playlist-prev"></div>
+				<?php
+				$audio_icon_js = esc_js( includes_url( 'images/media/audio.png' ) );
+				$wp_host = '//s.w.org/images/core/3.9/';
+				?>

-		<div class="last-feature">
-			<svg viewBox="-30 -30 160 160"><path d="M35.3,26.5H5.9c-1.5,0-2.9-0.6-4.1-1.7C0.6,23.6,0,22.2,0,20.6c0-1.6,0.6-3,1.7-4.1c1.2-1.2,2.5-1.7,4.1-1.7h29.4 c1.6,0,3,0.6,4.1,1.7c1.2,1.2,1.7,2.5,1.7,4.1c0,1.6-0.6,3-1.7,4.1C38.3,25.9,36.9,26.5,35.3,26.5z M68.9,77.7 c-1.2,1.2-2.5,1.7-4.1,1.7H17.6c-1.6,0-3-0.6-4.1-1.7c-1.2-1.2-1.7-2.5-1.7-4.1V38.2c0-1.6,0.6-3,1.7-4.1c1.2-1.2,2.5-1.7,4.1-1.7 h47.1c1.6,0,3,0.6,4.1,1.7c1.2,1.2,1.7,2.5,1.7,4.1v35.3C70.6,75.1,70,76.5,68.9,77.7z M76.5,61.8L100,85.3V26.5L76.5,50V61.8z"/></svg>
-			<h4><?php _e( 'Vine embeds' ); ?></h4>
-			<p><?php printf( __( 'Embedding videos from Vine is as simple as pasting a URL onto its own line in a post. See the <a href="%s">full list</a> of supported embeds.' ), 'http://codex.wordpress.org/Embeds' ); ?></p>
-		</div>
-
-		<div>
-			<svg viewBox="-30 -30 160 160"><path d="M61.4,78.6V61.4L72.9,50v40H10V27.1h45.7L44.3,38.6H21.4v40H61.4z M44.3,10H90v45.7L78.6,50V32.4l-32,31.9l-8.1-8.1 l34.8-34.9H50L44.3,10z"/></svg>
-			<h4><?php _e( 'Log out everywhere' ); ?></h4>
-			<p><?php printf( __( 'If you&#8217;ve ever worried you forgot to sign out from a shared computer, you can now go to <a href="%s">your profile</a> and log out everywhere.' ), get_edit_profile_url() ); ?></p>
-		</div>
-
-		<div class="last-feature">
-			<svg viewBox="-30 -30 160 160"><path d="M35.1,30.1l4.7-5.8l46.4,46.4L80,75c-1.7,1.7-4.6,3.1-8.6,4.3c-4,1.1-7.7,1.7-11,1.7h-20L34,87.4 c-1.5,1.5-3.3,2.3-5.5,2.3c-2.1,0-3.9-0.8-5.5-2.3c-1.5-1.5-2.3-3.3-2.3-5.4c0-2.1,0.8-4,2.3-5.5l6.4-6.4v-20 c0-3.3,0.5-7,1.6-11.2C32.1,34.7,33.4,31.8,35.1,30.1z M76.2,21L59.6,37.7L49.9,28l16.7-16.7c0.9-0.9,2.1-1.2,3.7-0.8 c1.6,0.3,3,1.2,4.3,2.5c1.3,1.3,2.2,2.7,2.5,4.3C77.4,18.9,77.1,20.1,76.2,21z M72.4,50.5l16.7-16.7c0.9-0.9,2.1-1.2,3.7-0.9 c1.6,0.3,3,1.1,4.3,2.5c1.3,1.3,2.2,2.7,2.5,4.3c0.3,1.6,0,2.8-0.9,3.7L82,60.1L72.4,50.5z"/><path d="M10.9,40.4l3.4,6.8L21,48l-4.7,5.2l1.3,7.5l-6.8-3.4l-6.8,3.4l1.3-7.5L0.7,48l6.8-0.8L10.9,40.4z"/></svg>
-			<h4><?php _e( 'Plugin recommendations' ); ?></h4>
-			<p><?php
-				$string = __( 'The <a href="%s">plugin installer</a> suggests plugins for you to try. Recommendations are based on the plugins you and other users have installed.' );
-				if ( ! current_user_can( 'install_plugins' ) ) {
-					$string = strip_tags( $string );
-				}
-				echo sprintf( $string, network_admin_url( 'plugin-install.php?tab=recommended' ) );
-			?></p>
+				<script type="application/json">{
+					"type":"audio",
+					"tracklist":true,
+					"tracknumbers":true,
+					"images":true,
+					"artists":true,
+					"tracks":[{
+						"src":"<?php echo $wp_host ?>AintMisbehavin.mp3",
+						"type":"audio\/mpeg","title":"Ain't Misbehavin'","caption":"","description":"",
+						"meta":{
+							"artist":"Louis Armstrong & His Orchestra",
+							"album":"78 RPMs & Cylinder Recordings",
+							"genre":"Jazz",
+							"length_formatted":"3:21"
+						},
+						"image":{"src":"//s.w.org/images/core/3.9/louis.jpg","width":308,"height":240},
+						"thumb":{"src":"//s.w.org/images/core/3.9/louis.jpg","width":308,"height":240}
+					},
+					{
+						"src":"<?php echo $wp_host ?>JellyRollMorton-BuddyBoldensBlues.mp3",
+						"type":"audio\/mpeg","title":"Buddy Bolden's Blues","caption":"","description":"",
+						"meta":{
+							"artist":"Jelly Roll Morten",
+							"album":"78 RPMs & Cylinder Recordings",
+							"genre":"Jazz",
+							"length_formatted":"2:09"
+						},
+						"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
+						"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
+					},
+					{
+						"src":"<?php echo $wp_host ?>DavenportBlues.mp3",
+						"type":"audio\/mpeg","title":"Davenport Blues","caption":"","description":"",
+						"meta":{
+							"artist":"Bix Beiderbecke & His Rhythm Jugglers",
+							"album":"78 RPMs & Cylinder Recordings",
+							"genre":"Jazz",
+							"length_formatted":"2:48"
+						},
+						"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
+						"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
+					},
+					{
+						"src":"<?php echo $wp_host ?>WolverineBlues.mp3",
+						"type":"audio\/mpeg","title":"Wolverine Blues","caption":"","description":"",
+						"meta":{
+							"artist":"Benny Goodman's Boys",
+							"album":"78 RPMs & Cylinder Recordings",
+							"genre":"Jazz",
+							"length_formatted":"2:55"
+						},
+						"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
+						"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
+					},
+					{
+						"src":"<?php echo $wp_host ?>Louisiana_Five-Dixie_Blues-1919.mp3",
+						"type":"audio\/mpeg","title":"Dixie Blues","caption":"","description":"",
+						"meta":{
+							"artist":"Louisiana Five",
+							"album":"78 RPMs & Cylinder Recordings",
+							"genre":"Jazz",
+							"length_formatted":"3:01"
+						},
+						"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
+						"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
+					},
+					{
+						"src":"<?php echo $wp_host ?>Johnny_Hodges_Orchestra-Squaty_Roo-1941.mp3",
+						"type":"audio\/mpeg","title":"Squaty Roo","caption":"","description":"",
+						"meta":{
+							"artist":"Johnny Hodges Orchestra",
+							"album":"78 RPMs & Cylinder Recordings",
+							"genre":"Jazz",
+							"length_formatted":"2:24"
+						},
+						"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
+						"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
+					}]
+				}</script>
+			</div>
+			<h4><?php _e( 'Do more with audio and video' ); ?></h4>
+			<p><?php _e( 'Images have galleries; now we&#8217;ve added simple audio and video playlists, so you can showcase your music and clips.' ); ?></p>
 		</div>
 	</div>
 </div>

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

+<div class="changelog customize">
 	<div class="feature-section col two-col">
 		<div>
-			<h4><?php _e( 'Complex Queries' ); ?></h4>
-			<p><?php printf( __( 'Metadata, date, and term queries now support advanced conditional logic, like nested clauses and multiple operators &mdash; %s.' ), '<code>A&nbsp;AND&nbsp;(&nbsp;B&nbsp;OR&nbsp;C&nbsp;)</code>' ); ?></p>
-
-			<h4><?php _e( 'Customizer API' ); ?></h4>
-			<p><?php _e( 'Expanded JavaScript APIs in the customizer enable a new media experience as well as dynamic and contextual controls, sections, and panels.' ); ?></p>
+			<?php
+				echo wp_video_shortcode( array(
+					'mp4'      => '//s.w.org/images/core/3.9/widgets.mp4',
+					'ogv'      => '//s.w.org/images/core/3.9/widgets.ogv',
+					'webm'     => '//s.w.org/images/core/3.9/widgets.webm',
+					'loop'     => true,
+					'autoplay' => true,
+					'width'    => 499
+				) );
+			?>
+			<h4><?php _e( 'Live widget and header previews' ); ?></h4>
+			<p><?php _e( 'Add, edit, and rearrange your site&#8217;s widgets right in the theme customizer. No &#8220;save and surprise&#8221; &mdash; preview your changes live and only save them when you&#8217;re ready.' ); ?></p>
+			<p><?php _e( 'The improved header image tool also lets you upload, crop, and manage headers while customizing your theme.' ); ?></p>
 		</div>
 		<div class="last-feature">
-			<h4><?php
-				/* translators: %s: "<title>" tag */
-				printf( __( '%s tags in themes' ), '<code>&lt;title&gt;</code>' );
-			?></h4>
-			<p><?php
-				printf( __( '%s tells WordPress to handle the complexities of document titles.' ), "<code>add_theme_support( 'title-tag' )</code>" );
-			?></p>
-
-			<h4><?php _e( 'Developer Reference' ); ?></h4>
-			<p><?php printf( __( 'Continued improvements to inline code documentation have made the <a href="%s">developer reference</a> more complete than ever.' ), 'https://developer.wordpress.org/reference/' ); ?></p>
+			<img src="//s.w.org/images/core/3.9/theme.jpg?0" />
+			<h4><?php _e( 'Stunning new theme browser' ); ?></h4>
+			<p><?php _e( 'Looking for a new theme should be easy and fun. Lose yourself in the boundless supply of free WordPress.org themes with the beautiful new theme browser.' ); ?></p>
+		<?php if ( current_user_can( 'install_themes' ) ) { ?>
+			<p><a href="<?php echo network_admin_url( 'theme-install.php' ); ?>" class="button button-large button-primary"><?php _e( 'Browse Themes' ); ?></a></p>
+		<?php } ?>
 		</div>
 	</div>
+</div>

-	<hr />
+<hr>

-	<div class="return-to-dashboard">
-		<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
-		<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>"><?php
-			is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' );
-		?></a> |
-		<?php endif; ?>
-		<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php
-			is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
-	</div>
+<div class="changelog under-the-hood">
+	<h3><?php _e( 'Under the Hood' ); ?></h3>
+
+	<div class="feature-section col three-col">
+		<div>
+			<h4><?php _e( 'Semantic Captions and Galleries' ); ?></h4>
+			<p><?php _e( 'Theme developers have new options for images and galleries that use intelligent HTML5 markup.' ); ?></p>
+
+			<h4><?php _e( 'Inline Code Documentation' ); ?></h4>
+			<p><?php _e( 'Every action and filter hook in WordPress is now documented, along with expanded documentation for the media manager and customizer APIs.' ); ?></p>
+		</div>
+		<div>
+			<h4><?php _e( 'External Libraries' ); ?></h4>
+			<p><?php _e( 'Updated libraries: TinyMCE&nbsp;4, jQuery&nbsp;1.11, Backbone&nbsp;1.1, Underscore&nbsp;1.6, Plupload&nbsp;2, MediaElement&nbsp;2.14, Masonry&nbsp;3.' ); ?></p>
+
+			<h4><?php _e( 'Improved Database Layer' ); ?></h4>
+			<p><?php _e( 'Database connections are now more fault-resistant and have improved compatibility with PHP 5.5 and MySQL 5.6.' ); ?></p>
+		</div>
+		<div class="last-feature">
+			<h4><?php _e( 'New Utility Functions' ); ?></h4>
+			<p><?php _e( 'Identify a hook in progress with <code>doing_action()</code> and <code>doing_filter()</code>, and manipulate custom image sizes with <code>has_image_size()</code> and <code>remove_image_size()</code>.' ); ?></p>
+			<p><?php _e( 'Plugins and themes registering custom image sizes can now register suggested cropping points. For example, prevent heads from being cropped out of photos with a top-center crop.' ); ?></p>
+		</div>
+</div>
+
+<hr>
+
+<div class="return-to-dashboard">
+	<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
+	<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>"><?php
+		is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' );
+	?></a> |
+	<?php endif; ?>
+	<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php
+		is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
 </div>

 </div>
-
-<script>
-jQuery(document).ready( function($) {
-	$.ajax( 'https://api.wordpress.org/translations/core/1.0/?version=4.1',
-		{ 'type' : 'HEAD' } ).done( function( data, textStatus, jqXHR ) {
-			var count = jqXHR.getResponseHeader( 'X-Translations-Count' );
-			if ( count ) {
-				$( '#translations-count' ).text( count );
-			}
-	});
-});
-</script>
 <?php

 include( ABSPATH . 'wp-admin/admin-footer.php' );
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -14,9 +14,7 @@
 * @since 2.1.0
 */
 define( 'DOING_AJAX', true );
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
-}
+define( 'WP_ADMIN', true );

 /** Load WordPress Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
@@ -60,8 +58,7 @@ $core_actions_post = array(
 	'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'
+	'save-user-color-scheme', 'update-widget', 'query-themes',
 );

 // Register core Ajax calls.
@@ -77,7 +74,7 @@ if ( is_user_logged_in() ) {
 	/**
 	 * Fires authenticated AJAX actions for logged-in users.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
+	 * The dynamic portion of the hook name, $_REQUEST['action'],
 	 * refers to the name of the AJAX action callback being fired.
 	 *
 	 * @since 2.1.0
@@ -87,7 +84,7 @@ if ( is_user_logged_in() ) {
 	/**
 	 * Fires non-authenticated AJAX actions for logged-out users.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
+	 * The dynamic portion of the hook name, $_REQUEST['action'],
 	 * refers to the name of the AJAX action callback being fired.
 	 *
 	 * @since 2.8.0
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -76,7 +76,7 @@ do_action( 'admin_print_footer_scripts' );
 /**
 * Print scripts or data after the default footer scripts.
 *
- * The dynamic portion of the hook name, `$GLOBALS['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
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -34,7 +34,7 @@ else
 	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );

 /**
- * Filter the title tag content for an admin page.
+ * Filter the <title> content for an admin page.
 *
 * @since 3.1.0
 *
@@ -108,17 +108,14 @@ do_action( "admin_print_scripts-$hook_suffix" );
 do_action( 'admin_print_scripts' );

 /**
- * Fires in head section for a specific admin page.
- *
- * The dynamic portion of the hook, `$hook_suffix`, refers to the hook suffix
- * for the admin page.
+ * Fires in <head> for a specific admin page based on $hook_suffix.
 *
 * @since 2.1.0
 */
 do_action( "admin_head-$hook_suffix" );

 /**
- * Fires in head section for all admin pages.
+ * Fires in <head> for all admin pages.
 *
 * @since 2.1.0
 */
@@ -162,31 +159,26 @@ $admin_body_class .= ' no-customize-support no-svg';
 </head>
 <?php
 /**
- * Filter the CSS classes for the body tag in the admin.
+ * Filter the admin <body> CSS classes.
 *
- * This filter differs from the {@see 'post_class'} and {@see 'body_class'} filters
- * in two important ways:
- *
- * 1. `$classes` is a space-separated string of class names instead of an array.
- * 2. Not all core admin classes are filterable, notably: wp-admin, wp-core-ui,
- *    and no-js cannot be removed.
+ * This filter differs from the post_class or body_class filters in two important ways:
+ * 1. $classes is a space-separated string of class names instead of an array.
+ * 2. Not all core admin classes are filterable, notably: wp-admin, wp-core-ui, and no-js cannot be removed.
 *
 * @since 2.3.0
 *
- * @param string $classes Space-separated list of CSS classes.
+ * @param string $classes Space-separated string of CSS classes.
 */
-$admin_body_classes = apply_filters( 'admin_body_class', '' );
 ?>
-<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+<body class="wp-admin wp-core-ui no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>">
 <script type="text/javascript">
 	document.body.className = document.body.className.replace('no-js','js');
 </script>

 <?php
 // Make sure the customize body classes are correct as early as possible.
-if ( current_user_can( 'customize' ) ) {
+if ( current_user_can( 'edit_theme_options' ) )
 	wp_customize_support_script();
-}
 ?>

 <div id="wpwrap">
--- a/wp-admin/admin-post.php
+++ b/wp-admin/admin-post.php
@@ -9,9 +9,7 @@
 */

 /** We are located in WordPress Administration Screens */
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
-}
+define('WP_ADMIN', true);

 if ( defined('ABSPATH') )
 	require_once(ABSPATH . 'wp-load.php');
@@ -28,44 +26,20 @@ nocache_headers();
 /** This action is documented in wp-admin/admin.php */
 do_action( 'admin_init' );

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

-if ( ! wp_validate_auth_cookie() ) {
-	if ( empty( $action ) ) {
-		/**
-		 * Fires on a non-authenticated admin post request where no action was supplied.
-		 *
-		 * @since 2.6.0
-		 */
-		do_action( 'admin_post_nopriv' );
-	} else {
-		/**
-		 * Fires on a non-authenticated admin post request for the given action.
-		 *
-		 * The dynamic portion of the hook name, `$action`, refers to the given
-		 * request action.
-		 *
-		 * @since 2.6.0
-		 */
-		do_action( "admin_post_nopriv_{$action}" );
-	}
-} else {
-	if ( empty( $action ) ) {
-		/**
-		 * Fires on an authenticated admin post request where no action was supplied.
-		 *
-		 * @since 2.6.0
-		 */
-		do_action( 'admin_post' );
-	} else {
-		/**
-		 * Fires on an authenticated admin post request for the given action.
-		 *
-		 * The dynamic portion of the hook name, `$action`, refers to the given
-		 * request action.
-		 *
-		 * @since 2.6.0
-		 */
-		do_action( "admin_post_{$action}" );
-	}
-}
+if ( !wp_validate_auth_cookie() )
+	$action .= '_nopriv';
+
+if ( !empty($_REQUEST['action']) )
+	$action .= '_' . $_REQUEST['action'];
+
+/**
+ * Fires the requested handler action.
+ *
+ * admin_post_nopriv_{$_REQUEST['action']} is called for not-logged-in users.
+ * admin_post_{$_REQUEST['action']} is called for logged-in users.
+ *
+ * @since 2.6.0
+ */
+do_action( $action );
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -11,9 +11,8 @@
 *
 * @since 2.3.2
 */
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
-}
+if ( ! defined('WP_ADMIN') )
+	define('WP_ADMIN', true);

 if ( ! defined('WP_NETWORK_ADMIN') )
 	define('WP_NETWORK_ADMIN', false);
@@ -51,8 +50,8 @@ if ( get_option('db_upgraded') ) {
 	 * Filter whether to attempt to perform the multisite DB upgrade routine.
 	 *
 	 * In single site, the user would be redirected to wp-admin/upgrade.php.
-	 * In multisite, the DB upgrade routine is automatically fired, but only
-	 * when this filter returns true.
+	 * In multisite, it is automatically fired, but only when this filter
+	 * returns true.
 	 *
 	 * If the network is 50 sites or less, it will run every time. Otherwise,
 	 * it will throttle itself to reduce load.
@@ -151,8 +150,7 @@ if ( isset($plugin_page) ) {
 		$the_parent = $pagenow;
 	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
-
-		// Backwards compatibility for plugins using add_management_page().
+		// 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' ]) )
@@ -185,14 +183,14 @@ if ( isset($plugin_page) ) {
 		 * The load-* hook fires in a number of contexts. This hook is for plugin screens
 		 * where a callback is provided when the screen is registered.
 		 *
-		 * The dynamic portion of the hook name, `$page_hook`, refers to a mixture of plugin
+		 * The dynamic portion of the hook name, $page_hook, 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,
+		 * Together, the three parts form the $page_hook. Citing the example above,
 		 * the hook name used would be 'load-settings_page_pluginbasename'.
 		 *
 		 * @see get_plugin_page_hook()
@@ -206,7 +204,8 @@ if ( isset($plugin_page) ) {
 		/**
 		 * Used to call the registered callback for a plugin screen.
 		 *
-		 * @internal
+		 * @access private
+		 *
 		 * @since 1.5.0
 		 */
 		do_action( $page_hook );
@@ -223,7 +222,7 @@ if ( isset($plugin_page) ) {
 		 * The load-* hook fires in a number of contexts. This hook is for plugin screens
 		 * where the file to load is directly included, rather than the use of a function.
 		 *
-		 * The dynamic portion of the hook name, `$plugin_page`, refers to the plugin basename.
+		 * The dynamic portion of the hook name, $plugin_page, refers to the plugin basename.
 		 *
 		 * @see plugin_basename()
 		 *
@@ -263,7 +262,7 @@ if ( isset($plugin_page) ) {
 	/**
 	 * Fires before an importer screen is loaded.
 	 *
-	 * The dynamic portion of the hook name, `$importer`, refers to the importer slug.
+	 * The dynamic portion of the hook name, $importer, refers to the importer slug.
 	 *
 	 * @since 3.5.0
 	 */
@@ -290,9 +289,8 @@ if ( isset($plugin_page) ) {
 	 *
 	 * @param bool false Whether to force data to be filtered through kses. Default false.
 	 */
-	if ( apply_filters( 'force_filtered_html_on_import', 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]);

@@ -308,19 +306,15 @@ if ( isset($plugin_page) ) {
 	 *
 	 * The load-* hook fires in a number of contexts. This hook is for core screens.
 	 *
-	 * The dynamic portion of the hook name, `$pagenow`, is a global variable
+	 * The dynamic portion of the hook name, $pagenow, is a global variable
 	 * referring to the filename of the current page, such as 'admin.php',
-	 * 'post-new.php' etc. A complete hook for the latter would be
-	 * 'load-post-new.php'.
+	 * 'post-new.php' etc. A complete hook for the latter would be 'load-post-new.php'.
 	 *
 	 * @since 2.1.0
 	 */
 	do_action( 'load-' . $pagenow );
-
-	/*
-	 * The following hooks are fired to ensure backward compatibility.
-	 * In all other cases, 'load-' . $pagenow should be used instead.
-	 */
+	// Backwards compatibility with old load-page-new.php, load-page.php,
+	// and load-categories.php actions.
 	if ( $typenow == 'page' ) {
 		if ( $pagenow == 'post-new.php' )
 			do_action( 'load-page-new.php' );
@@ -338,8 +332,8 @@ if ( ! empty( $_REQUEST['action'] ) ) {
 	/**
 	 * Fires when an 'action' request variable is sent.
 	 *
-	 * The dynamic portion of the hook name, `$_REQUEST['action']`,
-	 * refers to the action derived from the `GET` or `POST` request.
+	 * The dynamic portion of the hook name, $_REQUEST['action'],
+	 * refers to the action derived from the GET or POST request.
 	 *
 	 * @since 2.6.0
 	 */
--- 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, swfupload or other asynchronous upload methods.
+ * Accepts file uploads from swfupload or other asynchronous upload methods.
 *
 * @package WordPress
 * @subpackage Administration
@@ -10,9 +10,7 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
 	define( 'DOING_AJAX', true );
 }

-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
-}
+define('WP_ADMIN', true);

 if ( defined('ABSPATH') )
 	require_once(ABSPATH . 'wp-load.php');
@@ -32,10 +30,13 @@ if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['actio

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

-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+if ( !current_user_can('upload_files') )
+	wp_die(__('You do not have permission to upload files.'));
+
+header('Content-Type: text/html; charset=' . get_option('blog_charset'));

 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
-	include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+	include ABSPATH . 'wp-admin/includes/ajax-actions.php';

 	send_nosniff_header();
 	nocache_headers();
@@ -44,10 +45,6 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
 	die( '0' );
 }

-if ( ! current_user_can( 'upload_files' ) ) {
-	wp_die( __( 'You do not have permission to upload files.' ) );
-}
-
 // just fetch the detail form for that attachment
 if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
@@ -87,7 +84,7 @@ if ( isset( $_REQUEST['post_id'] ) ) {

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

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

 	/**
 	 * Filter the returned ID of an uploaded attachment.
 	 *
-	 * The dynamic portion of the hook name, `$type`, refers to the attachment type,
+	 * The dynamic portion of the hook name, $type, refers to the attachment type,
 	 * such as 'image', 'audio', 'video', 'file', etc.
 	 *
 	 * @since 2.5.0
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -111,7 +111,7 @@ case 'spam'    :
 	$nonce_action .= $comment_id;

 ?>
-<div class="wrap">
+<div class='wrap'>

 <div class="narrow">

@@ -181,7 +181,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved

 <p><?php _e('Are you sure you want to do this?'); ?></p>

-<form action="comment.php" method="get">
+<form action='comment.php' method='get'>

 <table width="100%">
 <tr>
@@ -191,9 +191,9 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 </table>

 <?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" />
+<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>
@@ -266,6 +266,7 @@ case 'unapprovecomment' :

 	wp_redirect( $redir );
 	die;
+	break;

 case 'editedcomment' :

@@ -290,9 +291,11 @@ case 'editedcomment' :
 	wp_redirect( $location );

 	exit();
+	break;

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

 } // end switch

--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -82,7 +82,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

-<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you focus on your writing, and the new default theme lets you show it off in style.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s has lots of refinements we think you&#8217;ll love.' ), $display_version ); ?></div>

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

@@ -179,7 +179,6 @@ __( 'Core Contributors to WordPress %s' );
 __( 'Contributing Developers' );
 __( 'Cofounder, Project Lead' );
 __( 'Lead Developer' );
-__( 'Release Lead' );
 __( 'User Experience Lead' );
 __( 'Core Developer' );
 __( 'Core Committer' );
--- a/wp-admin/css/about-rtl.css
+++ b/wp-admin/css/about-rtl.css
@@ -1,24 +1,12 @@
 /*------------------------------------------------------------------------------
  22.0 - About Pages
-
-   1.0 Global: About, Credits, Freedoms
-    1.1 Typography
-    1.2 Structure
-    1.3 Point Releases
-   2.0 About Page
-    2.1 Typography
-    2.2 Structure
-   3.0 Credits & Freedoms Pages
------------------------------------------------------------------------------*/
-
-/*------------------------------------------------------------------------------
-  1.0 - Global: About, Credits, Freedoms
 ------------------------------------------------------------------------------*/

 .about-wrap {
 	position: relative;
 	margin: 25px 20px 0 40px;
 	max-width: 1050px; /* readability */
+
 	font-size: 15px;
 }

@@ -37,14 +25,113 @@
 .about-wrap img {
 	margin: 0;
 	max-width: 100%;
-	height: auto;
 	vertical-align: middle;
 }

+/* Typography */
+
+.about-wrap p {
+	line-height: 1.6em;
+	font-size: 14px;
+}
+
+.about-wrap h1 {
+	margin: 0.2em 0 0 200px;
+	color: #333;
+	line-height: 1.2em;
+	font-size: 2.8em;
+	font-weight: 400;
+}
+
+.about-wrap h4 {
+	color: #222;
+}
+
+.about-wrap .about-text,
+.about-wrap p.about-description,
+.about-wrap li.wp-person a.web {
+	font-weight: normal;
+	line-height: 1.6em;
+	font-size: 19px;
+}
+
+.about-description {
+	margin-top: 1.4em;
+}
+
+.about-text {
+	margin: 1em 0 1em 200px;
+	min-height: 60px;
+	color: #777;
+	font-size: 24px;
+}
+
+.about-wrap .changelog h2.about-headline-callout {
+	margin: 1.1em 0 0.2em;
+	font-size: 2.4em;
+	font-weight: 300;
+	line-height: 1.3;
+	text-align: center;
+}
+
+.about-wrap h3 {
+	margin: 1em 0 .6em;
+	font-size: 1.5em;
+	line-height: 1.5em;
+}
+
+.customize h3 {
+	margin-top: 1.75em;
+	text-align: center;
+}
+
+.about-wrap .feature-section h4 {
+	margin: 1.4em 0 0.6em 0;
+	font-size: 1.2em;
+}
+
+.about-wrap .feature-section p {
+	margin-top: 0.6em;
+}
+
+.about-wrap code,
+.about-wrap ol li p {
+	font-size: 14px;
+}
+
+.about-wrap .button.button-large {
+	padding: 8px 20px 10px !important;
+	height: 46px !important;
+	font-size: 14px;
+	line-height: 28px !important;
+}
+
+/* 3.8 Images */
+
+.about-wrap .about-overview-img {
+	margin: 0;
+}
+
+/* Point Releases */
+
+.about-wrap .point-releases {
+	margin-top: 5px;
+	border-bottom: 1px solid #dfdfdf;
+}
+
+.about-wrap .changelog.point-releases h3 {
+	padding-top: 35px;
+}
+
+.about-wrap .changelog.point-releases h3:first-child {
+	padding-top: 7px;
+}
+
 /* WordPress Version Badge */

 .wp-badge {
 	background: #0074a2 url(../images/w-logo-white.png?ver=20131202) no-repeat;
+	background: #0074a2, url(../images/wordpress-logo-white.svg?ver=20131110) no-repeat; /* multiple backgrounds are ignored by browsers that don't support SVGs */
 	background-position: center 24px;
 	-webkit-background-size: 85px 85px;
 	background-size: 85px 85px;
@@ -62,9 +149,6 @@
 	box-shadow: 0 1px 3px rgba(0,0,0,0.2);
 }

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

 .about-wrap .wp-badge {
 	position: absolute;
@@ -84,199 +168,69 @@
 	font-size: 18px;
 	vertical-align: top;
 	border-width: 1px;
-	white-space: nowrap;
 }

-/* 1.1 - Typography */
+/* Changelog / Update screen */

-.about-wrap p {
-	line-height: 1.6em;
-	font-size: 14px;
+.about-overview {
+	margin-top: 40px;
+	text-align: center;
 }

-.about-wrap h1 {
-	margin: 0.2em 0 0 200px;
-	color: #333;
-	line-height: 1.2em;
-	font-size: 2.8em;
-	font-weight: 400;
+.about-overview .wp-video {
+	margin: 0 auto;
 }

-.about-wrap h3 {
-	margin: 2em 0 .6em;
-	font-size: 1.25em;
-	line-height: 1.5em;
+.changelog .wp-playlist .wp-playlist-current-item img {
+	height: 64px;
+	width: auto;
+	max-width: 100%;
 }

-.about-wrap h4 {
-	color: #222;
+.about-wrap .feature-section {
+	margin-top: 40px;
+	padding-bottom: 20px;
 }

-.about-wrap code,
-.about-wrap ol li p {
-	font-size: 14px;
-}
-
-.about-wrap .about-description,
-.about-wrap .about-text {
-	margin-top: 1.4em;
-	font-weight: normal;
-	line-height: 1.6em;
-	font-size: 19px;
-}
-
-.about-wrap .about-text {
-	margin: 1em 0 1em 200px;
-	min-height: 60px;
-	color: #777;
-}
-
-/* 1.2 - Structure */
-
-.about-wrap .two-col > div {
+.about-wrap .feature-section.two-col > div {
 	position: relative;
-	width: 47.6%;
-	margin-left: 4.799999999%;
+	width: 47.5%;
+	margin-left: 4.999999999%;
 	float: right;
 }

-.about-wrap .three-col > div {
+.about-wrap .feature-section.three-col > div {
 	position: relative;
 	width: 29.95%;
 	margin-left: 4.999999999%;
 	float: right;
 }

-.about-wrap .col .last-feature {
+.about-wrap .feature-section.col .last-feature {
 	margin-left: 0;
 }

-/* 1.3 - Point Releases */
-
-.about-wrap .point-releases {
-	margin-top: 5px;
-	border-bottom: 1px solid #dfdfdf;
-}
-
-.about-wrap .changelog.point-releases h3 {
-	padding-top: 35px;
-}
-
-.about-wrap .changelog.point-releases h3:first-child {
-	padding-top: 7px;
-}
-
-/*------------------------------------------------------------------------------
-  2.0 - About Page
------------------------------------------------------------------------------*/
-
-/* 2.1 - Typography */
-
-.about-wrap .headline-feature h2 {
-	margin: 1.1em 0 0.2em;
-	font-size: 2.4em;
-	font-weight: 300;
-	line-height: 1.3;
-	text-align: center;
-}
-
-.about-wrap .feature-list h2 {
-	margin: 30px 0 15px;
-	text-align: center;
-}
-
-.about-wrap .dfw h3 {
-	margin-top: 1em;
-	text-align: center;
-}
-
-.about-wrap .feature-section h4 {
-	margin: 1.4em 0 0.6em 0;
-	font-size: 1.2em;
-}
-
-.about-wrap .feature-section p {
-	margin-top: 0.6em;
-}
-
-.about-wrap .dfw p {
-	max-width: 68%;
-	margin: 0 auto 20px;
-}
-
-/* 2.2 - Structure */
-
-.about-wrap .featured-image {
-	text-align: center;
-}
-
-.about-wrap .feature-section {
-	overflow: hidden;
-	padding-bottom: 20px;
-}
-
-.about-wrap .headline-feature .feature-section {
-	margin: 0 auto;
-	max-width: 82%;
-}
-
-.about-wrap .headline-feature .feature-section .col:first-child {
-	float: right;
-	margin: 15px 0 0 5%;
-	width: 55%;
-}
-
-.about-wrap .headline-feature .feature-section .col:last-child {
-	float: left;
-	margin: 15px 0 40px;
-	width: 40%;
-}
-
-.about-wrap .feature-list .feature-section {
+.about-wrap .under-the-hood .feature-section {
 	margin-top: 0;
 }

-.about-wrap .dfw .feature-section {
-	overflow: visible;
-}
-
-.about-wrap .dfw-container {
-	position: relative;
+.about-wrap .changelog .feature-section {
 	overflow: hidden;
-	margin-top: 50px;
-	-webkit-box-shadow: 0 0 10px rgba( 0, 0, 0, 0.25 );
-	box-shadow: 0 0 10px rgba( 0, 0, 0, 0.25 );
 }

-.about-wrap .dfw-container .overlay-image {
-	position: absolute;
-	top: 0;
-	right: 0;
-	/* Cubic Bezier to speed up the slide-out of the full-width sidebar image */
-	-webkit-transition: 0.8s -webkit-transform cubic-bezier(.9,.03,1,.61),
-	            0.65s opacity linear;
-	transition: 0.8s transform cubic-bezier(.9,.03,1,.61),
-	            0.65s opacity linear;
+.about-wrap .feature-section.two-col div p {
+	margin-left: 3%;
 }

-.about-wrap .dfw-container .overlay-image.fade-in {
-	opacity: 0;
+.about-wrap .feature-section div p img {
+	float: left;
+	margin-right: 10px;
+	max-width: 20%;
 }

-.about-wrap .dfw-container .overlay-image.from-left {
-	-webkit-transform: translate3d(-100%, 0, 0);
-	transform: translate3d(-100%, 0, 0);
-}
-
-.about-wrap .dfw-container:hover .overlay-image {
-	opacity: 1;
-	-webkit-transform: translate3d(0, 0, 0);
-	transform: translate3d(0, 0, 0);
-	/* Cubic Bezier to speed up the slide-in of the full-width sidebar image */
-	-webkit-transition: 0.7s -webkit-transform cubic-bezier( 0, 0.8, 0.8, 1 ),
-	            0.8s opacity linear;
-	transition: 0.7s transform cubic-bezier( 0, 0.8, 0.8, 1 ),
-	            0.8s opacity linear;
+.about-wrap .changelog li {
+	list-style-type: disc;
+	margin-right: 3em;
 }

 /* Return to Dashboard Home link */
@@ -292,29 +246,6 @@
 	padding: 0 5px;
 }

-/* SVGs */
-.about-wrap .feature-list svg {
-	float: right;
-	clear: right;
-	margin: 15px 0 0 15px ;
-	height: 90px;
-	width: 90px;
-	background-color: #cccccc;
-	-webkit-border-radius: 50%;
-	border-radius: 50%;
-	fill: #999;
-	border: 1px solid #c1c1c1;
-}
-
-.about-wrap .feature-list.finer-points h4,
-.about-wrap .feature-list.finer-points p {
-	margin-right: 115px;
-}
-
-/*------------------------------------------------------------------------------
-  3.0 - Credits & Freedoms Pages
------------------------------------------------------------------------------*/
-
 /* Credits */

 .about-wrap h4.wp-people-group {
@@ -333,19 +264,8 @@
 }

 .about-wrap li.wp-person {
-	display: inline-block;
-	vertical-align: top;
+	float: right;
 	margin-left: 10px;
-	padding-bottom: 15px;
-	height: 70px;
-	width: 280px;
-}
-
-.about-wrap ul.compact li.wp-person {
-	height: auto;
-	width: 180px;
-	padding-bottom: 0;
-	margin-bottom: 0;
 }

 .about-wrap li.wp-person img.gravatar {
@@ -361,19 +281,31 @@
 	height: 30px;
 }

-.about-wrap li.wp-person a.web {
-	display: block;
-	margin: 6px 0 2px;
-	font-size: 16px;
-	font-weight: normal;
-	line-height: 1.6em;
-	text-decoration: none;
+/* @todo: combine this */
+.about-wrap li.wp-person {
+	height: 70px;
+	width: 280px;
+	padding-bottom: 15px;
+}
+
+.about-wrap ul.compact li.wp-person {
+	height: auto;
+	width: 180px;
+	padding-bottom: 0;
+	margin-bottom: 0;
 }

 .about-wrap #wp-people-group-validators + p.wp-credits-list {
 	margin-top: 0;
 }

+.about-wrap li.wp-person a.web {
+	display: block;
+	margin: 6px 0 2px;
+	font-size: 16px;
+	text-decoration: none;
+}
+
 .about-wrap p.wp-credits-list a {
 	white-space: nowrap;
 }
@@ -394,34 +326,27 @@
 	margin: 0.6em 0;
 }

-/*------------------------------------------------------------------------------
-  4.0 - Media Queries
------------------------------------------------------------------------------*/
+/* =Media Queries
+-------------------------------------------------------------- */

@media screen and ( max-width: 782px ) {
-	.about-wrap .one-col > div,
-	.about-wrap .two-col > div,
-	.about-wrap .three-col > div {
+	.about-wrap .feature-section.one-col > div,
+	.about-wrap .feature-section.two-col > div,
+	.about-wrap .feature-section.three-col > div {
 		width: 100%;
 		margin: 0 0 40px;
 		padding: 0 0 40px;
+		float: none;
 		border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 	}

-	.about-wrap .feature-list div,
-	.about-wrap .col > div.last-feature {
+	.about-wrap .under-the-hood .feature-section > div,
+	.about-wrap .feature-section.col > div.last-feature {
 		margin: 0;
 		padding: 0;
 		border-bottom: none;
 	}

-	.about-wrap .headline-feature .feature-section {
-		max-width: 100%;
-	}
-
-	.about-wrap .feature-list .feature-section {
-		padding: 0 0 40px;
-	}
 }

@media only screen and (max-width: 500px) {
@@ -431,11 +356,11 @@
 	}

 	.about-wrap h1,
-	.about-wrap .about-text {
+	.about-text {
 		margin-left: 0;
 	}

-	.about-wrap .about-text {
+	.about-text {
 		margin-bottom: 0.25em;
 	}

@@ -445,36 +370,19 @@
 		width: 100%;
 	}

-	.about-wrap h2.nav-tab-wrapper {
-		padding-right: 0;
-		border-bottom: 0;
+	.about-wrap .feature-section.three-col div {
+		width: 100%;
+		float: none;
 	}

-	.about-wrap h2 .nav-tab {
-		margin-top: 10px;
-		margin-left: 10px;
-		border-bottom: 1px solid #ccc;
+	.about-wrap .three-col.about-updates .col-1 {
+		padding: 0;
+		float: none;
 	}

-	.about-wrap .three-col div,
-	.about-wrap .headline-feature .feature-section div {
-		width: 100% !important;
-		float: none !important;
+	.about-wrap .three-col.about-updates .col-2 {
+		margin: 0 0 20px;
+		width: 100%;
+		float: none;
 	}
-
-	.about-wrap .dfw p {
-		max-width: 90%;
-	}
-}
-
-@media only screen and (max-width: 400px) {
-	.about-wrap .feature-list svg {
-		margin-top: 15px;
-		height: 65px;
-		width: 65px;
-	}
-	.about-wrap .feature-list.finer-points h4,
-	.about-wrap .feature-list.finer-points p {
-		margin-right: 80px;
-	}
-}
+}
--- a/wp-admin/css/about.css
+++ b/wp-admin/css/about.css
@@ -1,24 +1,12 @@
 /*------------------------------------------------------------------------------
  22.0 - About Pages
-
-   1.0 Global: About, Credits, Freedoms
-    1.1 Typography
-    1.2 Structure
-    1.3 Point Releases
-   2.0 About Page
-    2.1 Typography
-    2.2 Structure
-   3.0 Credits & Freedoms Pages
------------------------------------------------------------------------------*/
-
-/*------------------------------------------------------------------------------
-  1.0 - Global: About, Credits, Freedoms
 ------------------------------------------------------------------------------*/

 .about-wrap {
 	position: relative;
 	margin: 25px 40px 0 20px;
 	max-width: 1050px; /* readability */
+
 	font-size: 15px;
 }

@@ -37,14 +25,113 @@
 .about-wrap img {
 	margin: 0;
 	max-width: 100%;
-	height: auto;
 	vertical-align: middle;
 }

+/* Typography */
+
+.about-wrap p {
+	line-height: 1.6em;
+	font-size: 14px;
+}
+
+.about-wrap h1 {
+	margin: 0.2em 200px 0 0;
+	color: #333;
+	line-height: 1.2em;
+	font-size: 2.8em;
+	font-weight: 400;
+}
+
+.about-wrap h4 {
+	color: #222;
+}
+
+.about-wrap .about-text,
+.about-wrap p.about-description,
+.about-wrap li.wp-person a.web {
+	font-weight: normal;
+	line-height: 1.6em;
+	font-size: 19px;
+}
+
+.about-description {
+	margin-top: 1.4em;
+}
+
+.about-text {
+	margin: 1em 200px 1em 0;
+	min-height: 60px;
+	color: #777;
+	font-size: 24px;
+}
+
+.about-wrap .changelog h2.about-headline-callout {
+	margin: 1.1em 0 0.2em;
+	font-size: 2.4em;
+	font-weight: 300;
+	line-height: 1.3;
+	text-align: center;
+}
+
+.about-wrap h3 {
+	margin: 1em 0 .6em;
+	font-size: 1.5em;
+	line-height: 1.5em;
+}
+
+.customize h3 {
+	margin-top: 1.75em;
+	text-align: center;
+}
+
+.about-wrap .feature-section h4 {
+	margin: 1.4em 0 0.6em 0;
+	font-size: 1.2em;
+}
+
+.about-wrap .feature-section p {
+	margin-top: 0.6em;
+}
+
+.about-wrap code,
+.about-wrap ol li p {
+	font-size: 14px;
+}
+
+.about-wrap .button.button-large {
+	padding: 8px 20px 10px !important;
+	height: 46px !important;
+	font-size: 14px;
+	line-height: 28px !important;
+}
+
+/* 3.8 Images */
+
+.about-wrap .about-overview-img {
+	margin: 0;
+}
+
+/* Point Releases */
+
+.about-wrap .point-releases {
+	margin-top: 5px;
+	border-bottom: 1px solid #dfdfdf;
+}
+
+.about-wrap .changelog.point-releases h3 {
+	padding-top: 35px;
+}
+
+.about-wrap .changelog.point-releases h3:first-child {
+	padding-top: 7px;
+}
+
 /* WordPress Version Badge */

 .wp-badge {
 	background: #0074a2 url(../images/w-logo-white.png?ver=20131202) no-repeat;
+	background: #0074a2, url(../images/wordpress-logo-white.svg?ver=20131110) no-repeat; /* multiple backgrounds are ignored by browsers that don't support SVGs */
 	background-position: center 24px;
 	-webkit-background-size: 85px 85px;
 	background-size: 85px 85px;
@@ -62,9 +149,6 @@
 	box-shadow: 0 1px 3px rgba(0,0,0,0.2);
 }

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

 .about-wrap .wp-badge {
 	position: absolute;
@@ -84,199 +168,69 @@
 	font-size: 18px;
 	vertical-align: top;
 	border-width: 1px;
-	white-space: nowrap;
 }

-/* 1.1 - Typography */
+/* Changelog / Update screen */

-.about-wrap p {
-	line-height: 1.6em;
-	font-size: 14px;
+.about-overview {
+	margin-top: 40px;
+	text-align: center;
 }

-.about-wrap h1 {
-	margin: 0.2em 200px 0 0;
-	color: #333;
-	line-height: 1.2em;
-	font-size: 2.8em;
-	font-weight: 400;
+.about-overview .wp-video {
+	margin: 0 auto;
 }

-.about-wrap h3 {
-	margin: 2em 0 .6em;
-	font-size: 1.25em;
-	line-height: 1.5em;
+.changelog .wp-playlist .wp-playlist-current-item img {
+	height: 64px;
+	width: auto;
+	max-width: 100%;
 }

-.about-wrap h4 {
-	color: #222;
+.about-wrap .feature-section {
+	margin-top: 40px;
+	padding-bottom: 20px;
 }

-.about-wrap code,
-.about-wrap ol li p {
-	font-size: 14px;
-}
-
-.about-wrap .about-description,
-.about-wrap .about-text {
-	margin-top: 1.4em;
-	font-weight: normal;
-	line-height: 1.6em;
-	font-size: 19px;
-}
-
-.about-wrap .about-text {
-	margin: 1em 200px 1em 0;
-	min-height: 60px;
-	color: #777;
-}
-
-/* 1.2 - Structure */
-
-.about-wrap .two-col > div {
+.about-wrap .feature-section.two-col > div {
 	position: relative;
-	width: 47.6%;
-	margin-right: 4.799999999%;
+	width: 47.5%;
+	margin-right: 4.999999999%;
 	float: left;
 }

-.about-wrap .three-col > div {
+.about-wrap .feature-section.three-col > div {
 	position: relative;
 	width: 29.95%;
 	margin-right: 4.999999999%;
 	float: left;
 }

-.about-wrap .col .last-feature {
+.about-wrap .feature-section.col .last-feature {
 	margin-right: 0;
 }

-/* 1.3 - Point Releases */
-
-.about-wrap .point-releases {
-	margin-top: 5px;
-	border-bottom: 1px solid #dfdfdf;
-}
-
-.about-wrap .changelog.point-releases h3 {
-	padding-top: 35px;
-}
-
-.about-wrap .changelog.point-releases h3:first-child {
-	padding-top: 7px;
-}
-
-/*------------------------------------------------------------------------------
-  2.0 - About Page
------------------------------------------------------------------------------*/
-
-/* 2.1 - Typography */
-
-.about-wrap .headline-feature h2 {
-	margin: 1.1em 0 0.2em;
-	font-size: 2.4em;
-	font-weight: 300;
-	line-height: 1.3;
-	text-align: center;
-}
-
-.about-wrap .feature-list h2 {
-	margin: 30px 0 15px;
-	text-align: center;
-}
-
-.about-wrap .dfw h3 {
-	margin-top: 1em;
-	text-align: center;
-}
-
-.about-wrap .feature-section h4 {
-	margin: 1.4em 0 0.6em 0;
-	font-size: 1.2em;
-}
-
-.about-wrap .feature-section p {
-	margin-top: 0.6em;
-}
-
-.about-wrap .dfw p {
-	max-width: 68%;
-	margin: 0 auto 20px;
-}
-
-/* 2.2 - Structure */
-
-.about-wrap .featured-image {
-	text-align: center;
-}
-
-.about-wrap .feature-section {
-	overflow: hidden;
-	padding-bottom: 20px;
-}
-
-.about-wrap .headline-feature .feature-section {
-	margin: 0 auto;
-	max-width: 82%;
-}
-
-.about-wrap .headline-feature .feature-section .col:first-child {
-	float: left;
-	margin: 15px 5% 0 0;
-	width: 55%;
-}
-
-.about-wrap .headline-feature .feature-section .col:last-child {
-	float: right;
-	margin: 15px 0 40px;
-	width: 40%;
-}
-
-.about-wrap .feature-list .feature-section {
+.about-wrap .under-the-hood .feature-section {
 	margin-top: 0;
 }

-.about-wrap .dfw .feature-section {
-	overflow: visible;
-}
-
-.about-wrap .dfw-container {
-	position: relative;
+.about-wrap .changelog .feature-section {
 	overflow: hidden;
-	margin-top: 50px;
-	-webkit-box-shadow: 0 0 10px rgba( 0, 0, 0, 0.25 );
-	box-shadow: 0 0 10px rgba( 0, 0, 0, 0.25 );
 }

-.about-wrap .dfw-container .overlay-image {
-	position: absolute;
-	top: 0;
-	left: 0;
-	/* Cubic Bezier to speed up the slide-out of the full-width sidebar image */
-	-webkit-transition: 0.8s -webkit-transform cubic-bezier(.9,.03,1,.61),
-	            0.65s opacity linear;
-	transition: 0.8s transform cubic-bezier(.9,.03,1,.61),
-	            0.65s opacity linear;
+.about-wrap .feature-section.two-col div p {
+	margin-right: 3%;
 }

-.about-wrap .dfw-container .overlay-image.fade-in {
-	opacity: 0;
+.about-wrap .feature-section div p img {
+	float: right;
+	margin-left: 10px;
+	max-width: 20%;
 }

-.about-wrap .dfw-container .overlay-image.from-left {
-	-webkit-transform: translate3d(-100%, 0, 0);
-	transform: translate3d(-100%, 0, 0);
-}
-
-.about-wrap .dfw-container:hover .overlay-image {
-	opacity: 1;
-	-webkit-transform: translate3d(0, 0, 0);
-	transform: translate3d(0, 0, 0);
-	/* Cubic Bezier to speed up the slide-in of the full-width sidebar image */
-	-webkit-transition: 0.7s -webkit-transform cubic-bezier( 0, 0.8, 0.8, 1 ),
-	            0.8s opacity linear;
-	transition: 0.7s transform cubic-bezier( 0, 0.8, 0.8, 1 ),
-	            0.8s opacity linear;
+.about-wrap .changelog li {
+	list-style-type: disc;
+	margin-left: 3em;
 }

 /* Return to Dashboard Home link */
@@ -292,29 +246,6 @@
 	padding: 0 5px;
 }

-/* SVGs */
-.about-wrap .feature-list svg {
-	float: left;
-	clear: left;
-	margin: 15px 15px 0 0 ;
-	height: 90px;
-	width: 90px;
-	background-color: #cccccc;
-	-webkit-border-radius: 50%;
-	border-radius: 50%;
-	fill: #999;
-	border: 1px solid #c1c1c1;
-}
-
-.about-wrap .feature-list.finer-points h4,
-.about-wrap .feature-list.finer-points p {
-	margin-left: 115px;
-}
-
-/*------------------------------------------------------------------------------
-  3.0 - Credits & Freedoms Pages
------------------------------------------------------------------------------*/
-
 /* Credits */

 .about-wrap h4.wp-people-group {
@@ -333,19 +264,8 @@
 }

 .about-wrap li.wp-person {
-	display: inline-block;
-	vertical-align: top;
+	float: left;
 	margin-right: 10px;
-	padding-bottom: 15px;
-	height: 70px;
-	width: 280px;
-}
-
-.about-wrap ul.compact li.wp-person {
-	height: auto;
-	width: 180px;
-	padding-bottom: 0;
-	margin-bottom: 0;
 }

 .about-wrap li.wp-person img.gravatar {
@@ -361,19 +281,31 @@
 	height: 30px;
 }

-.about-wrap li.wp-person a.web {
-	display: block;
-	margin: 6px 0 2px;
-	font-size: 16px;
-	font-weight: normal;
-	line-height: 1.6em;
-	text-decoration: none;
+/* @todo: combine this */
+.about-wrap li.wp-person {
+	height: 70px;
+	width: 280px;
+	padding-bottom: 15px;
+}
+
+.about-wrap ul.compact li.wp-person {
+	height: auto;
+	width: 180px;
+	padding-bottom: 0;
+	margin-bottom: 0;
 }

 .about-wrap #wp-people-group-validators + p.wp-credits-list {
 	margin-top: 0;
 }

+.about-wrap li.wp-person a.web {
+	display: block;
+	margin: 6px 0 2px;
+	font-size: 16px;
+	text-decoration: none;
+}
+
 .about-wrap p.wp-credits-list a {
 	white-space: nowrap;
 }
@@ -394,34 +326,27 @@
 	margin: 0.6em 0;
 }

-/*------------------------------------------------------------------------------
-  4.0 - Media Queries
------------------------------------------------------------------------------*/
+/* =Media Queries
+-------------------------------------------------------------- */

@media screen and ( max-width: 782px ) {
-	.about-wrap .one-col > div,
-	.about-wrap .two-col > div,
-	.about-wrap .three-col > div {
+	.about-wrap .feature-section.one-col > div,
+	.about-wrap .feature-section.two-col > div,
+	.about-wrap .feature-section.three-col > div {
 		width: 100%;
 		margin: 0 0 40px;
 		padding: 0 0 40px;
+		float: none;
 		border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 	}

-	.about-wrap .feature-list div,
-	.about-wrap .col > div.last-feature {
+	.about-wrap .under-the-hood .feature-section > div,
+	.about-wrap .feature-section.col > div.last-feature {
 		margin: 0;
 		padding: 0;
 		border-bottom: none;
 	}

-	.about-wrap .headline-feature .feature-section {
-		max-width: 100%;
-	}
-
-	.about-wrap .feature-list .feature-section {
-		padding: 0 0 40px;
-	}
 }

@media only screen and (max-width: 500px) {
@@ -431,11 +356,11 @@
 	}

 	.about-wrap h1,
-	.about-wrap .about-text {
+	.about-text {
 		margin-right: 0;
 	}

-	.about-wrap .about-text {
+	.about-text {
 		margin-bottom: 0.25em;
 	}

@@ -445,36 +370,19 @@
 		width: 100%;
 	}

-	.about-wrap h2.nav-tab-wrapper {
-		padding-left: 0;
-		border-bottom: 0;
+	.about-wrap .feature-section.three-col div {
+		width: 100%;
+		float: none;
 	}

-	.about-wrap h2 .nav-tab {
-		margin-top: 10px;
-		margin-right: 10px;
-		border-bottom: 1px solid #ccc;
+	.about-wrap .three-col.about-updates .col-1 {
+		padding: 0;
+		float: none;
 	}

-	.about-wrap .three-col div,
-	.about-wrap .headline-feature .feature-section div {
-		width: 100% !important;
-		float: none !important;
+	.about-wrap .three-col.about-updates .col-2 {
+		margin: 0 0 20px;
+		width: 100%;
+		float: none;
 	}
-
-	.about-wrap .dfw p {
-		max-width: 90%;
-	}
-}
-
-@media only screen and (max-width: 400px) {
-	.about-wrap .feature-list svg {
-		margin-top: 15px;
-		height: 65px;
-		width: 65px;
-	}
-	.about-wrap .feature-list.finer-points h4,
-	.about-wrap .feature-list.finer-points p {
-		margin-left: 80px;
-	}
-}
+}
--- a/wp-admin/css/admin-menu-rtl.css
+++ b/wp-admin/css/admin-menu-rtl.css
@@ -15,7 +15,7 @@

 #adminmenu {
 	clear: right;
-	margin: 12px 0;
+	margin: 12px 0 0;
 	padding: 0;
 	list-style: none;
 }
@@ -141,7 +141,6 @@
 #adminmenuwrap {
 	position: relative;
 	float: right;
-	z-index: 9990;
 }

 /* side admin menu */
@@ -178,7 +177,7 @@
 #adminmenu li.menu-top > a:focus,
 #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-submenu a:focus {
-	color: #45bbe6;
+	color: #2ea2cc;
 }

 #adminmenu li.menu-top {
@@ -376,7 +375,7 @@ div.wp-menu-image:before {
 }

 #adminmenu li:hover div.wp-menu-image:before {
-	color: #45bbe6;
+	color: #2ea2cc;
 }

 .folded #adminmenu div.wp-menu-image {
@@ -407,6 +406,7 @@ div.wp-menu-image:before {
 /* Sticky admin menu */
 .sticky-menu #adminmenuwrap {
 	position: fixed;
+	z-index: 9999; /* Match the z-index of .wp-submenu to ensure flyout menus don't appear underneath main column elements */
 }

 /* A new arrow */
@@ -524,7 +524,7 @@ ul#adminmenu > li.current > a.current:after {

 #adminmenu li.current a .awaiting-mod,
 #adminmenu	li a.wp-has-current-submenu .update-plugins {
-	background-color: #45bbe6;
+	background-color: #2ea2cc;
 	color: #fff;
 }

@@ -544,7 +544,7 @@ ul#adminmenu > li.current > a.current:after {

 #collapse-menu:hover,
 #collapse-menu:hover #collapse-button div:after {
-	color: #45bbe6;
+	color: #2ea2cc;
 }

 .folded #collapse-menu span {
@@ -610,17 +610,12 @@ li#wp-admin-bar-menu-toggle {
 	display: none;
 }

-/* Hide-if-customize for items we can't add classes to */
-.customize-support #menu-appearance a[href="themes.php?page=custom-header"],
-.customize-support #menu-appearance a[href="themes.php?page=custom-background"] {
-	display: none;
-}

 /* Auto-folding of the admin menu */
-@media only screen and (max-width: 960px) {
+@media only screen and (max-width: 900px) {
 	.auto-fold #wpcontent,
 	.auto-fold #wpfooter {
-		margin-right: 36px;
+		margin-right: 56px;
 	}

 	.auto-fold #adminmenuback,
--- a/wp-admin/css/admin-menu.css
+++ b/wp-admin/css/admin-menu.css
@@ -15,7 +15,7 @@

 #adminmenu {
 	clear: left;
-	margin: 12px 0;
+	margin: 12px 0 0;
 	padding: 0;
 	list-style: none;
 }
@@ -141,7 +141,6 @@
 #adminmenuwrap {
 	position: relative;
 	float: left;
-	z-index: 9990;
 }

 /* side admin menu */
@@ -178,7 +177,7 @@
 #adminmenu li.menu-top > a:focus,
 #adminmenu .wp-submenu a:hover,
 #adminmenu .wp-submenu a:focus {
-	color: #45bbe6;
+	color: #2ea2cc;
 }

 #adminmenu li.menu-top {
@@ -376,7 +375,7 @@ div.wp-menu-image:before {
 }

 #adminmenu li:hover div.wp-menu-image:before {
-	color: #45bbe6;
+	color: #2ea2cc;
 }

 .folded #adminmenu div.wp-menu-image {
@@ -407,6 +406,7 @@ div.wp-menu-image:before {
 /* Sticky admin menu */
 .sticky-menu #adminmenuwrap {
 	position: fixed;
+	z-index: 9999; /* Match the z-index of .wp-submenu to ensure flyout menus don't appear underneath main column elements */
 }

 /* A new arrow */
@@ -524,7 +524,7 @@ ul#adminmenu > li.current > a.current:after {

 #adminmenu li.current a .awaiting-mod,
 #adminmenu	li a.wp-has-current-submenu .update-plugins {
-	background-color: #45bbe6;
+	background-color: #2ea2cc;
 	color: #fff;
 }

@@ -544,7 +544,7 @@ ul#adminmenu > li.current > a.current:after {

 #collapse-menu:hover,
 #collapse-menu:hover #collapse-button div:after {
-	color: #45bbe6;
+	color: #2ea2cc;
 }

 .folded #collapse-menu span {
@@ -610,17 +610,12 @@ li#wp-admin-bar-menu-toggle {
 	display: none;
 }

-/* Hide-if-customize for items we can't add classes to */
-.customize-support #menu-appearance a[href="themes.php?page=custom-header"],
-.customize-support #menu-appearance a[href="themes.php?page=custom-background"] {
-	display: none;
-}

 /* Auto-folding of the admin menu */
-@media only screen and (max-width: 960px) {
+@media only screen and (max-width: 900px) {
 	.auto-fold #wpcontent,
 	.auto-fold #wpfooter {
-		margin-left: 36px;
+		margin-left: 56px;
 	}

 	.auto-fold #adminmenuback,
--- a/wp-admin/css/color-picker-rtl.css
+++ b/wp-admin/css/color-picker-rtl.css
@@ -47,15 +47,13 @@
 	box-shadow: inset 0 1px 0 #fff;
 }

-.wp-color-result:hover,
-.wp-color-result:focus {
+.wp-color-result:hover {
 	background: #fafafa;
 	border-color: #999;
 	color: #222;
 }

-.wp-color-result:hover:after,
-.wp-color-result:focus:after {
+.wp-color-result:hover:after {
 	color: #222;
 	border-color: #aaa;
 	border-right: 1px solid #999;
@@ -75,12 +73,13 @@
 }

 .wp-color-result:focus {
-	-webkit-box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
-	box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
+	border-color: #888;
+	-webkit-box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 );
+	box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 );
+}
+
+.wp-color-result:focus:after {
+	border-color: #888;
 }

 .wp-picker-open + .wp-picker-input-wrap {
--- a/wp-admin/css/color-picker-rtl.min.css
+++ b/wp-admin/css/color-picker-rtl.min.css
@@ -1 +1 @@
-.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 0 6px 6px;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-right:30px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08)}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;left:0;text-align:center;top:0;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#222}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#222;border-color:#aaa;border-right:1px solid #999}.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{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-right:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{-webkit-border-radius:0;border-radius:0;border-color:#dfdfdf;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;text-align:center;line-height:16px;margin:0}.wp-picker-container input[type=text].wp-color-picker:focus::-webkit-input-placeholder{color:transparent}.wp-picker-container input[type=text].wp-color-picker:-moz-placeholder{color:#999}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}
+.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 0 6px 6px;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-right:30px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08)}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;left:0;text-align:center;top:0;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.wp-color-result:hover{background:#fafafa;border-color:#999;color:#222}.wp-color-result:hover:after{color:#222;border-color:#aaa;border-right:1px solid #999}.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:#888;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 2px rgba(0,0,0,.2)}.wp-color-result:focus:after{border-color:#888}.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
@@ -47,15 +47,13 @@
 	box-shadow: inset 0 1px 0 #fff;
 }

-.wp-color-result:hover,
-.wp-color-result:focus {
+.wp-color-result:hover {
 	background: #fafafa;
 	border-color: #999;
 	color: #222;
 }

-.wp-color-result:hover:after,
-.wp-color-result:focus:after {
+.wp-color-result:hover:after {
 	color: #222;
 	border-color: #aaa;
 	border-left: 1px solid #999;
@@ -75,12 +73,13 @@
 }

 .wp-color-result:focus {
-	-webkit-box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
-	box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
+	border-color: #888;
+	-webkit-box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 );
+	box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 );
+}
+
+.wp-color-result:focus:after {
+	border-color: #888;
 }

 .wp-picker-open + .wp-picker-input-wrap {
--- a/wp-admin/css/color-picker.min.css
+++ b/wp-admin/css/color-picker.min.css
@@ -1 +1 @@
-.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 6px 6px 0;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-left:30px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08)}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;right:0;text-align:center;top:0;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#222}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#222;border-color:#aaa;border-left:1px solid #999}.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{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-left:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{-webkit-border-radius:0;border-radius:0;border-color:#dfdfdf;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;text-align:center;line-height:16px;margin:0}.wp-picker-container input[type=text].wp-color-picker:focus::-webkit-input-placeholder{color:transparent}.wp-picker-container input[type=text].wp-color-picker:-moz-placeholder{color:#999}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}
+.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 6px 6px 0;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-left:30px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08)}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;right:0;text-align:center;top:0;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.wp-color-result:hover{background:#fafafa;border-color:#999;color:#222}.wp-color-result:hover:after{color:#222;border-color:#aaa;border-left:1px solid #999}.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:#888;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 2px rgba(0,0,0,.2)}.wp-color-result:focus:after{border-color:#888}.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
@@ -395,14 +395,12 @@ ul#adminmenu > li.current > a.current:after {
 }

 .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 {
+.wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
 	border-bottom-color: $highlight-color;
 }


-/* Media */
+/* Media Uploader */

 .media-item .bar,
 .media-progress-bar div {
@@ -410,9 +408,7 @@ ul#adminmenu > li.current > a.current:after {
 }

 .details.attachment {
-	box-shadow:
-		inset 0 0 0 3px #fff,
-		inset 0 0 0 7px $highlight-color;
+	box-shadow: 0 0 0 1px #fff, 0 0 0 5px $highlight-color;
 }

 .attachment.details .check {
@@ -420,15 +416,6 @@ ul#adminmenu > li.current > a.current:after {
 	box-shadow: 0 0 0 1px #fff, 0 0 0 2px $highlight-color;
 }

-.media-selection .attachment.selection.details .thumbnail {
-	-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;
-}
-

 /* Themes */

@@ -441,28 +428,28 @@ ul#adminmenu > li.current > a.current:after {
 	color: $highlight-color;
 }

+.theme-overlay .theme-header .close:hover,
+.theme-overlay .theme-header .right:hover,
+.theme-overlay .theme-header .left:hover {
+	background: $highlight-color;
+}
+
 .theme-section.current,
 .theme-filter.current {
 	border-bottom-color: $menu-background;
 }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters,
+body.more-filters-opened .more-filters:before {
 	color: $menu-text;
 	background-color: $menu-background;
 }

-body.more-filters-opened .more-filters:before {
-	color: $menu-text;
-}
-
 body.more-filters-opened .more-filters:hover,
-body.more-filters-opened .more-filters:focus {
-	background-color: $menu-highlight-background;
-	color: $menu-highlight-text;
-}
-
+body.more-filters-opened .more-filters:focus,
 body.more-filters-opened .more-filters:hover:before,
 body.more-filters-opened .more-filters:focus:before {
+	background-color: $menu-highlight-background;
 	color: $menu-highlight-text;
 }

@@ -485,6 +472,7 @@ body.more-filters-opened .more-filters:focus:before {
 	color: $menu-highlight-text;
 }

+
 /* jQuery UI Slider */

 .wp-slider .ui-slider-handle,
--- a/wp-admin/css/colors/_mixins.scss
+++ b/wp-admin/css/colors/_mixins.scss
@@ -13,22 +13,14 @@
 		background: darken( $button-color, 5% );
 		border-color: darken( $button-color, 15% );
 		color: $text-color;
-		box-shadow: inset 0 1px 0 lighten( $button-color, 10% );
-	}
-
-	&:focus {
-		box-shadow: inset 0 1px 0 lighten( $button-color, 10% ),
-		            0 0 0 1px #5b9dd9,
-		            0 0 2px 1px rgba( 30, 140, 190, .8 );
+		box-shadow: inset 0 1px 0 lighten( $button-color, 10% ), 0 1px 0 rgba(0,0,0,.15);
 	}

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

 	&[disabled],
--- a/wp-admin/css/colors/blue/colors-rtl.css
+++ b/wp-admin/css/colors/blue/colors-rtl.css
@@ -35,20 +35,17 @@ input[type=radio]:checked:before {
    background: #dd9f32;
    border-color: #bd831f;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #e8be74;
-    box-shadow: inset 0 1px 0 #e8be74; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #e8be74, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #e8be74, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #e8be74, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #e8be74, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
    background: #d39323;
    border-color: #bd831f;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    background: #db9825 !important;
    border-color: #bd831f !important;
    text-shadow: none !important; }
 .wp-core-ui .wp-ui-primary {
@@ -194,7 +191,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
  background: #4796b3; }

 #wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu {
-  background: #74b6ce; }
+  background: #74b7ce; }

 #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: #e2ecf1; }
@@ -214,7 +211,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
  color: #fff;
-  background: #6eb9d4; }
+  background: #6ebad4; }

 #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
@@ -234,8 +231,8 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #6eb9d4;
-  background-color: #6eb9d4; }
+  border-color: #6ebad4;
+  background-color: #6ebad4; }

 #wpadminbar #wp-admin-bar-user-info .display-name {
  color: #fff; }
@@ -249,31 +246,27 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 /* Pointers */
 .wp-pointer .wp-pointer-content h3 {
  background-color: #096484;
-  border-color: #07526c; }
+  border-color: #07536c; }

 .wp-pointer .wp-pointer-content h3:before {
  color: #096484; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #096484; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #096484; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #096484;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #096484; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #096484; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #096484; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #52accc; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #52accc; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #096484;
  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: #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
@@ -35,20 +35,17 @@ input[type=radio]:checked:before {
    background: #dd9f32;
    border-color: #bd831f;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #e8be74;
-    box-shadow: inset 0 1px 0 #e8be74; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #e8be74, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #e8be74, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #e8be74, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #e8be74, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
    background: #d39323;
    border-color: #bd831f;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    background: #db9825 !important;
    border-color: #bd831f !important;
    text-shadow: none !important; }
 .wp-core-ui .wp-ui-primary {
@@ -194,7 +191,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
  background: #4796b3; }

 #wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu {
-  background: #74b6ce; }
+  background: #74b7ce; }

 #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: #e2ecf1; }
@@ -214,7 +211,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
  color: #fff;
-  background: #6eb9d4; }
+  background: #6ebad4; }

 #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
@@ -234,8 +231,8 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #6eb9d4;
-  background-color: #6eb9d4; }
+  border-color: #6ebad4;
+  background-color: #6ebad4; }

 #wpadminbar #wp-admin-bar-user-info .display-name {
  color: #fff; }
@@ -249,31 +246,27 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 /* Pointers */
 .wp-pointer .wp-pointer-content h3 {
  background-color: #096484;
-  border-color: #07526c; }
+  border-color: #07536c; }

 .wp-pointer .wp-pointer-content h3:before {
  color: #096484; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #096484; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #096484; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #096484;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #096484; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #096484; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #096484; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #52accc; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #52accc; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #096484;
  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: #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
@@ -27,7 +27,7 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #c7a589;
-  border-color: #b78b66;
+  border-color: #b78a66;
  color: white;
  -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
  box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }
@@ -35,19 +35,16 @@ input[type=radio]:checked:before {
    background: #bf9878;
    border-color: #ae7d55;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #d7bfac;
-    box-shadow: inset 0 1px 0 #d7bfac; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #d7bfac, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #d7bfac, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #d7bfac, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #d7bfac, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
-    background: #b78b66;
+    background: #b78a66;
    border-color: #ae7d55;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    color: #d1cbc7 !important;
    background: #ba906d !important;
    border-color: #ae7d55 !important;
    text-shadow: none !important; }
@@ -254,26 +251,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer .wp-pointer-content h3:before {
  color: #c7a589; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #c7a589; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #c7a589; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #c7a589;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #c7a589; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #c7a589; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #c7a589; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #59524c; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #59524c; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #c7a589;
  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: #c7a589;
@@ -314,7 +304,7 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
 /* jQuery UI Slider */
 .wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus {
  background: #c7a589;
-  border-color: #b78b66;
+  border-color: #b78a66;
  -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
  box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }

--- 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
@@ -27,7 +27,7 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #c7a589;
-  border-color: #b78b66;
+  border-color: #b78a66;
  color: white;
  -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
  box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }
@@ -35,19 +35,16 @@ input[type=radio]:checked:before {
    background: #bf9878;
    border-color: #ae7d55;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #d7bfac;
-    box-shadow: inset 0 1px 0 #d7bfac; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #d7bfac, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #d7bfac, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #d7bfac, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #d7bfac, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
-    background: #b78b66;
+    background: #b78a66;
    border-color: #ae7d55;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    color: #d1cbc7 !important;
    background: #ba906d !important;
    border-color: #ae7d55 !important;
    text-shadow: none !important; }
@@ -254,26 +251,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer .wp-pointer-content h3:before {
  color: #c7a589; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #c7a589; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #c7a589; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #c7a589;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #c7a589; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #c7a589; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #c7a589; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #59524c; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #59524c; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #c7a589;
  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: #c7a589;
@@ -314,7 +304,7 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
 /* jQuery UI Slider */
 .wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus {
  background: #c7a589;
-  border-color: #b78b66;
+  border-color: #b78a66;
  -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
  box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }

--- a/wp-admin/css/colors/coffee/colors.min.css
+++ b/wp-admin/css/colors/coffee/colors.min.css
--- a/wp-admin/css/colors/ectoplasm/colors-rtl.css
+++ b/wp-admin/css/colors/ectoplasm/colors-rtl.css
@@ -27,25 +27,22 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #a3b745;
-  border-color: #829237;
+  border-color: #839237;
  color: white;
-  -webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  -webkit-box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #93a43e;
    border-color: #727f30;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #b6c669;
-    box-shadow: inset 0 1px 0 #b6c669; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #b6c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #b6c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #b7c669, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #b7c669, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
-    background: #829237;
+    background: #839237;
    border-color: #727f30;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
@@ -214,7 +211,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
  color: #fff;
-  background: #634c84; }
+  background: #624c84; }

 #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
@@ -234,8 +231,8 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #634c84;
-  background-color: #634c84; }
+  border-color: #624c84;
+  background-color: #624c84; }

 #wpadminbar #wp-admin-bar-user-info .display-name {
  color: #fff; }
@@ -254,26 +251,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer .wp-pointer-content h3:before {
  color: #a3b745; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #a3b745; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #a3b745; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #a3b745;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #a3b745; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #a3b745; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #a3b745; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #523f6d; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #523f6d; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #a3b745;
  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: #a3b745;
@@ -314,9 +304,9 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
 /* jQuery UI Slider */
 .wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus {
  background: #a3b745;
-  border-color: #829237;
-  -webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  border-color: #839237;
+  -webkit-box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -27,25 +27,22 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #a3b745;
-  border-color: #829237;
+  border-color: #839237;
  color: white;
-  -webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  -webkit-box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #93a43e;
    border-color: #727f30;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #b6c669;
-    box-shadow: inset 0 1px 0 #b6c669; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #b6c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #b6c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #b7c669, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #b7c669, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
-    background: #829237;
+    background: #839237;
    border-color: #727f30;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
@@ -214,7 +211,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
  color: #fff;
-  background: #634c84; }
+  background: #624c84; }

 #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
@@ -234,8 +231,8 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #634c84;
-  background-color: #634c84; }
+  border-color: #624c84;
+  background-color: #624c84; }

 #wpadminbar #wp-admin-bar-user-info .display-name {
  color: #fff; }
@@ -254,26 +251,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer .wp-pointer-content h3:before {
  color: #a3b745; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #a3b745; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #a3b745; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #a3b745;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #a3b745; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #a3b745; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #a3b745; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #523f6d; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #523f6d; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #a3b745;
  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: #a3b745;
@@ -314,9 +304,9 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
 /* jQuery UI Slider */
 .wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus {
  background: #a3b745;
-  border-color: #829237;
-  -webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  border-color: #839237;
+  -webkit-box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -35,17 +35,14 @@ input[type=radio]:checked:before {
    background: #0490b3;
    border-color: #036881;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #09cafa;
-    box-shadow: inset 0 1px 0 #09cafa; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #09cafa, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #09cafa, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #09cafa, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #09cafa, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
    background: #037c9a;
    border-color: #036881;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
@@ -254,26 +251,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer .wp-pointer-content h3:before {
  color: #04a4cc; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #04a4cc; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #04a4cc; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #04a4cc;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #04a4cc; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #04a4cc; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #04a4cc; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #e5e5e5; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #333;
  background-color: #e5e5e5; }

-body.more-filters-opened .more-filters:before {
-  color: #333; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #888;
  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: #888;
--- 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
@@ -35,17 +35,14 @@ input[type=radio]:checked:before {
    background: #0490b3;
    border-color: #036881;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #09cafa;
-    box-shadow: inset 0 1px 0 #09cafa; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #09cafa, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #09cafa, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #09cafa, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #09cafa, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
    background: #037c9a;
    border-color: #036881;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
@@ -254,26 +251,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer .wp-pointer-content h3:before {
  color: #04a4cc; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #04a4cc; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #04a4cc; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #04a4cc;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #04a4cc; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #04a4cc; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #04a4cc; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #e5e5e5; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #333;
  background-color: #e5e5e5; }

-body.more-filters-opened .more-filters:before {
-  color: #333; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #888;
  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: #888;
--- 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
@@ -27,29 +27,26 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #e14d43;
-  border-color: #d02c21;
+  border-color: #d02a21;
  color: white;
-  -webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  -webkit-box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-    background: #dd382d;
-    border-color: #ba281e;
+    background: #dd362d;
+    border-color: #ba251e;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #e8776f;
-    box-shadow: inset 0 1px 0 #e8776f; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #e8776f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #e8776f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #e8756f, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #e8756f, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
-    background: #d02c21;
-    border-color: #ba281e;
+    background: #d02a21;
+    border-color: #ba251e;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    color: #d1c7c7 !important;
+    background: #d92c23 !important;
+    border-color: #ba251e !important;
    text-shadow: none !important; }
 .wp-core-ui .wp-ui-primary {
  color: #fff;
@@ -249,31 +246,27 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 /* Pointers */
 .wp-pointer .wp-pointer-content h3 {
  background-color: #e14d43;
-  border-color: #dd382d; }
+  border-color: #dd362d; }

 .wp-pointer .wp-pointer-content h3:before {
  color: #e14d43; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #e14d43; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #e14d43; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #e14d43;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #e14d43; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #e14d43; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #e14d43; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #363b3f; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #363b3f; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #e14d43;
  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: #e14d43;
@@ -314,9 +304,9 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
 /* jQuery UI Slider */
 .wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus {
  background: #e14d43;
-  border-color: #d02c21;
-  -webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  border-color: #d02a21;
+  -webkit-box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -27,29 +27,26 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #e14d43;
-  border-color: #d02c21;
+  border-color: #d02a21;
  color: white;
-  -webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  -webkit-box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-    background: #dd382d;
-    border-color: #ba281e;
+    background: #dd362d;
+    border-color: #ba251e;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #e8776f;
-    box-shadow: inset 0 1px 0 #e8776f; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #e8776f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #e8776f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #e8756f, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #e8756f, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
-    background: #d02c21;
-    border-color: #ba281e;
+    background: #d02a21;
+    border-color: #ba251e;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    color: #d1c7c7 !important;
+    background: #d92c23 !important;
+    border-color: #ba251e !important;
    text-shadow: none !important; }
 .wp-core-ui .wp-ui-primary {
  color: #fff;
@@ -249,31 +246,27 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 /* Pointers */
 .wp-pointer .wp-pointer-content h3 {
  background-color: #e14d43;
-  border-color: #dd382d; }
+  border-color: #dd362d; }

 .wp-pointer .wp-pointer-content h3:before {
  color: #e14d43; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #e14d43; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #e14d43; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #e14d43;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #e14d43; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #e14d43; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #e14d43; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #363b3f; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #363b3f; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #e14d43;
  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: #e14d43;
@@ -314,9 +304,9 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
 /* jQuery UI Slider */
 .wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus {
  background: #e14d43;
-  border-color: #d02c21;
-  -webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  border-color: #d02a21;
+  -webkit-box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- a/wp-admin/css/colors/midnight/colors.min.css
+++ b/wp-admin/css/colors/midnight/colors.min.css
--- a/wp-admin/css/colors/ocean/colors-rtl.css
+++ b/wp-admin/css/colors/ocean/colors-rtl.css
@@ -35,20 +35,17 @@ input[type=radio]:checked:before {
    background: #8faf91;
    border-color: #719a74;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #bccfbd;
-    box-shadow: inset 0 1px 0 #bccfbd; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #bccfbd, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #bccfbd, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #bccfbd, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #bccfbd, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
    background: #80a583;
    border-color: #719a74;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    background: #86a988 !important;
    border-color: #719a74 !important;
    text-shadow: none !important; }
 .wp-core-ui .wp-ui-primary {
@@ -194,7 +191,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
  background: #627c83; }

 #wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu {
-  background: #8f9a9e; }
+  background: #8f9b9e; }

 #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: #d5dddf; }
@@ -214,7 +211,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
  color: #fff;
-  background: #879ea5; }
+  background: #879fa5; }

 #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
@@ -234,8 +231,8 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #879ea5;
-  background-color: #879ea5; }
+  border-color: #879fa5;
+  background-color: #879fa5; }

 #wpadminbar #wp-admin-bar-user-info .display-name {
  color: #fff; }
@@ -254,26 +251,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer .wp-pointer-content h3:before {
  color: #9ebaa0; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #9ebaa0; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #9ebaa0; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #9ebaa0;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #9ebaa0; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #9ebaa0; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #9ebaa0; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #738e96; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #738e96; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #9ebaa0;
  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: #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
@@ -35,20 +35,17 @@ input[type=radio]:checked:before {
    background: #8faf91;
    border-color: #719a74;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #bccfbd;
-    box-shadow: inset 0 1px 0 #bccfbd; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #bccfbd, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #bccfbd, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #bccfbd, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #bccfbd, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
    background: #80a583;
    border-color: #719a74;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    background: #86a988 !important;
    border-color: #719a74 !important;
    text-shadow: none !important; }
 .wp-core-ui .wp-ui-primary {
@@ -194,7 +191,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
  background: #627c83; }

 #wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu {
-  background: #8f9a9e; }
+  background: #8f9b9e; }

 #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: #d5dddf; }
@@ -214,7 +211,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
  color: #fff;
-  background: #879ea5; }
+  background: #879fa5; }

 #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
@@ -234,8 +231,8 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #879ea5;
-  background-color: #879ea5; }
+  border-color: #879fa5;
+  background-color: #879fa5; }

 #wpadminbar #wp-admin-bar-user-info .display-name {
  color: #fff; }
@@ -254,26 +251,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer .wp-pointer-content h3:before {
  color: #9ebaa0; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #9ebaa0; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #9ebaa0; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #9ebaa0;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #9ebaa0; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #9ebaa0; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #9ebaa0; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #738e96; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #738e96; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #9ebaa0;
  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: #9ebaa0;
--- a/wp-admin/css/colors/ocean/colors.min.css
+++ b/wp-admin/css/colors/ocean/colors.min.css
--- a/wp-admin/css/colors/sunrise/colors-rtl.css
+++ b/wp-admin/css/colors/sunrise/colors-rtl.css
@@ -27,29 +27,26 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #dd823b;
-  border-color: #c36922;
+  border-color: #c36822;
  color: white;
-  -webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  -webkit-box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-    background: #d97426;
-    border-color: #ad5d1e;
+    background: #d97326;
+    border-color: #ad5c1e;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #e59e66;
-    box-shadow: inset 0 1px 0 #e59e66; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #e59e66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #e59e66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #e59d66, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #e59d66, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
-    background: #c36922;
-    border-color: #ad5d1e;
+    background: #c36822;
+    border-color: #ad5c1e;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    background: #cc6c23 !important;
+    border-color: #ad5c1e !important;
    text-shadow: none !important; }
 .wp-core-ui .wp-ui-primary {
  color: #fff;
@@ -214,7 +211,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
  color: #fff;
-  background: #d66560; }
+  background: #d66460; }

 #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
@@ -234,8 +231,8 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #d66560;
-  background-color: #d66560; }
+  border-color: #d66460;
+  background-color: #d66460; }

 #wpadminbar #wp-admin-bar-user-info .display-name {
  color: #fff; }
@@ -249,31 +246,27 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 /* Pointers */
 .wp-pointer .wp-pointer-content h3 {
  background-color: #dd823b;
-  border-color: #d97426; }
+  border-color: #d97326; }

 .wp-pointer .wp-pointer-content h3:before {
  color: #dd823b; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #dd823b; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #dd823b; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #dd823b;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #dd823b; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #dd823b; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #dd823b; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #cf4944; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #cf4944; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #dd823b;
  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: #dd823b;
@@ -314,9 +304,9 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
 /* jQuery UI Slider */
 .wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus {
  background: #dd823b;
-  border-color: #c36922;
-  -webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  border-color: #c36822;
+  -webkit-box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -27,29 +27,26 @@ input[type=radio]:checked:before {
 /* Core UI */
 .wp-core-ui .button-primary {
  background: #dd823b;
-  border-color: #c36922;
+  border-color: #c36822;
  color: white;
-  -webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  -webkit-box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
-    background: #d97426;
-    border-color: #ad5d1e;
+    background: #d97326;
+    border-color: #ad5c1e;
    color: white;
-    -webkit-box-shadow: inset 0 1px 0 #e59e66;
-    box-shadow: inset 0 1px 0 #e59e66; }
-  .wp-core-ui .button-primary:focus {
-    -webkit-box-shadow: inset 0 1px 0 #e59e66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 1px 0 #e59e66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -webkit-box-shadow: inset 0 1px 0 #e59d66, 0 1px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: inset 0 1px 0 #e59d66, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:active {
-    background: #c36922;
-    border-color: #ad5d1e;
+    background: #c36822;
+    border-color: #ad5c1e;
    color: white;
-    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
+    -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); }
  .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;
+    background: #cc6c23 !important;
+    border-color: #ad5c1e !important;
    text-shadow: none !important; }
 .wp-core-ui .wp-ui-primary {
  color: #fff;
@@ -214,7 +211,7 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
  color: #fff;
-  background: #d66560; }
+  background: #d66460; }

 #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
  color: #fff;
@@ -234,8 +231,8 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre

 /* Admin Bar: my account */
 #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-  border-color: #d66560;
-  background-color: #d66560; }
+  border-color: #d66460;
+  background-color: #d66460; }

 #wpadminbar #wp-admin-bar-user-info .display-name {
  color: #fff; }
@@ -249,31 +246,27 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 /* Pointers */
 .wp-pointer .wp-pointer-content h3 {
  background-color: #dd823b;
-  border-color: #d97426; }
+  border-color: #d97326; }

 .wp-pointer .wp-pointer-content h3:before {
  color: #dd823b; }

-.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 {
+.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #dd823b; }

-/* Media */
+/* Media Uploader */
 .media-item .bar, .media-progress-bar div {
  background-color: #dd823b; }

 .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; }
+  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #dd823b;
+  box-shadow: 0 0 0 1px #fff, 0 0 0 5px #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 {
-  -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 */
 .theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after {
  background: #dd823b; }
@@ -281,23 +274,20 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .theme-browser .theme.add-new-theme:hover span:after {
  color: #dd823b; }

+.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover {
+  background: #dd823b; }
+
 .theme-section.current, .theme-filter.current {
  border-bottom-color: #cf4944; }

-body.more-filters-opened .more-filters {
+body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before {
  color: #fff;
  background-color: #cf4944; }

-body.more-filters-opened .more-filters:before {
-  color: #fff; }
-
-body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before {
  background-color: #dd823b;
  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: #dd823b;
@@ -314,9 +304,9 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
 /* jQuery UI Slider */
 .wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus {
  background: #dd823b;
-  border-color: #c36922;
-  -webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15); }
+  border-color: #c36822;
+  -webkit-box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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.css
+++ b/wp-admin/css/common.css
--- a/wp-admin/css/customize-controls-rtl.css
+++ b/wp-admin/css/customize-controls-rtl.css
@@ -10,10 +10,6 @@ body {
 	font-size: 14px;
 }

-#customize-controls img {
-	max-width: 100%;
-}
-
 #customize-controls .submit {
 	text-align: center;
 }
@@ -36,15 +32,6 @@ body {
 	display: block;
 }

-#customize-header-actions {
-	border-bottom: 1px solid #ddd;
-}
-
-#customize-controls .wp-full-overlay-sidebar-content {
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
 #customize-info {
 	border: none;
 	border-top: 1px solid #ddd;
@@ -58,12 +45,22 @@ body {
 	border-bottom: 1px solid #eeeeee;
 }

+#customize-info.open .accordion-section-title,
+#customize-info .accordion-section-title:hover,
+#customize-info .accordion-section-title:focus {
+	color: #555555;
+}
+
 #customize-info.open .accordion-section-title:after,
 #customize-info .accordion-section-title:hover:after,
 #customize-info .accordion-section-title:focus:after {
 	color: #555555;
 }

+#customize-info.open .accordion-section-title {
+	border-color: transparent;
+}
+
 #customize-info .preview-notice {
 	font-size: 13px;
 	line-height: 24px;
@@ -86,6 +83,11 @@ body {
 	line-height: 20px;
 }

+#customize-theme-controls {
+	-webkit-box-shadow: 0 1px 1px -1px rgba(0, 0, 0, 0.1);
+	box-shadow: 0 1px 1px -1px rgba(0, 0, 0, 0.1);
+}
+
 #customize-theme-controls .control-section {
 	border: none;
 }
@@ -98,17 +100,14 @@ body {

 #customize-theme-controls .accordion-section-content {
 	color: #555555;
-	background: #fff;
+	background: white;
 }

-#customize-info.open .accordion-section-title,
-#customize-info .accordion-section-title:hover,
-#customize-info .accordion-section-title:focus,
-#customize-theme-controls .control-section:hover > .accordion-section-title,
+#customize-theme-controls .control-section:hover .accordion-section-title,
 #customize-theme-controls .control-section .accordion-section-title:hover,
 #customize-theme-controls .control-section.open .accordion-section-title,
 #customize-theme-controls .control-section .accordion-section-title:focus {
-	color: #222;
+	color: #555555;
 	background: #f5f5f5;
 }

@@ -119,14 +118,13 @@ body {
 	background: #f5f5f5;
 }

-#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 {
-	color: #555;
+#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 {
+	color: #555555;
 }

-#customize-info.open,
 #customize-theme-controls .control-section.open {
 	border-bottom: 1px solid #eeeeee;
 }
@@ -136,7 +134,7 @@ body {
 }

 #customize-theme-controls .control-section:last-of-type.open,
-#customize-theme-controls .control-section:last-of-type > .accordion-section-title {
+#customize-theme-controls .control-section:last-of-type .accordion-section-title {
 	border-bottom-color: #ddd;
 }

@@ -145,192 +143,6 @@ body {
 	margin: 0;
 }

-.control-section.control-panel > .accordion-section-title {
-	padding-left: 54px;
-}
-
-.control-section.control-panel > .accordion-section-title:after {
-	content: "\f345";
-	background: #f5f5f5;
-	color: #555;
-	width: 38px;
-	height: 100%;
-	margin: -11px 0 -11px -10px; /* compensate for positioning */
-	line-height: 45px;
-	padding-right: 5px;
-	border-right: 1px solid #eee;
-	z-index: 0;
-}
-
-.rtl .control-section.control-panel > .accordion-section-title:after {
-	content: "\f341";
-}
-
-#customize-theme-controls .control-section.control-panel > h3.accordion-section-title:focus:after,
-#customize-theme-controls .control-section.control-panel > h3.accordion-section-title:hover:after {
-	background: #ddd;
-	color: #000;
-	border: 1px solid #d9d9d9;
-	border-left: none;
-	margin-top: -12px;
-	line-height: 44px;
-	z-index: 1;
-}
-
-.accordion-sub-container.control-panel-content {
-	display: none;
-	position: absolute;
-	right: 300px;
-	top: 0;
-	width: 300px;
-	border-top: 1px solid #ddd;
-	-webkit-transition: right ease-in-out .18s;
-	transition: right ease-in-out .18s;
-}
-
-.accordion-sub-container.control-panel-content.animating {
-	display: block;
-}
-
-.current-panel .accordion-sub-container.control-panel-content {
-	width: 100%;
-}
-
-.customize-controls-close {
-	display: block;
-	position: absolute;
-	top: 0;
-	right: 0;
-	width: 45px;
-	height: 45px;
-	padding-left: 2px;
-	background: #eee;
-	border-left: 1px solid #ddd;
-	color: #444;
-	cursor: pointer;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-	transition: color .1s ease-in-out, background .1s ease-in-out;
-}
-
-.control-panel-back {
-	display: block;
-	position: fixed;
-	top: 0;
-	z-index: 99;
-	right: -48px;
-	width: 45px;
-	height: 45px;
-	padding-left: 2px;
-	background: #eee;
-	border-left: 1px solid #ddd;
-	cursor: pointer;
-	-webkit-transition: right .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
-	transition: right .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
-}
-
-.collapsed .control-panel-back {
-	display: none;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.control-panel-back:focus,
-.control-panel-back:hover {
-	background: #ddd;
-	border-color: #ccc;
-	color: #000;
-	outline: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-
-.customize-controls-close:before {
-	font: normal 22px/1 dashicons;
-	content: "\f335";
-	position: relative;
-	top: 7px;
-	right: 13px;
-}
-
-.control-panel-back:before {
-	font: normal 20px/1 dashicons;
-	content: "\f341";
-	position: relative;
-	top: 7px;
-	right: 13px;
-}
-
-.rtl .control-panel-back:before {
-	content: "\f345";
-}
-
-.in-sub-panel .control-panel-back {
-	right: 0;
-}
-
-.current-panel > .accordion-section-title {
-	height: 22px;
-}
-
-.wp-full-overlay-sidebar .wp-full-overlay-header {
-	-webkit-transition: padding ease-in-out .18s;
-	transition: padding ease-in-out .18s;
-}
-
-.in-sub-panel .wp-full-overlay-sidebar .wp-full-overlay-header {
-	padding-right: 62px;
-}
-
-#customize-info,
-#customize-theme-controls > ul > .accordion-section {
-	position: relative;
-	right: 0;
-	-webkit-transition: right ease-in-out .18s;
-	transition: right ease-in-out .18s;
-}
-
-.in-sub-panel #customize-info,
-.in-sub-panel #customize-theme-controls > ul > .accordion-section {
-	right: -300px;
-	width: 300px;
-}
-
-.in-sub-panel #customize-theme-controls .accordion-section.current-panel {
-	width: 100%;
-}
-
-#customize-theme-controls .control-section.current-panel {
-	padding: 0;
-}
-
-#customize-theme-controls .control-section > h3.accordion-section-title {
-	position: relative;
-	right: 0;
-}
-
-#customize-theme-controls .control-section.current-panel > h3.accordion-section-title {
-	right: -300px;
-	-webkit-transition: right ease-in-out .18s;
-	transition: right ease-in-out .18s;
-}
-
-.control-section.control-panel .accordion-section-title .panel-title {
-	font-size: 20px;
-	font-weight: 200;
-	line-height: 24px;
-	display: block;
-	border: none;
-}
-
-.control-section.control-panel .preview-notice {
-	font-size: 13px;
-	line-height: 24px;
-}
-
-p.customize-section-description {
-	font-style: normal;
-}
-
 .customize-control {
 	width: 100%;
 	float: right;
@@ -339,28 +151,18 @@ p.customize-section-description {
 }

 .customize-control select,
+.customize-control input[type="text"],
 .customize-control input[type="radio"],
 .customize-control input[type="checkbox"] {
 	line-height: 28px;
 }

-.customize-control input[type="text"],
-.customize-control input[type="password"],
-.customize-control input[type="email"],
-.customize-control input[type="number"],
-.customize-control input[type="search"],
-.customize-control input[type="tel"],
-.customize-control input[type="url"] {
+.customize-control input[type="text"] {
 	width: 98%;
 	line-height: 18px;
 	margin: 0;
 }

-.customize-control-textarea textarea {
-	width: 100%;
-	resize: vertical;
-}
-
 .customize-control select {
 	min-width: 50%;
 	max-width: 100%;
@@ -380,13 +182,6 @@ p.customize-section-description {
 	margin-bottom: 5px;
 }

-.customize-control-description {
-	display: block;
-	font-style: italic;
-	line-height: 18px;
-	margin-bottom: 5px;
-}
-
 .customize-control-color .color-picker,
 .customize-control-checkbox label,
 .customize-control-upload div {
@@ -406,10 +201,6 @@ p.customize-section-description {
 	line-height: 22px;
 }

-.customize-control-radio .customize-control-title + .customize-control-description {
-	margin-top: 7px;
-}
-
 .customize-control-radio label {
 	line-height: 32px;
 }
@@ -418,38 +209,6 @@ p.customize-section-description {
 	margin-left: 5px;
 }

-.customize-control .attachment-thumb.type-icon {
-	float: right;
-	margin: 10px;
-	width: auto;
-}
-
-.customize-control .attachment-title {
-	font-weight: bold;
-	margin: 0;
-	padding: 5px 10px;
-}
-
-.customize-control .attachment-meta {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	margin: 0;
-	padding: 5px 10px 0;
-}
-
-.customize-control .attachment-meta-title {
-	padding-top: 7px;
-}
-
-.customize-control .thumbnail-image {
-	line-height: 0;
-}
-
-.customize-control .thumbnail-image img {
-	cursor: pointer;
-}
-
 #customize-preview iframe {
 	width: 100%;
 	height: 100%;
@@ -465,8 +224,8 @@ p.customize-section-description {
 	border: none !important;
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
-	-webkit-border-radius: 0 !important;
-	border-radius: 0 !important;
+	-webkit-border-radius: !important 0;
+	border-radius: !important 0;
 }


@@ -561,6 +320,129 @@ p.customize-section-description {
 	border-color: rgba(0, 0, 0, 0.25);
 }

+/*
+ * Image Picker
+ */
+.customize-control-image .library,
+.customize-control-image .actions {
+	display: none;
+	float: right;
+	width: 100%;
+}
+
+.customize-control-image.open .library,
+.customize-control-image.open .actions {
+	display: block;
+}
+
+.accordion-section .customize-control-image .dropdown-content {
+	height: auto;
+	min-height: 24px;
+	min-width: 40px;
+	padding: 0;
+}
+
+.accordion-section .customize-control-image .dropdown-status {
+	padding: 4px 5px;
+}
+
+.accordion-section .customize-control-image .preview-thumbnail img {
+	display: block;
+	width: 100%;
+	max-width: 122px;
+	max-height: 98px;
+	margin: 0 auto;
+}
+
+.accordion-section .customize-control-image .actions {
+	text-align: left;
+}
+
+.accordion-section .customize-control-image .library ul {
+	border-bottom: 1px solid #ddd;
+	float: right;
+	width: 100%;
+	margin: 10px 0 0;
+}
+
+.accordion-section .customize-control-image .library li {
+	color: #ccc;
+	float: right;
+	padding: 3px 15px;
+	margin: 0;
+	border: 1px solid transparent;
+}
+
+.accordion-section .customize-control-image .library li.library-selected {
+	margin-bottom: -1px;
+	padding-bottom: 4px;
+	color: #666666;
+	border-color: #ddd;
+	border-bottom-color: #fff;
+}
+
+.accordion-section .customize-control-image .library .thumbnail {
+	display: block;
+	width: 100%;
+}
+
+.accordion-section .customize-control-image .library .thumbnail img {
+	display: block;
+	max-width: 90%;
+	max-height: 80px;
+	margin: 5px auto;
+	padding: 2px;
+	background: #666666;
+}
+
+.accordion-section .customize-control-image .library .thumbnail:hover img {
+	background-color: #2ea2cc;
+}
+
+.accordion-section .customize-control-image .library-content {
+	display: none;
+	width: 100%;
+	float: right;
+	padding: 10px 0;
+}
+
+.accordion-section .customize-control-image .library-content.library-selected {
+	display: block;
+}
+
+.accordion-section .customize-control-upload .upload-fallback,
+.accordion-section .customize-control-image .upload-fallback {
+	display: none;
+}
+
+.accordion-section .customize-control-upload .upload-dropzone,
+.accordion-section .customize-control-image .upload-dropzone {
+	display: none;
+	padding: 15px 10px;
+	border: 3px dashed #dfdfdf;
+	margin: 5px auto;
+	text-align: center;
+	position: relative;
+	cursor: default;
+}
+
+.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop,
+.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop {
+	display: block;
+	-webkit-transition: border-color 0.1s;
+	transition: border-color 0.1s;
+}
+
+.accordion-section .customize-control-upload .library ul li,
+.accordion-section .customize-control-image .library ul li {
+	cursor: pointer;
+}
+
+.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over,
+.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over {
+	border-color: #83b4d8;
+}
+
 /**
 * iOS can't scroll iframes,
 * instead it expands the iframe size to match the size of the content
@@ -579,19 +461,16 @@ p.customize-section-description {

 /** Header control **/

-.customize-control-upload .current,
-.customize-control-image .current,
-.customize-control-background .current,
-.customize-control-header .current {
+#customize-control-header_image .current {
 	margin-bottom: 8px;
 }

-.customize-control-header .uploaded {
+#customize-control-header_image .uploaded {
 	margin-bottom: 18px;
 }

-.customize-control-header .uploaded button:not(.random),
-.customize-control-header .default button:not(.random) {
+#customize-control-header_image .uploaded button:not(.random),
+#customize-control-header_image .default button:not(.random) {
 	width: 100%;
 	padding: 0;
 	margin: 0;
@@ -601,30 +480,21 @@ p.customize-section-description {
 	cursor: pointer;
 }

-.customize-control-header button img {
+#customize-control-header_image button img {
 	display: block;
 }

-.customize-control-upload .remove-button,
-.customize-control-upload .default-button,
-.customize-control-upload .upload-button,
-.customize-control-image .remove-button,
-.customize-control-image .default-button,
-.customize-control-image .upload-button,
-.customize-control-background .remove-button,
-.customize-control-background .default-button,
-.customize-control-background .upload-button,
-.customize-control-header button.new,
-.customize-control-header button.remove {
+#customize-control-header_image button.new,
+#customize-control-header_image button.remove {
 	white-space: normal;
 	width: 48%;
 	height: auto;
 }

-.customize-control-upload .current .container,
-.customize-control-image .current .container,
-.customize-control-background .current .container,
-.customize-control-header .current .container {
+
+/* Header control: current image container */
+
+#customize-control-header_image .current .container {
 	overflow: hidden;
 	-webkit-border-radius: 2px;
 	border: 1px solid #eee;
@@ -632,26 +502,14 @@ p.customize-section-description {
 	border-radius: 2px;
 }

-.customize-control-upload .current .container,
-.customize-control-background .current .container,
-.customize-control-image .current .container {
-	min-height: 40px;
-}
-
-.customize-control-upload .placeholder,
-.customize-control-image .placeholder,
-.customize-control-background .placeholder,
-.customize-control-header .placeholder {
+#customize-control-header_image .placeholder {
 	width: 100%;
 	position: relative;
 	text-align: center;
 	cursor: default;
 }

-.customize-control-upload .inner,
-.customize-control-image .inner,
-.customize-control-background .inner,
-.customize-control-header .inner {
+#customize-control-header_image .inner {
 	display: none;
 	position: absolute;
 	width: 100%;
@@ -661,42 +519,31 @@ p.customize-section-description {
 	overflow: hidden;
 }

-.customize-control-upload .inner,
-.customize-control-background .inner,
-.customize-control-image .inner {
-	display: block;
-	min-height: 40px;
-}
-
-.customize-control-upload .inner,
-.customize-control-image .inner,
-.customize-control-background .inner,
-.customize-control-header .inner,
-.customize-control-header .inner .dashicons {
+#customize-control-header_image .inner,
+#customize-control-header_image .inner .dashicons {
 	line-height: 20px;
 	top: 10px;
 }
-
-.customize-control-header .list .inner,
-.customize-control-header .list .inner .dashicons {
+#customize-control-header_image .list .inner,
+#customize-control-header_image .list .inner .dashicons {
 	top: 9px;
 }

-.customize-control-header .header-view {
+#customize-control-header_image .header-view {
 	position: relative;
 	width: 100%;
 	margin-bottom: 5px;
 }

-.customize-control-header .header-view:last-child {
+#customize-control-header_image .header-view:last-child {
 	margin-bottom: 0px;
 }

 /* Convoluted, but 'outline' support isn't good enough yet */
-.customize-control-header .header-view:after {
+#customize-control-header_image .header-view:after {
 	border: 0;
 }
-.customize-control-header .header-view.selected:after {
+#customize-control-header_image .header-view.selected:after {
 	content: '';
 	position: absolute;
 	height: auto;
@@ -705,13 +552,13 @@ p.customize-section-description {
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
 }
-.customize-control-header .header-view.button.selected {
+#customize-control-header_image .header-view.button.selected {
 	border: 0;
 }

 /* Header control: overlay "close" button */

-.customize-control-header .uploaded .header-view .close {
+#customize-control-header_image .uploaded .header-view .close {
 	font-size: 2em;
 	color: grey;
 	position: absolute;
@@ -724,7 +571,7 @@ p.customize-section-description {
 	cursor: pointer;
 }

-.customize-control-header .uploaded .header-view .close:hover {
+#customize-control-header_image .uploaded .header-view .close:hover {
 color: black;
 text-shadow:
    -1px -1px 0 #fff,
@@ -733,32 +580,32 @@ p.customize-section-description {
    1px 1px 0 #fff;
 }

-.customize-control-header .header-view:hover .close {
+#customize-control-header_image .header-view:hover .close {
 	visibility: visible;
 }

 /* Header control: randomiz(s)er */

-.customize-control-header .random.placeholder {
+#customize-control-header_image .random.placeholder {
 	cursor: pointer;
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
 	height: 40px;
 }

-.customize-control-header button.random {
+#customize-control-header_image button.random {
 	width: 100%;
 	height: auto;
 	min-height: 40px;
 	white-space: normal;
 }

-.customize-control-header button.random .dice {
+#customize-control-header_image button.random .dice {
 	margin-top: 4px;
 }

-.customize-control-header .placeholder:hover .dice,
-.customize-control-header .header-view:hover > button.random .dice {
+#customize-control-header_image .placeholder:hover .dice,
+#customize-control-header_image .header-view:hover > button.random .dice {
 	-webkit-animation: dice-color-change 3s infinite;
 	-ms-animation: dice-color-change 3s infinite;
 	animation: dice-color-change 3s infinite;
@@ -785,47 +632,34 @@ p.customize-section-description {
 	100% { color: #d4b146; }
 }

-.customize-control-upload .actions,
-.customize-control-image .actions,
-.customize-control-background .actions,
-.customize-control-header .actions {
+/* Header control: actions and choices */
+
+#customize-control-header_image .actions {
 	margin-bottom: 32px;
 }

-.customize-control-header .choice {
+#customize-control-header_image .choice {
 	position: relative;
 	display: block;
 	margin-bottom: 9px;
 }

-.customize-control-header .uploaded div:last-child > .choice {
+#customize-control-header_image .uploaded div:last-child > .choice {
 	margin-bottom: 0;
 }

-.customize-control-upload img,
-.customize-control-image img,
-.customize-control-background img,
-.customize-control-header img {
+#customize-control-header_image img {
 	width: 100%;
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
 }

-.customize-control-upload .remove-button,
-.customize-control-upload .default-button,
-.customize-control-image .remove-button,
-.customize-control-image .default-button,
-.customize-control-background .remove-button,
-.customize-control-background .default-button,
-.customize-control-header .remove {
+#customize-control-header_image .remove {
 	float: right;
 	margin-left: 3px;
 }

-.customize-control-upload .upload-button,
-.customize-control-image .upload-button,
-.customize-control-background .upload-button,
-.customize-control-header .new {
+#customize-control-header_image .new {
 	float: left;
 }

--- 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
@@ -10,10 +10,6 @@ body {
 	font-size: 14px;
 }

-#customize-controls img {
-	max-width: 100%;
-}
-
 #customize-controls .submit {
 	text-align: center;
 }
@@ -36,15 +32,6 @@ body {
 	display: block;
 }

-#customize-header-actions {
-	border-bottom: 1px solid #ddd;
-}
-
-#customize-controls .wp-full-overlay-sidebar-content {
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
 #customize-info {
 	border: none;
 	border-top: 1px solid #ddd;
@@ -58,12 +45,22 @@ body {
 	border-bottom: 1px solid #eeeeee;
 }

+#customize-info.open .accordion-section-title,
+#customize-info .accordion-section-title:hover,
+#customize-info .accordion-section-title:focus {
+	color: #555555;
+}
+
 #customize-info.open .accordion-section-title:after,
 #customize-info .accordion-section-title:hover:after,
 #customize-info .accordion-section-title:focus:after {
 	color: #555555;
 }

+#customize-info.open .accordion-section-title {
+	border-color: transparent;
+}
+
 #customize-info .preview-notice {
 	font-size: 13px;
 	line-height: 24px;
@@ -86,6 +83,11 @@ body {
 	line-height: 20px;
 }

+#customize-theme-controls {
+	-webkit-box-shadow: 0 1px 1px -1px rgba(0, 0, 0, 0.1);
+	box-shadow: 0 1px 1px -1px rgba(0, 0, 0, 0.1);
+}
+
 #customize-theme-controls .control-section {
 	border: none;
 }
@@ -98,17 +100,14 @@ body {

 #customize-theme-controls .accordion-section-content {
 	color: #555555;
-	background: #fff;
+	background: white;
 }

-#customize-info.open .accordion-section-title,
-#customize-info .accordion-section-title:hover,
-#customize-info .accordion-section-title:focus,
-#customize-theme-controls .control-section:hover > .accordion-section-title,
+#customize-theme-controls .control-section:hover .accordion-section-title,
 #customize-theme-controls .control-section .accordion-section-title:hover,
 #customize-theme-controls .control-section.open .accordion-section-title,
 #customize-theme-controls .control-section .accordion-section-title:focus {
-	color: #222;
+	color: #555555;
 	background: #f5f5f5;
 }

@@ -119,14 +118,13 @@ body {
 	background: #f5f5f5;
 }

-#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 {
-	color: #555;
+#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 {
+	color: #555555;
 }

-#customize-info.open,
 #customize-theme-controls .control-section.open {
 	border-bottom: 1px solid #eeeeee;
 }
@@ -136,7 +134,7 @@ body {
 }

 #customize-theme-controls .control-section:last-of-type.open,
-#customize-theme-controls .control-section:last-of-type > .accordion-section-title {
+#customize-theme-controls .control-section:last-of-type .accordion-section-title {
 	border-bottom-color: #ddd;
 }

@@ -145,192 +143,6 @@ body {
 	margin: 0;
 }

-.control-section.control-panel > .accordion-section-title {
-	padding-right: 54px;
-}
-
-.control-section.control-panel > .accordion-section-title:after {
-	content: "\f345";
-	background: #f5f5f5;
-	color: #555;
-	width: 38px;
-	height: 100%;
-	margin: -11px -10px -11px 0; /* compensate for positioning */
-	line-height: 45px;
-	padding-left: 5px;
-	border-left: 1px solid #eee;
-	z-index: 0;
-}
-
-.rtl .control-section.control-panel > .accordion-section-title:after {
-	content: "\f341";
-}
-
-#customize-theme-controls .control-section.control-panel > h3.accordion-section-title:focus:after,
-#customize-theme-controls .control-section.control-panel > h3.accordion-section-title:hover:after {
-	background: #ddd;
-	color: #000;
-	border: 1px solid #d9d9d9;
-	border-right: none;
-	margin-top: -12px;
-	line-height: 44px;
-	z-index: 1;
-}
-
-.accordion-sub-container.control-panel-content {
-	display: none;
-	position: absolute;
-	left: 300px;
-	top: 0;
-	width: 300px;
-	border-top: 1px solid #ddd;
-	-webkit-transition: left ease-in-out .18s;
-	transition: left ease-in-out .18s;
-}
-
-.accordion-sub-container.control-panel-content.animating {
-	display: block;
-}
-
-.current-panel .accordion-sub-container.control-panel-content {
-	width: 100%;
-}
-
-.customize-controls-close {
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 45px;
-	height: 45px;
-	padding-right: 2px;
-	background: #eee;
-	border-right: 1px solid #ddd;
-	color: #444;
-	cursor: pointer;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-	transition: color .1s ease-in-out, background .1s ease-in-out;
-}
-
-.control-panel-back {
-	display: block;
-	position: fixed;
-	top: 0;
-	z-index: 99;
-	left: -48px;
-	width: 45px;
-	height: 45px;
-	padding-right: 2px;
-	background: #eee;
-	border-right: 1px solid #ddd;
-	cursor: pointer;
-	-webkit-transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
-	transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
-}
-
-.collapsed .control-panel-back {
-	display: none;
-}
-
-.customize-controls-close:focus,
-.customize-controls-close:hover,
-.control-panel-back:focus,
-.control-panel-back:hover {
-	background: #ddd;
-	border-color: #ccc;
-	color: #000;
-	outline: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-
-.customize-controls-close:before {
-	font: normal 22px/1 dashicons;
-	content: "\f335";
-	position: relative;
-	top: 7px;
-	left: 13px;
-}
-
-.control-panel-back:before {
-	font: normal 20px/1 dashicons;
-	content: "\f341";
-	position: relative;
-	top: 7px;
-	left: 13px;
-}
-
-.rtl .control-panel-back:before {
-	content: "\f345";
-}
-
-.in-sub-panel .control-panel-back {
-	left: 0;
-}
-
-.current-panel > .accordion-section-title {
-	height: 22px;
-}
-
-.wp-full-overlay-sidebar .wp-full-overlay-header {
-	-webkit-transition: padding ease-in-out .18s;
-	transition: padding ease-in-out .18s;
-}
-
-.in-sub-panel .wp-full-overlay-sidebar .wp-full-overlay-header {
-	padding-left: 62px;
-}
-
-#customize-info,
-#customize-theme-controls > ul > .accordion-section {
-	position: relative;
-	left: 0;
-	-webkit-transition: left ease-in-out .18s;
-	transition: left ease-in-out .18s;
-}
-
-.in-sub-panel #customize-info,
-.in-sub-panel #customize-theme-controls > ul > .accordion-section {
-	left: -300px;
-	width: 300px;
-}
-
-.in-sub-panel #customize-theme-controls .accordion-section.current-panel {
-	width: 100%;
-}
-
-#customize-theme-controls .control-section.current-panel {
-	padding: 0;
-}
-
-#customize-theme-controls .control-section > h3.accordion-section-title {
-	position: relative;
-	left: 0;
-}
-
-#customize-theme-controls .control-section.current-panel > h3.accordion-section-title {
-	left: -300px;
-	-webkit-transition: left ease-in-out .18s;
-	transition: left ease-in-out .18s;
-}
-
-.control-section.control-panel .accordion-section-title .panel-title {
-	font-size: 20px;
-	font-weight: 200;
-	line-height: 24px;
-	display: block;
-	border: none;
-}
-
-.control-section.control-panel .preview-notice {
-	font-size: 13px;
-	line-height: 24px;
-}
-
-p.customize-section-description {
-	font-style: normal;
-}
-
 .customize-control {
 	width: 100%;
 	float: left;
@@ -339,28 +151,18 @@ p.customize-section-description {
 }

 .customize-control select,
+.customize-control input[type="text"],
 .customize-control input[type="radio"],
 .customize-control input[type="checkbox"] {
 	line-height: 28px;
 }

-.customize-control input[type="text"],
-.customize-control input[type="password"],
-.customize-control input[type="email"],
-.customize-control input[type="number"],
-.customize-control input[type="search"],
-.customize-control input[type="tel"],
-.customize-control input[type="url"] {
+.customize-control input[type="text"] {
 	width: 98%;
 	line-height: 18px;
 	margin: 0;
 }

-.customize-control-textarea textarea {
-	width: 100%;
-	resize: vertical;
-}
-
 .customize-control select {
 	min-width: 50%;
 	max-width: 100%;
@@ -380,13 +182,6 @@ p.customize-section-description {
 	margin-bottom: 5px;
 }

-.customize-control-description {
-	display: block;
-	font-style: italic;
-	line-height: 18px;
-	margin-bottom: 5px;
-}
-
 .customize-control-color .color-picker,
 .customize-control-checkbox label,
 .customize-control-upload div {
@@ -406,10 +201,6 @@ p.customize-section-description {
 	line-height: 22px;
 }

-.customize-control-radio .customize-control-title + .customize-control-description {
-	margin-top: 7px;
-}
-
 .customize-control-radio label {
 	line-height: 32px;
 }
@@ -418,38 +209,6 @@ p.customize-section-description {
 	margin-right: 5px;
 }

-.customize-control .attachment-thumb.type-icon {
-	float: left;
-	margin: 10px;
-	width: auto;
-}
-
-.customize-control .attachment-title {
-	font-weight: bold;
-	margin: 0;
-	padding: 5px 10px;
-}
-
-.customize-control .attachment-meta {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	margin: 0;
-	padding: 5px 10px 0;
-}
-
-.customize-control .attachment-meta-title {
-	padding-top: 7px;
-}
-
-.customize-control .thumbnail-image {
-	line-height: 0;
-}
-
-.customize-control .thumbnail-image img {
-	cursor: pointer;
-}
-
 #customize-preview iframe {
 	width: 100%;
 	height: 100%;
@@ -561,6 +320,129 @@ p.customize-section-description {
 	border-color: rgba(0, 0, 0, 0.25);
 }

+/*
+ * Image Picker
+ */
+.customize-control-image .library,
+.customize-control-image .actions {
+	display: none;
+	float: left;
+	width: 100%;
+}
+
+.customize-control-image.open .library,
+.customize-control-image.open .actions {
+	display: block;
+}
+
+.accordion-section .customize-control-image .dropdown-content {
+	height: auto;
+	min-height: 24px;
+	min-width: 40px;
+	padding: 0;
+}
+
+.accordion-section .customize-control-image .dropdown-status {
+	padding: 4px 5px;
+}
+
+.accordion-section .customize-control-image .preview-thumbnail img {
+	display: block;
+	width: 100%;
+	max-width: 122px;
+	max-height: 98px;
+	margin: 0 auto;
+}
+
+.accordion-section .customize-control-image .actions {
+	text-align: right;
+}
+
+.accordion-section .customize-control-image .library ul {
+	border-bottom: 1px solid #ddd;
+	float: left;
+	width: 100%;
+	margin: 10px 0 0;
+}
+
+.accordion-section .customize-control-image .library li {
+	color: #ccc;
+	float: left;
+	padding: 3px 15px;
+	margin: 0;
+	border: 1px solid transparent;
+}
+
+.accordion-section .customize-control-image .library li.library-selected {
+	margin-bottom: -1px;
+	padding-bottom: 4px;
+	color: #666666;
+	border-color: #ddd;
+	border-bottom-color: #fff;
+}
+
+.accordion-section .customize-control-image .library .thumbnail {
+	display: block;
+	width: 100%;
+}
+
+.accordion-section .customize-control-image .library .thumbnail img {
+	display: block;
+	max-width: 90%;
+	max-height: 80px;
+	margin: 5px auto;
+	padding: 2px;
+	background: #666666;
+}
+
+.accordion-section .customize-control-image .library .thumbnail:hover img {
+	background-color: #2ea2cc;
+}
+
+.accordion-section .customize-control-image .library-content {
+	display: none;
+	width: 100%;
+	float: left;
+	padding: 10px 0;
+}
+
+.accordion-section .customize-control-image .library-content.library-selected {
+	display: block;
+}
+
+.accordion-section .customize-control-upload .upload-fallback,
+.accordion-section .customize-control-image .upload-fallback {
+	display: none;
+}
+
+.accordion-section .customize-control-upload .upload-dropzone,
+.accordion-section .customize-control-image .upload-dropzone {
+	display: none;
+	padding: 15px 10px;
+	border: 3px dashed #dfdfdf;
+	margin: 5px auto;
+	text-align: center;
+	position: relative;
+	cursor: default;
+}
+
+.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop,
+.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop {
+	display: block;
+	-webkit-transition: border-color 0.1s;
+	transition: border-color 0.1s;
+}
+
+.accordion-section .customize-control-upload .library ul li,
+.accordion-section .customize-control-image .library ul li {
+	cursor: pointer;
+}
+
+.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over,
+.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over {
+	border-color: #83b4d8;
+}
+
 /**
 * iOS can't scroll iframes,
 * instead it expands the iframe size to match the size of the content
@@ -579,19 +461,16 @@ p.customize-section-description {

 /** Header control **/

-.customize-control-upload .current,
-.customize-control-image .current,
-.customize-control-background .current,
-.customize-control-header .current {
+#customize-control-header_image .current {
 	margin-bottom: 8px;
 }

-.customize-control-header .uploaded {
+#customize-control-header_image .uploaded {
 	margin-bottom: 18px;
 }

-.customize-control-header .uploaded button:not(.random),
-.customize-control-header .default button:not(.random) {
+#customize-control-header_image .uploaded button:not(.random),
+#customize-control-header_image .default button:not(.random) {
 	width: 100%;
 	padding: 0;
 	margin: 0;
@@ -601,30 +480,21 @@ p.customize-section-description {
 	cursor: pointer;
 }

-.customize-control-header button img {
+#customize-control-header_image button img {
 	display: block;
 }

-.customize-control-upload .remove-button,
-.customize-control-upload .default-button,
-.customize-control-upload .upload-button,
-.customize-control-image .remove-button,
-.customize-control-image .default-button,
-.customize-control-image .upload-button,
-.customize-control-background .remove-button,
-.customize-control-background .default-button,
-.customize-control-background .upload-button,
-.customize-control-header button.new,
-.customize-control-header button.remove {
+#customize-control-header_image button.new,
+#customize-control-header_image button.remove {
 	white-space: normal;
 	width: 48%;
 	height: auto;
 }

-.customize-control-upload .current .container,
-.customize-control-image .current .container,
-.customize-control-background .current .container,
-.customize-control-header .current .container {
+
+/* Header control: current image container */
+
+#customize-control-header_image .current .container {
 	overflow: hidden;
 	-webkit-border-radius: 2px;
 	border: 1px solid #eee;
@@ -632,26 +502,14 @@ p.customize-section-description {
 	border-radius: 2px;
 }

-.customize-control-upload .current .container,
-.customize-control-background .current .container,
-.customize-control-image .current .container {
-	min-height: 40px;
-}
-
-.customize-control-upload .placeholder,
-.customize-control-image .placeholder,
-.customize-control-background .placeholder,
-.customize-control-header .placeholder {
+#customize-control-header_image .placeholder {
 	width: 100%;
 	position: relative;
 	text-align: center;
 	cursor: default;
 }

-.customize-control-upload .inner,
-.customize-control-image .inner,
-.customize-control-background .inner,
-.customize-control-header .inner {
+#customize-control-header_image .inner {
 	display: none;
 	position: absolute;
 	width: 100%;
@@ -661,42 +519,31 @@ p.customize-section-description {
 	overflow: hidden;
 }

-.customize-control-upload .inner,
-.customize-control-background .inner,
-.customize-control-image .inner {
-	display: block;
-	min-height: 40px;
-}
-
-.customize-control-upload .inner,
-.customize-control-image .inner,
-.customize-control-background .inner,
-.customize-control-header .inner,
-.customize-control-header .inner .dashicons {
+#customize-control-header_image .inner,
+#customize-control-header_image .inner .dashicons {
 	line-height: 20px;
 	top: 10px;
 }
-
-.customize-control-header .list .inner,
-.customize-control-header .list .inner .dashicons {
+#customize-control-header_image .list .inner,
+#customize-control-header_image .list .inner .dashicons {
 	top: 9px;
 }

-.customize-control-header .header-view {
+#customize-control-header_image .header-view {
 	position: relative;
 	width: 100%;
 	margin-bottom: 5px;
 }

-.customize-control-header .header-view:last-child {
+#customize-control-header_image .header-view:last-child {
 	margin-bottom: 0px;
 }

 /* Convoluted, but 'outline' support isn't good enough yet */
-.customize-control-header .header-view:after {
+#customize-control-header_image .header-view:after {
 	border: 0;
 }
-.customize-control-header .header-view.selected:after {
+#customize-control-header_image .header-view.selected:after {
 	content: '';
 	position: absolute;
 	height: auto;
@@ -705,13 +552,13 @@ p.customize-section-description {
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
 }
-.customize-control-header .header-view.button.selected {
+#customize-control-header_image .header-view.button.selected {
 	border: 0;
 }

 /* Header control: overlay "close" button */

-.customize-control-header .uploaded .header-view .close {
+#customize-control-header_image .uploaded .header-view .close {
 	font-size: 2em;
 	color: grey;
 	position: absolute;
@@ -724,7 +571,7 @@ p.customize-section-description {
 	cursor: pointer;
 }

-.customize-control-header .uploaded .header-view .close:hover {
+#customize-control-header_image .uploaded .header-view .close:hover {
 color: black;
 text-shadow:
    -1px -1px 0 #fff,
@@ -733,32 +580,32 @@ p.customize-section-description {
    1px 1px 0 #fff;
 }

-.customize-control-header .header-view:hover .close {
+#customize-control-header_image .header-view:hover .close {
 	visibility: visible;
 }

 /* Header control: randomiz(s)er */

-.customize-control-header .random.placeholder {
+#customize-control-header_image .random.placeholder {
 	cursor: pointer;
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
 	height: 40px;
 }

-.customize-control-header button.random {
+#customize-control-header_image button.random {
 	width: 100%;
 	height: auto;
 	min-height: 40px;
 	white-space: normal;
 }

-.customize-control-header button.random .dice {
+#customize-control-header_image button.random .dice {
 	margin-top: 4px;
 }

-.customize-control-header .placeholder:hover .dice,
-.customize-control-header .header-view:hover > button.random .dice {
+#customize-control-header_image .placeholder:hover .dice,
+#customize-control-header_image .header-view:hover > button.random .dice {
 	-webkit-animation: dice-color-change 3s infinite;
 	-ms-animation: dice-color-change 3s infinite;
 	animation: dice-color-change 3s infinite;
@@ -785,47 +632,34 @@ p.customize-section-description {
 	100% { color: #d4b146; }
 }

-.customize-control-upload .actions,
-.customize-control-image .actions,
-.customize-control-background .actions,
-.customize-control-header .actions {
+/* Header control: actions and choices */
+
+#customize-control-header_image .actions {
 	margin-bottom: 32px;
 }

-.customize-control-header .choice {
+#customize-control-header_image .choice {
 	position: relative;
 	display: block;
 	margin-bottom: 9px;
 }

-.customize-control-header .uploaded div:last-child > .choice {
+#customize-control-header_image .uploaded div:last-child > .choice {
 	margin-bottom: 0;
 }

-.customize-control-upload img,
-.customize-control-image img,
-.customize-control-background img,
-.customize-control-header img {
+#customize-control-header_image img {
 	width: 100%;
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
 }

-.customize-control-upload .remove-button,
-.customize-control-upload .default-button,
-.customize-control-image .remove-button,
-.customize-control-image .default-button,
-.customize-control-background .remove-button,
-.customize-control-background .default-button,
-.customize-control-header .remove {
+#customize-control-header_image .remove {
 	float: left;
 	margin-right: 3px;
 }

-.customize-control-upload .upload-button,
-.customize-control-image .upload-button,
-.customize-control-background .upload-button,
-.customize-control-header .new {
+#customize-control-header_image .new {
 	float: right;
 }

--- a/wp-admin/css/customize-controls.min.css
+++ b/wp-admin/css/customize-controls.min.css
--- a/wp-admin/css/customize-widgets-rtl.css
+++ b/wp-admin/css/customize-widgets-rtl.css
@@ -7,11 +7,11 @@
 * preview loads and we know whether the sidebars are used in the template.
 */

-.control-section.control-section-sidebar,
+.control-section[id^="accordion-section-sidebar-widgets-"],
 .customize-control-sidebar_widgets label,
 .customize-control-sidebar_widgets .hide-if-js {
 	/* The link in .customize-control-sidebar_widgets .hide-if-js will fail if it ever gets used. */
-	display: none;
+	display:none;
 }

 .customize-control-widget_form .widget-top {
--- 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
@@ -7,11 +7,11 @@
 * preview loads and we know whether the sidebars are used in the template.
 */

-.control-section.control-section-sidebar,
+.control-section[id^="accordion-section-sidebar-widgets-"],
 .customize-control-sidebar_widgets label,
 .customize-control-sidebar_widgets .hide-if-js {
 	/* The link in .customize-control-sidebar_widgets .hide-if-js will fail if it ever gets used. */
-	display: none;
+	display:none;
 }

 .customize-control-widget_form .widget-top {
--- 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
@@ -74,6 +74,20 @@
 	min-height: 100px;
 }

+h3.dashboard-widget-title,
+h3.dashboard-widget-title span,
+h3.dashboard-widget-title small {
+	color: #333;
+}
+
+h3.dashboard-widget-title small a {
+	color: #d7d7d7;
+}
+
+h3.dashboard-widget-title small a:hover {
+	color: #fff;
+}
+
 /* @todo: this was originally in this section, but likely belongs elsewhere */
 #the-comment-list td.comment p.comment-author {
 	margin-top: 0;
@@ -154,7 +168,7 @@
 	line-height: 1;
 }

-#welcome-panel.welcome-panel .welcome-panel-close:before {
+#welcome-panel.welcome-panel .welcome-panel-close::before {
 	position: absolute;
 	right: -18px;
 	margin-top: -2px;
@@ -163,11 +177,7 @@
 }

 .wp-core-ui .welcome-panel .button.button-hero {
-	margin: 15px 0 3px 13px;
-	padding: 12px 36px;
-	height: auto;
-	line-height: 1.4285714;
-	white-space: normal;
+	margin: 15px 0 3px;
 }

 .welcome-panel-content {
@@ -291,6 +301,15 @@ body #dashboard-widgets .postbox form .submit {
 	margin-top: 0;
 }

+/* @todo: are these actually used anywhere? no non-CSS results in plugin search */
+div.dashboard-widget-error {
+	background-color: #c43;
+}
+
+div.dashboard-widget-notice {
+	background-color: #cfe1ef;
+}
+
 .rssSummary {
 	color: #777;
 	margin-top: 4px;
@@ -691,7 +710,6 @@ form.initial-form.quickpress-open input#title {
 #activity-widget #the-comment-list div.undo {
 	background: none;
 	padding: 6px 0;
-	margin-right: 12px;
 }

 #activity-widget #the-comment-list .alternate,
@@ -707,6 +725,7 @@ form.initial-form.quickpress-open input#title {

 #activity-widget #the-comment-list img {
 	position: absolute;
+	right: 13px;
 	top: 13px;
 }

@@ -748,6 +767,7 @@ form.initial-form.quickpress-open input#title {

 #activity-widget #the-comment-list .spam-undo-inside .avatar,
 #activity-widget #the-comment-list .trash-undo-inside .avatar {
+	margin-left: 20px;
 	position: relative;
 	top: 0;
 }
@@ -822,8 +842,7 @@ h3:hover .edit-box {
 	position: relative;
 }

-#activity-widget #the-comment-list .comment,
-#activity-widget #the-comment-list .pingback {
+#activity-widget #the-comment-list .comment {
 	-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 }
@@ -870,14 +889,14 @@ h3:hover .edit-box {

 /* QuickDraft */

-#title-wrap label,
-#description-wrap label {
+#title-wrap label {
 	cursor: text;
 }

 #title-wrap #title {
 	padding: 2px 6px;
 	font-size: 1.3em;
+	line-height: 100%;
 	outline: none;
 }

@@ -1109,7 +1128,7 @@ a.rsswidget {
 	}

 	/* Make the close icon larger for tappability. */
-	#welcome-panel.welcome-panel .welcome-panel-close:before {
+	#welcome-panel.welcome-panel .welcome-panel-close::before {
 		font-size: 20px;
 		margin: 0;
 	}
--- a/wp-admin/css/dashboard.css
+++ b/wp-admin/css/dashboard.css
@@ -74,6 +74,20 @@
 	min-height: 100px;
 }

+h3.dashboard-widget-title,
+h3.dashboard-widget-title span,
+h3.dashboard-widget-title small {
+	color: #333;
+}
+
+h3.dashboard-widget-title small a {
+	color: #d7d7d7;
+}
+
+h3.dashboard-widget-title small a:hover {
+	color: #fff;
+}
+
 /* @todo: this was originally in this section, but likely belongs elsewhere */
 #the-comment-list td.comment p.comment-author {
 	margin-top: 0;
@@ -154,7 +168,7 @@
 	line-height: 1;
 }

-#welcome-panel.welcome-panel .welcome-panel-close:before {
+#welcome-panel.welcome-panel .welcome-panel-close::before {
 	position: absolute;
 	left: -18px;
 	margin-top: -2px;
@@ -163,11 +177,7 @@
 }

 .wp-core-ui .welcome-panel .button.button-hero {
-	margin: 15px 13px 3px 0;
-	padding: 12px 36px;
-	height: auto;
-	line-height: 1.4285714;
-	white-space: normal;
+	margin: 15px 0 3px;
 }

 .welcome-panel-content {
@@ -291,6 +301,15 @@ body #dashboard-widgets .postbox form .submit {
 	margin-top: 0;
 }

+/* @todo: are these actually used anywhere? no non-CSS results in plugin search */
+div.dashboard-widget-error {
+	background-color: #c43;
+}
+
+div.dashboard-widget-notice {
+	background-color: #cfe1ef;
+}
+
 .rssSummary {
 	color: #777;
 	margin-top: 4px;
@@ -691,7 +710,6 @@ form.initial-form.quickpress-open input#title {
 #activity-widget #the-comment-list div.undo {
 	background: none;
 	padding: 6px 0;
-	margin-left: 12px;
 }

 #activity-widget #the-comment-list .alternate,
@@ -707,6 +725,7 @@ form.initial-form.quickpress-open input#title {

 #activity-widget #the-comment-list img {
 	position: absolute;
+	left: 13px;
 	top: 13px;
 }

@@ -748,6 +767,7 @@ form.initial-form.quickpress-open input#title {

 #activity-widget #the-comment-list .spam-undo-inside .avatar,
 #activity-widget #the-comment-list .trash-undo-inside .avatar {
+	margin-right: 20px;
 	position: relative;
 	top: 0;
 }
@@ -822,8 +842,7 @@ h3:hover .edit-box {
 	position: relative;
 }

-#activity-widget #the-comment-list .comment,
-#activity-widget #the-comment-list .pingback {
+#activity-widget #the-comment-list .comment {
 	-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
 }
@@ -870,14 +889,14 @@ h3:hover .edit-box {

 /* QuickDraft */

-#title-wrap label,
-#description-wrap label {
+#title-wrap label {
 	cursor: text;
 }

 #title-wrap #title {
 	padding: 2px 6px;
 	font-size: 1.3em;
+	line-height: 100%;
 	outline: none;
 }

@@ -1109,7 +1128,7 @@ a.rsswidget {
 	}

 	/* Make the close icon larger for tappability. */
-	#welcome-panel.welcome-panel .welcome-panel-close:before {
+	#welcome-panel.welcome-panel .welcome-panel-close::before {
 		font-size: 20px;
 		margin: 0;
 	}
--- a/wp-admin/css/deprecated-media-rtl.css
+++ b/wp-admin/css/deprecated-media-rtl.css
@@ -24,6 +24,11 @@ body#media-upload ul#sidemenu {
 	clear: both;
 }

+#media-upload,
+#media-upload .media-item .slidetoggle {
+	background: #fff;
+}
+
 #media-upload .slidetoggle {
 	border-top-color: #dfdfdf;
 }
@@ -180,7 +185,7 @@ abbr.required {
 .menu_order {
 	float: left;
 	font-size: 11px;
-	margin: 8px 10px 0;
+	margin: 10px 10px 0;
 }

 .menu_order_input {
@@ -212,6 +217,7 @@ abbr.required {
 }

 #media-upload .widefat {
+	width: 626px;
 	border-style: solid solid none;
 }

@@ -267,10 +273,9 @@ h4.media-sub-title {

 #gallery-settings .describe {
 	padding: 5px;
-	width: 100%;
+	width: 615px;
 	clear: both;
 	cursor: default;
-	background: #fff;
 }

 #gallery-settings .describe select {
@@ -322,7 +327,7 @@ h4.media-sub-title {
 }

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

 tr.not-image {
--- a/wp-admin/css/deprecated-media-rtl.min.css
+++ b/wp-admin/css/deprecated-media-rtl.min.css
@@ -1 +1 @@
-div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;right:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:left}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) center right no-repeat}.image-align-left-label{background:url(../images/align-left.png) center right no-repeat}.image-align-center-label{background:url(../images/align-center.png) center right no-repeat}.image-align-right-label{background:url(../images/align-right.png) center right no-repeat}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:none}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:left;font-size:11px;margin:8px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 0 5px 5px}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:right}#gallery-settings .describe{padding:5px;width:100%;clear:both;cursor:default;background:#fff}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-left:15px}#gallery-settings .align .field label{margin:0 3px 0 1em}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 0 -8px 25px;text-align:left;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-right:5px}#sort-buttons span{margin-left:25px}p.media-types{padding:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.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}}
+div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;right:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload,#media-upload .media-item .slidetoggle{background:#fff}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:left}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:0;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) no-repeat center right}.image-align-left-label{background:url(../images/align-left.png) no-repeat center right}.image-align-center-label{background:url(../images/align-center.png) no-repeat center right}.image-align-right-label{background:url(../images/align-right.png) no-repeat center right}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:0}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:left;font-size:11px;margin:10px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{width:626px;border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 0 5px 5px}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:right}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-left:15px}#gallery-settings .align .field label{margin:0 3px 0 1em}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 0 -8px 25px;text-align:left;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-right:5px}#sort-buttons span{margin-left:25px}p.media-types{margin:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.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.css
+++ b/wp-admin/css/deprecated-media.css
@@ -24,6 +24,11 @@ body#media-upload ul#sidemenu {
 	clear: both;
 }

+#media-upload,
+#media-upload .media-item .slidetoggle {
+	background: #fff;
+}
+
 #media-upload .slidetoggle {
 	border-top-color: #dfdfdf;
 }
@@ -180,7 +185,7 @@ abbr.required {
 .menu_order {
 	float: right;
 	font-size: 11px;
-	margin: 8px 10px 0;
+	margin: 10px 10px 0;
 }

 .menu_order_input {
@@ -212,6 +217,7 @@ abbr.required {
 }

 #media-upload .widefat {
+	width: 626px;
 	border-style: solid solid none;
 }

@@ -267,10 +273,9 @@ h4.media-sub-title {

 #gallery-settings .describe {
 	padding: 5px;
-	width: 100%;
+	width: 615px;
 	clear: both;
 	cursor: default;
-	background: #fff;
 }

 #gallery-settings .describe select {
@@ -322,7 +327,7 @@ h4.media-sub-title {
 }

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

 tr.not-image {
--- a/wp-admin/css/deprecated-media.min.css
+++ b/wp-admin/css/deprecated-media.min.css
@@ -1 +1 @@
-div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:right}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) center left no-repeat}.image-align-left-label{background:url(../images/align-left.png) center left no-repeat}.image-align-center-label{background:url(../images/align-center.png) center left no-repeat}.image-align-right-label{background:url(../images/align-right.png) center left no-repeat}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:none}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:right;font-size:11px;margin:8px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 5px 5px 0}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:left}#gallery-settings .describe{padding:5px;width:100%;clear:both;cursor:default;background:#fff}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px}#gallery-settings .align .field label{margin:0 1em 0 3px}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px}#sort-buttons span{margin-right:25px}p.media-types{padding:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.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}}
+div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload,#media-upload .media-item .slidetoggle{background:#fff}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:right}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:0;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:0}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:right;font-size:11px;margin:10px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{width:626px;border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 5px 5px 0}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:left}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px}#gallery-settings .align .field label{margin:0 1em 0 3px}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px}#sort-buttons span{margin-right:25px}p.media-types{margin:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.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/edit-rtl.css
+++ b/wp-admin/css/edit-rtl.css
@@ -37,6 +37,7 @@

 #titlediv {
 	position: relative;
+	margin-bottom: 10px;
 }

 #titlediv label {
@@ -290,7 +291,6 @@ ul.wp-tab-bar li {
 #postimagediv .inside img {
 	max-width: 100%;
 	height: auto;
-	width: auto;
 }

 form#tags-filter {
@@ -337,7 +337,6 @@ td.plugin-title p {
 	background-color: #f7f7f7;
 	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
 	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
-	z-index: 999;
 }

 #post-status-info td {
@@ -345,7 +344,7 @@ td.plugin-title p {
 }

 .autosave-info {
-	padding: 2px 10px;
+	padding: 2px;
 	text-align: left;
 }

@@ -363,107 +362,11 @@ td.plugin-title p {
 	background: transparent url(../images/resize-rtl.gif) no-repeat scroll right bottom;
 }

-.wp-editor-expand #content-resize-handle {
-	display: none;
-}
-
-#postdivrich #content {
-	resize: none;
-}
-
 #wp-word-count {
 	display: block;
 	padding: 2px 10px;
 }

-#wp-content-editor-container {
-	position: relative;
-}
-
-#content-textarea-clone {
-	z-index: -1;
-	position: absolute;
-	top: 0;
-	visibility: hidden;
-	overflow: hidden;
-	max-width: 100%;
-	border: 1px solid transparent;
-}
-
-.wp-fullscreen-wrap #content-textarea-clone {
-	display: none;
-}
-
-/* editor-expand.js override */
-.wp-fullscreen-wrap {
-	padding-top: 0 !important;
-}
-
-.wp-fullscreen-wrap .wp-editor-area {
-	margin-top: 0 !important;
-}
-
-.wp-fullscreen-wrap .mce-edit-area {
-	padding-top: 0 !important;
-}
-/* end editor-expand.js override */
-
-.wp-editor-expand #wp-content-editor-tools {
-	z-index: 1000;
-	border-bottom: 1px solid #e5e5e5;
-}
-
-.wp-editor-expand #wp-content-editor-container {
-	-webkit-box-shadow: none;
-	box-shadow: none;
-	margin-top: -1px;
-}
-
-.wp-editor-expand #wp-content-editor-container {
-	border-bottom: 0 none;
-}
-
-.wp-editor-expand div.mce-statusbar {
-	z-index: 1;
-}
-
-.wp-editor-expand #post-status-info {
-	border-top: 1px solid #e5e5e5;
-}
-
-.wp-editor-expand div.mce-toolbar-grp {
-	z-index: 999;
-}
-
-/* TinyMCE native fullscreen mode override */
-.mce-fullscreen #wp-content-wrap .mce-menubar,
-.mce-fullscreen #wp-content-wrap .mce-toolbar-grp,
-.mce-fullscreen #wp-content-wrap .mce-edit-area,
-.mce-fullscreen #wp-content-wrap .mce-statusbar {
-	position: static !important;
-	width: auto !important;
-	padding: 0 !important;
-}
-
-.mce-fullscreen #wp-content-wrap .mce-statusbar {
-	visibility: visible !important;
-}
-
-.post-php.mce-fullscreen #wpadminbar,
-.mce-fullscreen #wp-content-wrap .mce-wp-dfw {
-	display: none;
-}
-/* End TinyMCE native fullscreen mode override */
-
-#wp-content-editor-tools {
-	background-color: #f1f1f1;
-	padding-top: 20px;
-}
-
-#poststuff #post-body.columns-2 #side-sortables {
-	width: 280px;
-}
-
 #timestampdiv select {
 	height: 21px;
 	line-height: 14px;
@@ -691,7 +594,6 @@ span.wp-media-buttons-icon:before {
 	padding: 0;
 }

-#post-body-content,
 .edit-form-section {
 	margin-bottom: 20px;
 }
@@ -1011,13 +913,7 @@ ul.categorychecklist li {
 	font-size: 12px;
 }

-.form-field input[type="text"],
-.form-field input[type="password"],
-.form-field input[type="email"],
-.form-field input[type="number"],
-.form-field input[type="search"],
-.form-field input[type="tel"],
-.form-field input[type="url"],
+.form-field input,
 .form-field textarea {
 	border-style: solid;
 	border-width: 1px;
@@ -1112,6 +1008,7 @@ input.newtag:focus ~ div.taghint {
 p.popular-tags {
 	border: none;
 	line-height: 2em;
+	max-width: 1000px;
 	padding: 8px 12px 12px;
 	text-align: justify;
 }
@@ -1241,102 +1138,6 @@ table.links-table {
 	max-width: 280px;
 }

-/* DFW 2
-------------------------------------------------------------- */
-
-#wp-content-wrap .mce-wp-dfw,
-#qt_content_dfw {
-	display: none;
-}
-
-.wp-editor-expand #wp-content-wrap .mce-wp-dfw,
-.wp-editor-expand #qt_content_dfw {
-	display: inline-block;
-}
-
-.focus-on .wrap > h2,
-.focus-on #wpfooter,
-.focus-on .postbox-container > *,
-.focus-on div.updated,
-.focus-on div.error,
-.focus-on div.notice,
-.focus-on #wp-toolbar,
-.focus-on #screen-meta-links,
-.focus-on #screen-meta {
-	opacity: 0;
-	-webkit-transition-duration: 0.6s;
-	transition-duration: 0.6s;
-	-webkit-transition-property: opacity;
-	transition-property: opacity;
-	-webkit-transition-timing-function: ease-in-out;
-	transition-timing-function: ease-in-out;
-}
-
-.focus-on #wp-toolbar {
-	opacity: 0.3;
-}
-
-.focus-off .wrap > h2,
-.focus-off #wpfooter,
-.focus-off .postbox-container > *,
-.focus-off div.updated,
-.focus-off div.error,
-.focus-off div.notice,
-.focus-off #wp-toolbar,
-.focus-off #screen-meta-links,
-.focus-off #screen-meta {
-	opacity: 1;
-	-webkit-transition-duration: 0.2s;
-	transition-duration: 0.2s;
-	-webkit-transition-property: opacity;
-	transition-property: opacity;
-	-webkit-transition-timing-function: ease-in-out;
-	transition-timing-function: ease-in-out;
-}
-
-.focus-off #wp-toolbar {
-	-webkit-transform: translate(0, 0);
-}
-
-.focus-on #adminmenuback,
-.focus-on #adminmenuwrap {
-	-webkit-transition-duration: 0.6s;
-	transition-duration: 0.6s;
-	-webkit-transition-property: -webkit-transform;
-	transition-property: transform;
-	-webkit-transition-timing-function: ease-in-out;
-	transition-timing-function: ease-in-out;
-}
-
-/* @noflip */
-.focus-on #adminmenuback,
-.focus-on #adminmenuwrap {
-	-webkit-transform: translateX( -100% );
-	-ms-transform: translateX( -100% );
-	transform: translateX( -100% );
-}
-
-/* @noflip */
-.rtl.focus-on #adminmenuback,
-.rtl.focus-on #adminmenuwrap {
-	-webkit-transform: translateX( 100% );
-	-ms-transform: translateX( 100% );
-	transform: translateX( 100% );
-}
-
-.focus-off #adminmenuback,
-.focus-off #adminmenuwrap {
-	-webkit-transform: translateX( 0 );
-	-ms-transform: translateX( 0 );
-	transform: translateX( 0 );
-	-webkit-transition-duration: 0.2s;
-	transition-duration: 0.2s;
-	-webkit-transition-property: -webkit-transform;
-	transition-property: transform;
-	-webkit-transition-timing-function: ease-in-out;
-	transition-timing-function: ease-in-out;
-}
-
 /* =Media Queries
 -------------------------------------------------------------- */

@@ -1384,7 +1185,6 @@ table.links-table {

 	#poststuff #post-body.columns-2 #side-sortables {
 		min-height: 0;
-		width: auto;
 	}

 	/* hide the radio buttons for column prefs */
@@ -1548,11 +1348,17 @@ table.links-table {
 		padding: 10px 20px;
 	}

-	button.wp-switch-editor {
+	#wp-content-editor-tools {
+		overflow: hidden;
+		padding: 20px 0 1px 15px;
+		top: 1px;
+	}
+
+	a.wp-switch-editor {
 		font-size: 16px;
 		line-height: 1em;
-		margin: 7px 7px 0 0;
-		padding: 8px 12px;
+		margin: 3px 7px 0 0;
+		padding: 12px 15px;
 	}

 	#wp-content-media-buttons a {
--- a/wp-admin/css/edit.css
+++ b/wp-admin/css/edit.css
@@ -37,6 +37,7 @@

 #titlediv {
 	position: relative;
+	margin-bottom: 10px;
 }

 #titlediv label {
@@ -290,7 +291,6 @@ ul.wp-tab-bar li {
 #postimagediv .inside img {
 	max-width: 100%;
 	height: auto;
-	width: auto;
 }

 form#tags-filter {
@@ -337,7 +337,6 @@ td.plugin-title p {
 	background-color: #f7f7f7;
 	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
 	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
-	z-index: 999;
 }

 #post-status-info td {
@@ -345,7 +344,7 @@ td.plugin-title p {
 }

 .autosave-info {
-	padding: 2px 10px;
+	padding: 2px;
 	text-align: right;
 }

@@ -363,107 +362,11 @@ td.plugin-title p {
 	background: transparent url(../images/resize-rtl.gif) no-repeat scroll left bottom;
 }

-.wp-editor-expand #content-resize-handle {
-	display: none;
-}
-
-#postdivrich #content {
-	resize: none;
-}
-
 #wp-word-count {
 	display: block;
 	padding: 2px 10px;
 }

-#wp-content-editor-container {
-	position: relative;
-}
-
-#content-textarea-clone {
-	z-index: -1;
-	position: absolute;
-	top: 0;
-	visibility: hidden;
-	overflow: hidden;
-	max-width: 100%;
-	border: 1px solid transparent;
-}
-
-.wp-fullscreen-wrap #content-textarea-clone {
-	display: none;
-}
-
-/* editor-expand.js override */
-.wp-fullscreen-wrap {
-	padding-top: 0 !important;
-}
-
-.wp-fullscreen-wrap .wp-editor-area {
-	margin-top: 0 !important;
-}
-
-.wp-fullscreen-wrap .mce-edit-area {
-	padding-top: 0 !important;
-}
-/* end editor-expand.js override */
-
-.wp-editor-expand #wp-content-editor-tools {
-	z-index: 1000;
-	border-bottom: 1px solid #e5e5e5;
-}
-
-.wp-editor-expand #wp-content-editor-container {
-	-webkit-box-shadow: none;
-	box-shadow: none;
-	margin-top: -1px;
-}
-
-.wp-editor-expand #wp-content-editor-container {
-	border-bottom: 0 none;
-}
-
-.wp-editor-expand div.mce-statusbar {
-	z-index: 1;
-}
-
-.wp-editor-expand #post-status-info {
-	border-top: 1px solid #e5e5e5;
-}
-
-.wp-editor-expand div.mce-toolbar-grp {
-	z-index: 999;
-}
-
-/* TinyMCE native fullscreen mode override */
-.mce-fullscreen #wp-content-wrap .mce-menubar,
-.mce-fullscreen #wp-content-wrap .mce-toolbar-grp,
-.mce-fullscreen #wp-content-wrap .mce-edit-area,
-.mce-fullscreen #wp-content-wrap .mce-statusbar {
-	position: static !important;
-	width: auto !important;
-	padding: 0 !important;
-}
-
-.mce-fullscreen #wp-content-wrap .mce-statusbar {
-	visibility: visible !important;
-}
-
-.post-php.mce-fullscreen #wpadminbar,
-.mce-fullscreen #wp-content-wrap .mce-wp-dfw {
-	display: none;
-}
-/* End TinyMCE native fullscreen mode override */
-
-#wp-content-editor-tools {
-	background-color: #f1f1f1;
-	padding-top: 20px;
-}
-
-#poststuff #post-body.columns-2 #side-sortables {
-	width: 280px;
-}
-
 #timestampdiv select {
 	height: 21px;
 	line-height: 14px;
@@ -691,7 +594,6 @@ span.wp-media-buttons-icon:before {
 	padding: 0;
 }

-#post-body-content,
 .edit-form-section {
 	margin-bottom: 20px;
 }
@@ -1011,13 +913,7 @@ ul.categorychecklist li {
 	font-size: 12px;
 }

-.form-field input[type="text"],
-.form-field input[type="password"],
-.form-field input[type="email"],
-.form-field input[type="number"],
-.form-field input[type="search"],
-.form-field input[type="tel"],
-.form-field input[type="url"],
+.form-field input,
 .form-field textarea {
 	border-style: solid;
 	border-width: 1px;
@@ -1112,6 +1008,7 @@ input.newtag:focus ~ div.taghint {
 p.popular-tags {
 	border: none;
 	line-height: 2em;
+	max-width: 1000px;
 	padding: 8px 12px 12px;
 	text-align: justify;
 }
@@ -1241,102 +1138,6 @@ table.links-table {
 	max-width: 280px;
 }

-/* DFW 2
-------------------------------------------------------------- */
-
-#wp-content-wrap .mce-wp-dfw,
-#qt_content_dfw {
-	display: none;
-}
-
-.wp-editor-expand #wp-content-wrap .mce-wp-dfw,
-.wp-editor-expand #qt_content_dfw {
-	display: inline-block;
-}
-
-.focus-on .wrap > h2,
-.focus-on #wpfooter,
-.focus-on .postbox-container > *,
-.focus-on div.updated,
-.focus-on div.error,
-.focus-on div.notice,
-.focus-on #wp-toolbar,
-.focus-on #screen-meta-links,
-.focus-on #screen-meta {
-	opacity: 0;
-	-webkit-transition-duration: 0.6s;
-	transition-duration: 0.6s;
-	-webkit-transition-property: opacity;
-	transition-property: opacity;
-	-webkit-transition-timing-function: ease-in-out;
-	transition-timing-function: ease-in-out;
-}
-
-.focus-on #wp-toolbar {
-	opacity: 0.3;
-}
-
-.focus-off .wrap > h2,
-.focus-off #wpfooter,
-.focus-off .postbox-container > *,
-.focus-off div.updated,
-.focus-off div.error,
-.focus-off div.notice,
-.focus-off #wp-toolbar,
-.focus-off #screen-meta-links,
-.focus-off #screen-meta {
-	opacity: 1;
-	-webkit-transition-duration: 0.2s;
-	transition-duration: 0.2s;
-	-webkit-transition-property: opacity;
-	transition-property: opacity;
-	-webkit-transition-timing-function: ease-in-out;
-	transition-timing-function: ease-in-out;
-}
-
-.focus-off #wp-toolbar {
-	-webkit-transform: translate(0, 0);
-}
-
-.focus-on #adminmenuback,
-.focus-on #adminmenuwrap {
-	-webkit-transition-duration: 0.6s;
-	transition-duration: 0.6s;
-	-webkit-transition-property: -webkit-transform;
-	transition-property: transform;
-	-webkit-transition-timing-function: ease-in-out;
-	transition-timing-function: ease-in-out;
-}
-
-/* @noflip */
-.focus-on #adminmenuback,
-.focus-on #adminmenuwrap {
-	-webkit-transform: translateX( -100% );
-	-ms-transform: translateX( -100% );
-	transform: translateX( -100% );
-}
-
-/* @noflip */
-.rtl.focus-on #adminmenuback,
-.rtl.focus-on #adminmenuwrap {
-	-webkit-transform: translateX( 100% );
-	-ms-transform: translateX( 100% );
-	transform: translateX( 100% );
-}
-
-.focus-off #adminmenuback,
-.focus-off #adminmenuwrap {
-	-webkit-transform: translateX( 0 );
-	-ms-transform: translateX( 0 );
-	transform: translateX( 0 );
-	-webkit-transition-duration: 0.2s;
-	transition-duration: 0.2s;
-	-webkit-transition-property: -webkit-transform;
-	transition-property: transform;
-	-webkit-transition-timing-function: ease-in-out;
-	transition-timing-function: ease-in-out;
-}
-
 /* =Media Queries
 -------------------------------------------------------------- */

@@ -1384,7 +1185,6 @@ table.links-table {

 	#poststuff #post-body.columns-2 #side-sortables {
 		min-height: 0;
-		width: auto;
 	}

 	/* hide the radio buttons for column prefs */
@@ -1548,11 +1348,17 @@ table.links-table {
 		padding: 10px 20px;
 	}

-	button.wp-switch-editor {
+	#wp-content-editor-tools {
+		overflow: hidden;
+		padding: 20px 15px 1px 0;
+		top: 1px;
+	}
+
+	a.wp-switch-editor {
 		font-size: 16px;
 		line-height: 1em;
-		margin: 7px 0 0 7px;
-		padding: 8px 12px;
+		margin: 3px 0 0 7px;
+		padding: 12px 15px;
 	}

 	#wp-content-media-buttons a {
--- a/wp-admin/css/forms-rtl.css
+++ b/wp-admin/css/forms-rtl.css
@@ -1,66 +1,17 @@
-/* Include margin and padding in the width calculation of input and textarea. */
+/* include margin and padding in the width calculation of input and textarea */
 input,
+input[type="text"],
+input[type="password"],
+input[type="number"],
+input[type="search"],
+input[type="email"],
+input[type="url"],
 textarea {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

-input[type="text"],
-input[type="password"],
-input[type="checkbox"],
-input[type="color"],
-input[type="date"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="email"],
-input[type="month"],
-input[type="number"],
-input[type="password"],
-input[type="search"],
-input[type="radio"],
-input[type="tel"],
-input[type="text"],
-input[type="time"],
-input[type="url"],
-input[type="week"],
-select,
-textarea {
-	border: 1px solid #ddd;
-	-webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 );
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 );
-	background-color: #fff;
-	color: #333;
-	outline: none;
-	-webkit-transition: 0.05s border-color ease-in-out;
-	transition: 0.05s border-color ease-in-out;
-}
-
-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="password"]: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: #5b9dd9;
-	-webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
-	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
-}
-
 /* @noflip */
 input[type="email"],
 input[type="url"] {
@@ -85,8 +36,11 @@ input[type="radio"] {
 	width: 16px;
 	min-width: 16px;
 	-webkit-appearance: none;
-	-webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 );
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 );
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
 	-webkit-transition: .05s border-color ease-in-out;
 	transition: .05s border-color ease-in-out;
 }
@@ -101,28 +55,28 @@ input[type="radio"]:checked + label:before {
 }

 td > input[type="checkbox"],
-.wp-admin p input[type="checkbox"],
-.wp-admin p input[type="radio"] {
+.wp-admin p input[type=checkbox],
+.wp-admin p input[type=radio] {
 	margin-top: 0;
 }

-.wp-admin p label input[type="checkbox"] {
+.wp-admin p label input[type=checkbox] {
 	margin-top: -4px;
 }

-.wp-admin p label input[type="radio"] {
+.wp-admin p label input[type=radio] {
 	margin-top: -2px;
 }

-input[type="radio"] {
+input[type=radio] {
 	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	margin-left: 4px;
 	line-height: 10px;
 }

-input[type="checkbox"]:checked:before,
-input[type="radio"]:checked:before {
+input[type=checkbox]:checked:before,
+input[type=radio]:checked:before {
 	float: right;
 	display: inline-block;
 	vertical-align: middle;
@@ -133,13 +87,13 @@ input[type="radio"]:checked:before {
 	-moz-osx-font-smoothing: grayscale;
 }

-input[type="checkbox"]:checked:before {
+input[type=checkbox]:checked:before {
 	content: '\f147';
 	margin: -3px -4px 0 0;
 	color: #1e8cbe;
 }

-input[type="radio"]:checked:before {
+input[type=radio]:checked:before {
 	content: '\2022';
 	text-indent: -9999px;
 	-webkit-border-radius: 50px;
@@ -152,9 +106,13 @@ input[type="radio"]:checked:before {
 	background-color: #1e8cbe;
 }

+input.readonly, textarea.readonly {
+	background-color: #ddd;
+}
+
@-moz-document url-prefix() {
-	input[type="checkbox"],
-	input[type="radio"],
+	input[type=checkbox],
+	input[type=radio],
 	.form-table input.tog {
 		margin-bottom: -1px;
 	}
@@ -187,6 +145,7 @@ input,
 select {
 	font-size: 14px;
 	padding: 3px 5px;
+	line-height: 15px;
 	-webkit-border-radius: 0;
 	border-radius: 0; /* Reset mobile webkit's default element styling */
 }
@@ -197,6 +156,17 @@ textarea {
 	line-height: 1.4;
 }

+input[type="text"],
+input[type="password"],
+input[type="number"],
+input[type="search"],
+input[type="email"],
+input[type="url"],
+textarea,
+select {
+	outline: 0;
+}
+
 .wp-admin input[type="file"] {
 	padding: 3px 0;
 }
@@ -220,10 +190,45 @@ textarea.code {
 	padding: 4px 6px 1px 6px;
 }

-input.readonly,
-input[readonly],
-textarea.readonly,
-textarea[readonly] {
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="email"],
+input[type="number"],
+input[type="search"],
+input[type="tel"],
+input[type="url"],
+select {
+	border: 1px solid #ddd;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
+	background-color: #fff;
+	color: #333;
+	-webkit-transition: .05s border-color ease-in-out;
+	transition: .05s border-color ease-in-out;
+}
+
+select[disabled] {
+	color: #7f7f7f;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="email"]:focus,
+input[type="number"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="url"]:focus,
+input[type="checkbox"]:focus,
+input[type="radio"]:focus,
+select:focus {
+	border-color: #5b9dd9;
+	-webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8);
+	box-shadow: 0 0 2px rgba(30,140,190,0.8);
+}
+
+input[readonly] {
 	background-color: #eee;
 }

@@ -247,34 +252,19 @@ textarea[readonly] {

 input:disabled,
 input.disabled,
-select:disabled,
-select.disabled,
 textarea:disabled,
 textarea.disabled {
-	background: rgba( 255, 255, 255, 0.5 );
-	border-color: rgba( 222, 222, 222, 0.75 );
-	-webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 );
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 );
-	color: rgba( 51, 51, 51, 0.5 );
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
+	border-color: rgba(222, 222, 222, .75);
+	background: rgba(255, 255, 255, .5);
+	color: rgba(51, 51, 51, .5);
 }

-input[type="file"]:disabled,
-input[type="file"].disabled,
-input[type="range"]:disabled,
-input[type="range"].disabled {
-	background: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-
-input[type="checkbox"]:disabled,
-input[type="checkbox"].disabled,
-input[type="radio"]:disabled,
-input[type="radio"].disabled,
-input[type="checkbox"]:disabled:checked:before,
-input[type="checkbox"].disabled:checked:before,
-input[type="radio"]:disabled:checked:before,
-input[type="radio"].disabled:checked:before {
+input[type=checkbox]:disabled,
+input[type=radio]:disabled,
+input[type=checkbox]:disabled:checked:before,
+input[type=radio]:disabled:checked:before {
 	opacity: 0.7;
 }

@@ -374,8 +364,7 @@ input[type="number"].small-text {

 .tablenav #changeit,
 .tablenav #delete_all,
-.tablenav #clear-recent-list,
-.wp-filter #delete_all {
+.tablenav #clear-recent-list {
 	margin-top: 1px;
 }

@@ -476,7 +465,7 @@ p.search-box {
 }

 .search-box input[name="s"],
-.tablenav .search-plugins input[name="s"],
+#search-plugins input[name="s"],
 .tagsdiv .newtag {
 	float: right;
 	height: 28px;
@@ -596,7 +585,7 @@ ul#add-to-blog-users {
 }

 .form-table input.tog,
-.form-table input[type="radio"] {
+.form-table input[type=radio] {
 	margin-top: -4px;
 	margin-left: 4px;
 	float: none;
@@ -611,11 +600,6 @@ table.form-table td .updated {
 	font-size: 13px;
 }

-table.form-table td .updated p {
-	font-size: 13px;
-	margin: 0.3em 0;
-}
-
 /*------------------------------------------------------------------------------
  18.0 - Users
 ------------------------------------------------------------------------------*/
@@ -767,38 +751,6 @@ table.form-table td .updated p {
 	margin: -3px 3px;
 }

-.settings-php .language-install-spinner,
-.options-general-php .language-install-spinner {
-	display: inline-block;
-	float: none;
-	margin: -3px 5px 0;
-	vertical-align: middle;
-}
-
-/*------------------------------------------------------------------------------
-  21.0 - Network Admin
------------------------------------------------------------------------------*/
-
-.form-field #site-address {
-	max-width: 25em;
-}
-
-.form-field #domain {
-	max-width: 22em;
-}
-
-.form-field #site-title,
-.form-field #admin-email,
-.form-field #path,
-.form-field #blog_registered,
-.form-field #blog_last_updated {
-	max-width: 25em;
-}
-
-.form-field #path {
-	margin-bottom: 5px;
-}
-
 /* =Media Queries
 -------------------------------------------------------------- */

@@ -808,11 +760,8 @@ table.form-table td .updated p {
 		-webkit-appearance: none;
 	}

-	input[type="text"],
-	input[type="email"],
-	input[type="search"],
-	input[type="password"],
-	input[type="number"] {
+	input[type=text], input[type=search],
+	input[type=password], input[type=number] {
 		-webkit-appearance: none;
 		padding: 6px 10px;
 	}
@@ -822,32 +771,32 @@ table.form-table td .updated p {
 		padding-top: 10px;
 	}

-	input[type="checkbox"], .widefat th input[type="checkbox"] {
+	input[type=checkbox], .widefat th input[type=checkbox] {
 		-webkit-appearance: none;
 		padding: 10px;
 	}

-	.widefat th input[type="checkbox"] {
+	.widefat th input[type=checkbox] {
 		margin-bottom: 8px;
 	}

-	input[type="checkbox"]:checked:before, .widefat th input[type="checkbox"]:before {
+	input[type=checkbox]:checked:before, .widefat th input[type=checkbox]:before {
 		font: normal 30px/1 'Dashicons';
 		margin: -3px -5px;
 	}

-	input[type="radio"],
-	input[type="checkbox"] {
+	input[type=radio],
+	input[type=checkbox] {
 		height: 25px;
 		width: 25px;
 	}

-	.wp-admin p input[type="checkbox"],
-	.wp-admin p input[type="radio"] {
+	.wp-admin p input[type=checkbox],
+	.wp-admin p input[type=radio] {
 		margin-top: -3px;
 	}

-	input[type="radio"]:checked:before {
+	input[type=radio]:checked:before {
 		vertical-align: middle;
 		width: 9px;
 		height: 9px;
@@ -855,7 +804,7 @@ table.form-table td .updated p {
 		line-height: 16px;
 	}

-	.wp-upload-form input[type="submit"] {
+	.wp-upload-form input[type=submit] {
 		margin-top: 10px;
 	}

@@ -901,7 +850,6 @@ table.form-table td .updated p {
 	}

 	.form-table td input[type="text"],
-	.form-table td input[type="email"],
 	.form-table td input[type="password"],
 	.form-table td select,
 	.form-table td textarea,
@@ -918,16 +866,12 @@ table.form-table td .updated p {
 		box-sizing: border-box;
 	}

-	#wpbody .form-table td select {
-		height: 40px;
-	}
-
-	input[type="text"].small-text,
-	input[type="search"].small-text,
-	input[type="password"].small-text,
+	input[type=text].small-text,
+	input[type=search].small-text,
+	input[type=password].small-text,
+	input[type=number].small-text,
 	input[type="number"].small-text,
-	input[type="number"].small-text,
-	.form-table input[type="text"].small-text {
+	.form-table input[type=text].small-text {
 		width: auto;
 		max-width: 55px;
 		display: inline;
@@ -1004,17 +948,10 @@ table.form-table td .updated p {
 		padding: 0;
 		line-height: 2;
 	}
-
-	.form-field #domain {
-		max-width: none;
-	}
 }

@media only screen and (max-width: 768px) {
-	.form-field input[type="text"],
-	.form-field input[type="email"],
-	.form-field input[type="password"],
-	.form-field select,
+	.form-field input,
 	.form-field textarea {
 		width: 99%;
 	}
--- a/wp-admin/css/forms.css
+++ b/wp-admin/css/forms.css
@@ -1,66 +1,17 @@
-/* Include margin and padding in the width calculation of input and textarea. */
+/* include margin and padding in the width calculation of input and textarea */
 input,
+input[type="text"],
+input[type="password"],
+input[type="number"],
+input[type="search"],
+input[type="email"],
+input[type="url"],
 textarea {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

-input[type="text"],
-input[type="password"],
-input[type="checkbox"],
-input[type="color"],
-input[type="date"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="email"],
-input[type="month"],
-input[type="number"],
-input[type="password"],
-input[type="search"],
-input[type="radio"],
-input[type="tel"],
-input[type="text"],
-input[type="time"],
-input[type="url"],
-input[type="week"],
-select,
-textarea {
-	border: 1px solid #ddd;
-	-webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 );
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 );
-	background-color: #fff;
-	color: #333;
-	outline: none;
-	-webkit-transition: 0.05s border-color ease-in-out;
-	transition: 0.05s border-color ease-in-out;
-}
-
-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="password"]: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: #5b9dd9;
-	-webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
-	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
-}
-
 /* @noflip */
 input[type="email"],
 input[type="url"] {
@@ -85,8 +36,11 @@ input[type="radio"] {
 	width: 16px;
 	min-width: 16px;
 	-webkit-appearance: none;
-	-webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 );
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 );
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
 	-webkit-transition: .05s border-color ease-in-out;
 	transition: .05s border-color ease-in-out;
 }
@@ -101,28 +55,28 @@ input[type="radio"]:checked + label:before {
 }

 td > input[type="checkbox"],
-.wp-admin p input[type="checkbox"],
-.wp-admin p input[type="radio"] {
+.wp-admin p input[type=checkbox],
+.wp-admin p input[type=radio] {
 	margin-top: 0;
 }

-.wp-admin p label input[type="checkbox"] {
+.wp-admin p label input[type=checkbox] {
 	margin-top: -4px;
 }

-.wp-admin p label input[type="radio"] {
+.wp-admin p label input[type=radio] {
 	margin-top: -2px;
 }

-input[type="radio"] {
+input[type=radio] {
 	-webkit-border-radius: 50%;
 	border-radius: 50%;
 	margin-right: 4px;
 	line-height: 10px;
 }

-input[type="checkbox"]:checked:before,
-input[type="radio"]:checked:before {
+input[type=checkbox]:checked:before,
+input[type=radio]:checked:before {
 	float: left;
 	display: inline-block;
 	vertical-align: middle;
@@ -133,13 +87,13 @@ input[type="radio"]:checked:before {
 	-moz-osx-font-smoothing: grayscale;
 }

-input[type="checkbox"]:checked:before {
+input[type=checkbox]:checked:before {
 	content: '\f147';
 	margin: -3px 0 0 -4px;
 	color: #1e8cbe;
 }

-input[type="radio"]:checked:before {
+input[type=radio]:checked:before {
 	content: '\2022';
 	text-indent: -9999px;
 	-webkit-border-radius: 50px;
@@ -152,9 +106,13 @@ input[type="radio"]:checked:before {
 	background-color: #1e8cbe;
 }

+input.readonly, textarea.readonly {
+	background-color: #ddd;
+}
+
@-moz-document url-prefix() {
-	input[type="checkbox"],
-	input[type="radio"],
+	input[type=checkbox],
+	input[type=radio],
 	.form-table input.tog {
 		margin-bottom: -1px;
 	}
@@ -187,6 +145,7 @@ input,
 select {
 	font-size: 14px;
 	padding: 3px 5px;
+	line-height: 15px;
 	-webkit-border-radius: 0;
 	border-radius: 0; /* Reset mobile webkit's default element styling */
 }
@@ -197,6 +156,17 @@ textarea {
 	line-height: 1.4;
 }

+input[type="text"],
+input[type="password"],
+input[type="number"],
+input[type="search"],
+input[type="email"],
+input[type="url"],
+textarea,
+select {
+	outline: 0;
+}
+
 .wp-admin input[type="file"] {
 	padding: 3px 0;
 }
@@ -220,10 +190,45 @@ textarea.code {
 	padding: 4px 6px 1px 6px;
 }

-input.readonly,
-input[readonly],
-textarea.readonly,
-textarea[readonly] {
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="email"],
+input[type="number"],
+input[type="search"],
+input[type="tel"],
+input[type="url"],
+select {
+	border: 1px solid #ddd;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
+	background-color: #fff;
+	color: #333;
+	-webkit-transition: .05s border-color ease-in-out;
+	transition: .05s border-color ease-in-out;
+}
+
+select[disabled] {
+	color: #7f7f7f;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="email"]:focus,
+input[type="number"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="url"]:focus,
+input[type="checkbox"]:focus,
+input[type="radio"]:focus,
+select:focus {
+	border-color: #5b9dd9;
+	-webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8);
+	box-shadow: 0 0 2px rgba(30,140,190,0.8);
+}
+
+input[readonly] {
 	background-color: #eee;
 }

@@ -247,34 +252,19 @@ textarea[readonly] {

 input:disabled,
 input.disabled,
-select:disabled,
-select.disabled,
 textarea:disabled,
 textarea.disabled {
-	background: rgba( 255, 255, 255, 0.5 );
-	border-color: rgba( 222, 222, 222, 0.75 );
-	-webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 );
-	box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 );
-	color: rgba( 51, 51, 51, 0.5 );
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
+	border-color: rgba(222, 222, 222, .75);
+	background: rgba(255, 255, 255, .5);
+	color: rgba(51, 51, 51, .5);
 }

-input[type="file"]:disabled,
-input[type="file"].disabled,
-input[type="range"]:disabled,
-input[type="range"].disabled {
-	background: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-
-input[type="checkbox"]:disabled,
-input[type="checkbox"].disabled,
-input[type="radio"]:disabled,
-input[type="radio"].disabled,
-input[type="checkbox"]:disabled:checked:before,
-input[type="checkbox"].disabled:checked:before,
-input[type="radio"]:disabled:checked:before,
-input[type="radio"].disabled:checked:before {
+input[type=checkbox]:disabled,
+input[type=radio]:disabled,
+input[type=checkbox]:disabled:checked:before,
+input[type=radio]:disabled:checked:before {
 	opacity: 0.7;
 }

@@ -374,8 +364,7 @@ input[type="number"].small-text {

 .tablenav #changeit,
 .tablenav #delete_all,
-.tablenav #clear-recent-list,
-.wp-filter #delete_all {
+.tablenav #clear-recent-list {
 	margin-top: 1px;
 }

@@ -476,7 +465,7 @@ p.search-box {
 }

 .search-box input[name="s"],
-.tablenav .search-plugins input[name="s"],
+#search-plugins input[name="s"],
 .tagsdiv .newtag {
 	float: left;
 	height: 28px;
@@ -596,7 +585,7 @@ ul#add-to-blog-users {
 }

 .form-table input.tog,
-.form-table input[type="radio"] {
+.form-table input[type=radio] {
 	margin-top: -4px;
 	margin-right: 4px;
 	float: none;
@@ -611,11 +600,6 @@ table.form-table td .updated {
 	font-size: 13px;
 }

-table.form-table td .updated p {
-	font-size: 13px;
-	margin: 0.3em 0;
-}
-
 /*------------------------------------------------------------------------------
  18.0 - Users
 ------------------------------------------------------------------------------*/
@@ -767,38 +751,6 @@ table.form-table td .updated p {
 	margin: -3px 3px;
 }

-.settings-php .language-install-spinner,
-.options-general-php .language-install-spinner {
-	display: inline-block;
-	float: none;
-	margin: -3px 5px 0;
-	vertical-align: middle;
-}
-
-/*------------------------------------------------------------------------------
-  21.0 - Network Admin
------------------------------------------------------------------------------*/
-
-.form-field #site-address {
-	max-width: 25em;
-}
-
-.form-field #domain {
-	max-width: 22em;
-}
-
-.form-field #site-title,
-.form-field #admin-email,
-.form-field #path,
-.form-field #blog_registered,
-.form-field #blog_last_updated {
-	max-width: 25em;
-}
-
-.form-field #path {
-	margin-bottom: 5px;
-}
-
 /* =Media Queries
 -------------------------------------------------------------- */

@@ -808,11 +760,8 @@ table.form-table td .updated p {
 		-webkit-appearance: none;
 	}

-	input[type="text"],
-	input[type="email"],
-	input[type="search"],
-	input[type="password"],
-	input[type="number"] {
+	input[type=text], input[type=search],
+	input[type=password], input[type=number] {
 		-webkit-appearance: none;
 		padding: 6px 10px;
 	}
@@ -822,32 +771,32 @@ table.form-table td .updated p {
 		padding-top: 10px;
 	}

-	input[type="checkbox"], .widefat th input[type="checkbox"] {
+	input[type=checkbox], .widefat th input[type=checkbox] {
 		-webkit-appearance: none;
 		padding: 10px;
 	}

-	.widefat th input[type="checkbox"] {
+	.widefat th input[type=checkbox] {
 		margin-bottom: 8px;
 	}

-	input[type="checkbox"]:checked:before, .widefat th input[type="checkbox"]:before {
+	input[type=checkbox]:checked:before, .widefat th input[type=checkbox]:before {
 		font: normal 30px/1 'Dashicons';
 		margin: -3px -5px;
 	}

-	input[type="radio"],
-	input[type="checkbox"] {
+	input[type=radio],
+	input[type=checkbox] {
 		height: 25px;
 		width: 25px;
 	}

-	.wp-admin p input[type="checkbox"],
-	.wp-admin p input[type="radio"] {
+	.wp-admin p input[type=checkbox],
+	.wp-admin p input[type=radio] {
 		margin-top: -3px;
 	}

-	input[type="radio"]:checked:before {
+	input[type=radio]:checked:before {
 		vertical-align: middle;
 		width: 9px;
 		height: 9px;
@@ -855,7 +804,7 @@ table.form-table td .updated p {
 		line-height: 16px;
 	}

-	.wp-upload-form input[type="submit"] {
+	.wp-upload-form input[type=submit] {
 		margin-top: 10px;
 	}

@@ -901,7 +850,6 @@ table.form-table td .updated p {
 	}

 	.form-table td input[type="text"],
-	.form-table td input[type="email"],
 	.form-table td input[type="password"],
 	.form-table td select,
 	.form-table td textarea,
@@ -918,16 +866,12 @@ table.form-table td .updated p {
 		box-sizing: border-box;
 	}

-	#wpbody .form-table td select {
-		height: 40px;
-	}
-
-	input[type="text"].small-text,
-	input[type="search"].small-text,
-	input[type="password"].small-text,
+	input[type=text].small-text,
+	input[type=search].small-text,
+	input[type=password].small-text,
+	input[type=number].small-text,
 	input[type="number"].small-text,
-	input[type="number"].small-text,
-	.form-table input[type="text"].small-text {
+	.form-table input[type=text].small-text {
 		width: auto;
 		max-width: 55px;
 		display: inline;
@@ -1004,17 +948,10 @@ table.form-table td .updated p {
 		padding: 0;
 		line-height: 2;
 	}
-
-	.form-field #domain {
-		max-width: none;
-	}
 }

@media only screen and (max-width: 768px) {
-	.form-field input[type="text"],
-	.form-field input[type="email"],
-	.form-field input[type="password"],
-	.form-field select,
+	.form-field input,
 	.form-field textarea {
 		width: 99%;
 	}
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -260,7 +260,7 @@ table.fixed td {
 	border: 1px solid #dfdfdf;
 }

-#wpbody-content .postbox .hndle {
+#wpbody-content .postbox h3 {
 	margin-bottom: -1px;
 }

--- a/wp-admin/css/ie-rtl.min.css
+++ b/wp-admin/css/ie-rtl.min.css
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -260,7 +260,7 @@ table.fixed td {
 	border: 1px solid #dfdfdf;
 }

-#wpbody-content .postbox .hndle {
+#wpbody-content .postbox h3 {
 	margin-bottom: -1px;
 }

--- a/wp-admin/css/ie.min.css
+++ b/wp-admin/css/ie.min.css
--- a/wp-admin/css/install-rtl.css
+++ b/wp-admin/css/install-rtl.css
@@ -60,11 +60,6 @@ abbr {
 	border: 0;
 	font-variant: normal;
 }
-
-label {
-	cursor: pointer;
-}
-
 #logo {
 	margin: 6px 0 14px 0;
 	border-bottom: none;
@@ -73,19 +68,19 @@ label {
 #logo a {
 	background-image: url(../images/w-logo-blue.png?ver=20131202);
 	background-image: none, url(../images/wordpress-logo.svg?ver=20131107);
-	-webkit-background-size: 84px;
-	background-size: 84px;
+	-webkit-background-size: 80px 80px;
+	background-size: 80px 80px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #999;
-	height: 84px;
+	height: 80px;
 	font-size: 20px;
 	font-weight: normal;
 	line-height: 1.3em;
 	margin: -130px auto 25px;
 	padding: 0;
 	text-decoration: none;
-	width: 84px;
+	width: 80px;
 	text-indent: -9999px;
 	outline: none;
 	overflow: hidden;
@@ -98,9 +93,7 @@ label {
 	text-align: right;
 	padding: 0;
 }
-.language-chooser.wp-core-ui .step .button.button-large {
-	height: 36px;
-	vertical-align: middle;
+.step .button-large {
 	font-size: 14px;
 }
 textarea {
@@ -159,8 +152,6 @@ submit {
 }

 .form-table input[type=text],
-.form-table input[type=email],
-.form-table input[type=url],
 .form-table input[type=password] {
 	width: 206px;
 }
@@ -304,8 +295,6 @@ body.rtl,
 	}

 	.form-table td input[type="text"],
-	.form-table td input[type="email"],
-	.form-table td input[type="url"],
 	.form-table td input[type="password"],
 	.form-table td select,
 	.form-table td textarea,
@@ -322,68 +311,3 @@ body.rtl,
 	}

 }
-
-body.language-chooser {
-	max-width: 300px;
-}
-
-.language-chooser select {
-	padding: 8px;
-	width: 100%;
-	display: block;
-	border: 1px solid #ddd;
-	background-color: #fff;
-	color: #333;
-	font-size: 16px;
-	font-family: Arial, sans-serif;
-	font-weight: normal;
-}
-
-.language-chooser p {
-	text-align: left;
-}
-
-.screen-reader-input,
-.screen-reader-text {
-	position: absolute;
-	margin: -1px;
-	padding: 0;
-	height: 1px;
-	width: 1px;
-	overflow: hidden;
-	clip: rect(0 0 0 0);
-	border: 0;
-}
-
-.spinner {
-	background: url(../images/spinner.gif) no-repeat;
-	-webkit-background-size: 20px 20px;
-	background-size: 20px 20px;
-	visibility: hidden;
-	opacity: 0.7;
-	filter: alpha(opacity=70);
-	width: 20px;
-	height: 20px;
-	margin: 2px 5px 0;
-}
-
-.step .spinner {
-	display: inline-block;
-	margin-top: 8px;
-	margin-left: 15px;
-	vertical-align: top;
-}
-
-/**
- * HiDPI Displays
- */
-@media print,
-  (-o-min-device-pixel-ratio: 5/4),
-  (-webkit-min-device-pixel-ratio: 1.25),
-  (min-resolution: 120dpi) {
-
-	.spinner {
-		background-image: url(../images/spinner-2x.gif);
-	}
-
-}
--- a/wp-admin/css/install-rtl.min.css
+++ b/wp-admin/css/install-rtl.min.css
--- a/wp-admin/css/install.css
+++ b/wp-admin/css/install.css
@@ -60,11 +60,6 @@ abbr {
 	border: 0;
 	font-variant: normal;
 }
-
-label {
-	cursor: pointer;
-}
-
 #logo {
 	margin: 6px 0 14px 0;
 	border-bottom: none;
@@ -73,19 +68,19 @@ label {
 #logo a {
 	background-image: url(../images/w-logo-blue.png?ver=20131202);
 	background-image: none, url(../images/wordpress-logo.svg?ver=20131107);
-	-webkit-background-size: 84px;
-	background-size: 84px;
+	-webkit-background-size: 80px 80px;
+	background-size: 80px 80px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #999;
-	height: 84px;
+	height: 80px;
 	font-size: 20px;
 	font-weight: normal;
 	line-height: 1.3em;
 	margin: -130px auto 25px;
 	padding: 0;
 	text-decoration: none;
-	width: 84px;
+	width: 80px;
 	text-indent: -9999px;
 	outline: none;
 	overflow: hidden;
@@ -98,9 +93,7 @@ label {
 	text-align: left;
 	padding: 0;
 }
-.language-chooser.wp-core-ui .step .button.button-large {
-	height: 36px;
-	vertical-align: middle;
+.step .button-large {
 	font-size: 14px;
 }
 textarea {
@@ -159,8 +152,6 @@ submit {
 }

 .form-table input[type=text],
-.form-table input[type=email],
-.form-table input[type=url],
 .form-table input[type=password] {
 	width: 206px;
 }
@@ -304,8 +295,6 @@ body.rtl,
 	}

 	.form-table td input[type="text"],
-	.form-table td input[type="email"],
-	.form-table td input[type="url"],
 	.form-table td input[type="password"],
 	.form-table td select,
 	.form-table td textarea,
@@ -322,68 +311,3 @@ body.rtl,
 	}

 }
-
-body.language-chooser {
-	max-width: 300px;
-}
-
-.language-chooser select {
-	padding: 8px;
-	width: 100%;
-	display: block;
-	border: 1px solid #ddd;
-	background-color: #fff;
-	color: #333;
-	font-size: 16px;
-	font-family: Arial, sans-serif;
-	font-weight: normal;
-}
-
-.language-chooser p {
-	text-align: right;
-}
-
-.screen-reader-input,
-.screen-reader-text {
-	position: absolute;
-	margin: -1px;
-	padding: 0;
-	height: 1px;
-	width: 1px;
-	overflow: hidden;
-	clip: rect(0 0 0 0);
-	border: 0;
-}
-
-.spinner {
-	background: url(../images/spinner.gif) no-repeat;
-	-webkit-background-size: 20px 20px;
-	background-size: 20px 20px;
-	visibility: hidden;
-	opacity: 0.7;
-	filter: alpha(opacity=70);
-	width: 20px;
-	height: 20px;
-	margin: 2px 5px 0;
-}
-
-.step .spinner {
-	display: inline-block;
-	margin-top: 8px;
-	margin-right: 15px;
-	vertical-align: top;
-}
-
-/**
- * HiDPI Displays
- */
-@media print,
-  (-o-min-device-pixel-ratio: 5/4),
-  (-webkit-min-device-pixel-ratio: 1.25),
-  (min-resolution: 120dpi) {
-
-	.spinner {
-		background-image: url(../images/spinner-2x.gif);
-	}
-
-}
--- a/wp-admin/css/install.min.css
+++ b/wp-admin/css/install.min.css
--- a/wp-admin/css/l10n-rtl.css
+++ b/wp-admin/css/l10n-rtl.css
@@ -44,7 +44,7 @@ body.locale-he-il .press-this a.wp-switch-editor {
 /* zn_CH: Enlarge font size, set font-size: normal */
 .locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; }

-/* Zn_CH: Distraction-free writing.
+/* Zn_CH: Distraction free writing.
 *  More beautiful font for "Just write."
 *  Larger text for HTML/Visual mode.
 */
@@ -75,8 +75,7 @@ body.locale-he-il .press-this a.wp-switch-editor {
 .locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap {
 	margin-right: 8em; /* default 5em */
 }
-.locale-ru-ru.post-php .tagsdiv .newtag,
-.locale-ru-ru.post-new-php .tagsdiv .newtag {
+.locale-ru-ru.post-php .tagsdiv .newtag {
 	width: 165px; /* default 180px - 15px */
 }
 .locale-ru-ru.press-this .posting {
--- a/wp-admin/css/l10n.css
+++ b/wp-admin/css/l10n.css
@@ -44,7 +44,7 @@ body.locale-he-il .press-this a.wp-switch-editor {
 /* zn_CH: Enlarge font size, set font-size: normal */
 .locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; }

-/* Zn_CH: Distraction-free writing.
+/* Zn_CH: Distraction free writing.
 *  More beautiful font for "Just write."
 *  Larger text for HTML/Visual mode.
 */
@@ -75,8 +75,7 @@ body.locale-he-il .press-this a.wp-switch-editor {
 .locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap {
 	margin-left: 8em; /* default 5em */
 }
-.locale-ru-ru.post-php .tagsdiv .newtag,
-.locale-ru-ru.post-new-php .tagsdiv .newtag {
+.locale-ru-ru.post-php .tagsdiv .newtag {
 	width: 165px; /* default 180px - 15px */
 }
 .locale-ru-ru.press-this .posting {
--- a/wp-admin/css/list-tables-rtl.css
+++ b/wp-admin/css/list-tables-rtl.css
@@ -263,10 +263,6 @@ table.fixed {
 	width: 10%;
 }

-.fixed .column-posts {
-    width: 74px;
-}
-
 .fixed .column-comment .comment-author {
 	display: none;
 }
@@ -595,11 +591,6 @@ th.asc:hover span.sorting-indicator {
 	padding: 2px 0 0 8px;
 }

-.wp-filter .actions {
-	display: inline-block;
-	vertical-align: middle;
-}
-
 .tablenav .delete {
 	margin-left: 20px;
 }
@@ -622,16 +613,13 @@ classes exist in paginate_links() but not seen in list table output. */
 	color: #2ea2cc;
 }

-.tablenav .view-switch {
+.view-switch {
 	float: left;
 	margin: 5px 8px 0 16px;
 }

-.wp-filter .view-switch {
-	display: inline-block;
-	vertical-align: middle;
-	padding: 15px 0;
-	margin: 0 0 0 20px;
+.view-switch img {
+	display: none;
 }

 .view-switch a {
@@ -646,6 +634,7 @@ classes exist in paginate_links() but not seen in list table output. */

 .view-switch > a:before {
 	color: #bbb;
+	content: '\f163';
 	display: inline-block;
 	float: right;
 	font: normal 20px/1 'dashicons';
@@ -656,10 +645,6 @@ classes exist in paginate_links() but not seen in list table output. */
 	-moz-osx-font-smoothing: grayscale;
 }

-.view-switch > .view-list:before {
-	content: '\f163';
-}
-
 .view-switch a:hover:before {
 	color: #727272;
 }
@@ -668,18 +653,11 @@ classes exist in paginate_links() but not seen in list table output. */
 	color: #0074a2;
 }

-.view-switch > a + a {
+.view-switch > a + a:before {
 	margin-right: 5px;
-}
-
-.view-switch > .view-excerpt:before {
 	content: '\f164';
 }

-.view-switch > .view-grid:before {
-	content: '\f509';
-}
-
 .filter {
 	float: right;
 	margin: -5px 10px 0 0;
@@ -693,10 +671,6 @@ classes exist in paginate_links() but not seen in list table output. */
 	width: 4em;
 }

-#posts-filter .wp-filter {
-	margin-bottom: 0;
-}
-
 #posts-filter fieldset {
 	float: right;
 	margin: 0 0 1em 1.5ex;
@@ -1227,210 +1201,10 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 	background-color: #fcf3ef;
 }

-.plugin-install-php h3 {
-	clear: both;
-}
-
 .plugin-install-php h4 {
 	margin: 2.5em 0 8px;
 }

-.plugin-install-php .wp-filter {
-	margin-bottom: 0;
-}
-
-/* Plugin card table view */
-.plugin-group {
-	overflow: hidden; /* clearfix */
-	margin-top: 1.5em;
-}
-
-.plugin-group h3 {
-	margin-top: 0;
-}
-
-.plugin-card {
-	float: right;
-	margin: 0 8px 16px;
-	width: 48.5%;
-	width: -webkit-calc( 50% - 8px );
-	width: calc( 50% - 8px );
-	background-color: #fff;
-	border: 1px solid #dedede;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
-
-.plugin-card:nth-child(odd) {
-	clear: both;
-	margin-right: 0;
-}
-
-.plugin-card:nth-child(even) {
-	margin-left: 0;
-}
-
-@media screen and ( min-width: 1600px ) {
-	.plugin-card {
-		width: 30%;
-		width: -webkit-calc( 33.1% - 8px );
-		width: calc( 33.1% - 8px );
-	}
-
-	.plugin-card:nth-child(odd) {
-		clear: none;
-		margin-right: 8px;
-	}
-
-	.plugin-card:nth-child(even) {
-		margin-left: 8px;
-	}
-
-	.plugin-card:nth-child(3n+1) {
-		clear: both;
-		margin-right: 0;
-	}
-
-	.plugin-card:nth-child(3n) {
-		margin-left: 0;
-	}
-}
-
-@media screen and ( max-width: 782px ) {
-	.plugin-card {
-		margin-right: 0;
-		margin-left: 0;
-		width: 100%;
-	}
-}
-
-.plugin-card-top {
-	position: relative;
-	padding: 20px 20px 10px;
-	min-height: 135px;
-}
-
-div.action-links,
-.plugin-action-buttons {
-	margin: 0; /* Override existing margins */
-}
-
-.plugin-card h4 {
-	margin: 0 0 12px;
-	font-size: 18px;
-	line-height: 1.3;
-}
-
-.plugin-card .name,
-.plugin-card .desc {
-	margin-right: 148px; /* icon + margin */
-	margin-left: 120px; /* action links */
-}
-
-.plugin-card .action-links {
-	position: absolute;
-	top: 20px;
-	left: 20px;
-	width: 120px;
-}
-
-.plugin-action-buttons {
-	clear: left;
-	float: left;
-	margin-right: 2em;
-	margin-bottom: 1em;
-	text-align: left;
-}
-
-.plugin-action-buttons li {
-	margin-bottom: 10px;
-}
-
-.plugin-card-bottom {
-	clear: both;
-	padding: 12px 20px;
-	background-color: #fafafa;
-	border-top: 1px solid #dedede;
-	overflow: hidden;
-}
-
-.plugin-card-bottom .star-rating {
-	display: inline;
-}
-
-.plugin-card .column-rating {
-	line-height: 23px;
-}
-
-.plugin-card .column-rating,
-.plugin-card .column-updated {
-	margin-bottom: 4px;
-}
-
-.plugin-card .column-rating,
-.plugin-card .column-downloaded {
-	float: right;
-	clear: right;
-	max-width: 180px;
-}
-
-.plugin-card .column-updated,
-.plugin-card .column-compatibility {
-	text-align: left;
-	float: left;
-	clear: left;
-	width: 65%;
-	width: -webkit-calc( 100% - 180px );
-	width: calc( 100% - 180px );
-}
-
-.plugin-card .column-compatibility span:before {
-	font: normal 20px/.5 'dashicons';
-	speak: none;
-	display: inline-block;
-	padding: 0;
-	top: 4px;
-	right: -2px;
-	position: relative;
-	vertical-align: top;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	text-decoration: none !important;
-	color: #444;
-}
-
-.plugin-card .compatibility-incompatible:before {
-	content: '\f158';
-}
-
-.plugin-card .compatibility-compatible:before {
-	content: '\f147';
-}
-
-.plugin-icon {
-	position: absolute;
-	top: 20px;
-	right: 20px;
-	width: 128px;
-	height: 128px;
-	margin: 0 0 20px 20px;
-}
-
-.plugin-icon img {
-	width: 128px;
-	height: 128px;
-}
-
-.no-plugin-results {
-	color: #999;
-	font-size: 18px;
-	font-style: normal;
-	margin: 0;
-	padding: 100px 0 0;
-	text-align: center;
-}
-
 /* ms */
 /* Background Color for Site Status */
 .wp-list-table .site-deleted {
@@ -1449,38 +1223,9 @@ div.action-links,
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 1100px ) and ( min-width: 782px ), ( max-width: 480px ) {
-	.plugin-card .action-links {
-		position: static;
-		margin-right: 148px;
-		width: auto;
-	}
-
-	.plugin-action-buttons {
-		float: none;
-		margin: 1em 0 0;
-		text-align: right;
-	}
-
-	.plugin-action-buttons li {
-		display: inline-block;
-		vertical-align: middle;
-	}
-
-	.plugin-action-buttons li .button {
-		margin-left: 20px;
-	}
-
-	.plugin-card .name,
-	.plugin-card .desc {
-		margin-left: 0;
-	}
-
-	.plugin-card .desc p:first-of-type {
-		margin-top: 0;
-	}
-}
-
+/**
+ * HiDPI Displays
+ */
@media screen and ( max-width: 782px ) {
 	/* WP List Table Options & Filters */
 	.tablenav {
@@ -1488,7 +1233,7 @@ div.action-links,
 	}

 	.tablenav.top {
-		margin: 20px 0 5px 0;
+		margin: 0;
 	}

 	.tablenav.bottom {
@@ -1504,8 +1249,7 @@ div.action-links,
 		display: block;
 	}

-	.tablenav.top .actions,
-	.tablenav .view-switch {
+	.tablenav.top .actions, .view-switch {
 		display: none;
 	}

@@ -1672,7 +1416,7 @@ div.action-links,

 	/* Taxonomies */
 	.tags .column-posts {
-		width: 74px;
+		width: 50px;
 	}

 	.tags .column-slug {
--- a/wp-admin/css/list-tables.css
+++ b/wp-admin/css/list-tables.css
@@ -263,10 +263,6 @@ table.fixed {
 	width: 10%;
 }

-.fixed .column-posts {
-    width: 74px;
-}
-
 .fixed .column-comment .comment-author {
 	display: none;
 }
@@ -595,11 +591,6 @@ th.asc:hover span.sorting-indicator {
 	padding: 2px 8px 0 0;
 }

-.wp-filter .actions {
-	display: inline-block;
-	vertical-align: middle;
-}
-
 .tablenav .delete {
 	margin-right: 20px;
 }
@@ -622,16 +613,13 @@ classes exist in paginate_links() but not seen in list table output. */
 	color: #2ea2cc;
 }

-.tablenav .view-switch {
+.view-switch {
 	float: right;
 	margin: 5px 16px 0 8px;
 }

-.wp-filter .view-switch {
-	display: inline-block;
-	vertical-align: middle;
-	padding: 15px 0;
-	margin: 0 20px 0 0;
+.view-switch img {
+	display: none;
 }

 .view-switch a {
@@ -646,6 +634,7 @@ classes exist in paginate_links() but not seen in list table output. */

 .view-switch > a:before {
 	color: #bbb;
+	content: '\f163';
 	display: inline-block;
 	float: left;
 	font: normal 20px/1 'dashicons';
@@ -656,10 +645,6 @@ classes exist in paginate_links() but not seen in list table output. */
 	-moz-osx-font-smoothing: grayscale;
 }

-.view-switch > .view-list:before {
-	content: '\f163';
-}
-
 .view-switch a:hover:before {
 	color: #727272;
 }
@@ -668,18 +653,11 @@ classes exist in paginate_links() but not seen in list table output. */
 	color: #0074a2;
 }

-.view-switch > a + a {
+.view-switch > a + a:before {
 	margin-left: 5px;
-}
-
-.view-switch > .view-excerpt:before {
 	content: '\f164';
 }

-.view-switch > .view-grid:before {
-	content: '\f509';
-}
-
 .filter {
 	float: left;
 	margin: -5px 0 0 10px;
@@ -693,10 +671,6 @@ classes exist in paginate_links() but not seen in list table output. */
 	width: 4em;
 }

-#posts-filter .wp-filter {
-	margin-bottom: 0;
-}
-
 #posts-filter fieldset {
 	float: left;
 	margin: 0 1.5ex 1em 0;
@@ -1227,210 +1201,10 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 	background-color: #fcf3ef;
 }

-.plugin-install-php h3 {
-	clear: both;
-}
-
 .plugin-install-php h4 {
 	margin: 2.5em 0 8px;
 }

-.plugin-install-php .wp-filter {
-	margin-bottom: 0;
-}
-
-/* Plugin card table view */
-.plugin-group {
-	overflow: hidden; /* clearfix */
-	margin-top: 1.5em;
-}
-
-.plugin-group h3 {
-	margin-top: 0;
-}
-
-.plugin-card {
-	float: left;
-	margin: 0 8px 16px;
-	width: 48.5%;
-	width: -webkit-calc( 50% - 8px );
-	width: calc( 50% - 8px );
-	background-color: #fff;
-	border: 1px solid #dedede;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
-
-.plugin-card:nth-child(odd) {
-	clear: both;
-	margin-left: 0;
-}
-
-.plugin-card:nth-child(even) {
-	margin-right: 0;
-}
-
-@media screen and ( min-width: 1600px ) {
-	.plugin-card {
-		width: 30%;
-		width: -webkit-calc( 33.1% - 8px );
-		width: calc( 33.1% - 8px );
-	}
-
-	.plugin-card:nth-child(odd) {
-		clear: none;
-		margin-left: 8px;
-	}
-
-	.plugin-card:nth-child(even) {
-		margin-right: 8px;
-	}
-
-	.plugin-card:nth-child(3n+1) {
-		clear: both;
-		margin-left: 0;
-	}
-
-	.plugin-card:nth-child(3n) {
-		margin-right: 0;
-	}
-}
-
-@media screen and ( max-width: 782px ) {
-	.plugin-card {
-		margin-left: 0;
-		margin-right: 0;
-		width: 100%;
-	}
-}
-
-.plugin-card-top {
-	position: relative;
-	padding: 20px 20px 10px;
-	min-height: 135px;
-}
-
-div.action-links,
-.plugin-action-buttons {
-	margin: 0; /* Override existing margins */
-}
-
-.plugin-card h4 {
-	margin: 0 0 12px;
-	font-size: 18px;
-	line-height: 1.3;
-}
-
-.plugin-card .name,
-.plugin-card .desc {
-	margin-left: 148px; /* icon + margin */
-	margin-right: 120px; /* action links */
-}
-
-.plugin-card .action-links {
-	position: absolute;
-	top: 20px;
-	right: 20px;
-	width: 120px;
-}
-
-.plugin-action-buttons {
-	clear: right;
-	float: right;
-	margin-left: 2em;
-	margin-bottom: 1em;
-	text-align: right;
-}
-
-.plugin-action-buttons li {
-	margin-bottom: 10px;
-}
-
-.plugin-card-bottom {
-	clear: both;
-	padding: 12px 20px;
-	background-color: #fafafa;
-	border-top: 1px solid #dedede;
-	overflow: hidden;
-}
-
-.plugin-card-bottom .star-rating {
-	display: inline;
-}
-
-.plugin-card .column-rating {
-	line-height: 23px;
-}
-
-.plugin-card .column-rating,
-.plugin-card .column-updated {
-	margin-bottom: 4px;
-}
-
-.plugin-card .column-rating,
-.plugin-card .column-downloaded {
-	float: left;
-	clear: left;
-	max-width: 180px;
-}
-
-.plugin-card .column-updated,
-.plugin-card .column-compatibility {
-	text-align: right;
-	float: right;
-	clear: right;
-	width: 65%;
-	width: -webkit-calc( 100% - 180px );
-	width: calc( 100% - 180px );
-}
-
-.plugin-card .column-compatibility span:before {
-	font: normal 20px/.5 'dashicons';
-	speak: none;
-	display: inline-block;
-	padding: 0;
-	top: 4px;
-	left: -2px;
-	position: relative;
-	vertical-align: top;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	text-decoration: none !important;
-	color: #444;
-}
-
-.plugin-card .compatibility-incompatible:before {
-	content: '\f158';
-}
-
-.plugin-card .compatibility-compatible:before {
-	content: '\f147';
-}
-
-.plugin-icon {
-	position: absolute;
-	top: 20px;
-	left: 20px;
-	width: 128px;
-	height: 128px;
-	margin: 0 20px 20px 0;
-}
-
-.plugin-icon img {
-	width: 128px;
-	height: 128px;
-}
-
-.no-plugin-results {
-	color: #999;
-	font-size: 18px;
-	font-style: normal;
-	margin: 0;
-	padding: 100px 0 0;
-	text-align: center;
-}
-
 /* ms */
 /* Background Color for Site Status */
 .wp-list-table .site-deleted {
@@ -1449,38 +1223,9 @@ div.action-links,
 /* =Media Queries
 -------------------------------------------------------------- */

-@media screen and ( max-width: 1100px ) and ( min-width: 782px ), ( max-width: 480px ) {
-	.plugin-card .action-links {
-		position: static;
-		margin-left: 148px;
-		width: auto;
-	}
-
-	.plugin-action-buttons {
-		float: none;
-		margin: 1em 0 0;
-		text-align: left;
-	}
-
-	.plugin-action-buttons li {
-		display: inline-block;
-		vertical-align: middle;
-	}
-
-	.plugin-action-buttons li .button {
-		margin-right: 20px;
-	}
-
-	.plugin-card .name,
-	.plugin-card .desc {
-		margin-right: 0;
-	}
-
-	.plugin-card .desc p:first-of-type {
-		margin-top: 0;
-	}
-}
-
+/**
+ * HiDPI Displays
+ */
@media screen and ( max-width: 782px ) {
 	/* WP List Table Options & Filters */
 	.tablenav {
@@ -1488,7 +1233,7 @@ div.action-links,
 	}

 	.tablenav.top {
-		margin: 20px 0 5px 0;
+		margin: 0;
 	}

 	.tablenav.bottom {
@@ -1504,8 +1249,7 @@ div.action-links,
 		display: block;
 	}

-	.tablenav.top .actions,
-	.tablenav .view-switch {
+	.tablenav.top .actions, .view-switch {
 		display: none;
 	}

@@ -1672,7 +1416,7 @@ div.action-links,

 	/* Taxonomies */
 	.tags .column-posts {
-		width: 74px;
+		width: 50px;
 	}

 	.tags .column-slug {
--- a/wp-admin/css/login-rtl.css
+++ b/wp-admin/css/login-rtl.css
@@ -1,5 +1,5 @@
-@import url(forms-rtl.css);
-@import url(l10n-rtl.css);
+@import url(forms.css);
+@import url(l10n.css);

 html,
 body {
@@ -54,7 +54,7 @@ p {
 }

 .login .message {
-	border-right: 4px solid #2ea2cc;
+	border-right: 4px solid #7ad03a;
 	padding: 1px 12px;
 	background-color: #fff;
 	-webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
@@ -126,19 +126,19 @@ p {
 .login h1 a {
 	background-image: url(../images/w-logo-blue.png?ver=20131202);
 	background-image: none, url(../images/wordpress-logo.svg?ver=20131107);
-	-webkit-background-size: 84px;
-	background-size: 84px;
+	-webkit-background-size: 80px 80px;
+	background-size: 80px 80px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #999;
-	height: 84px;
+	height: 80px;
 	font-size: 20px;
 	font-weight: normal;
 	line-height: 1.3em;
 	margin: 0 auto 25px;
 	padding: 0;
 	text-decoration: none;
-	width: 84px;
+	width: 80px;
 	text-indent: -9999px;
 	outline: none;
 	overflow: hidden;
@@ -186,6 +186,7 @@ p {
 .login form .input,
 .login input[type="text"] {
 	font-size: 24px;
+	line-height: 1;
 	width: 100%;
 	padding: 3px;
 	margin: 2px 0 16px 6px;
@@ -266,4 +267,4 @@ body.interim-login {
 		font: normal 21px/1 'dashicons';
 		margin: -3px -4px 0 0;
 	}
-}
+}
--- a/wp-admin/css/login-rtl.min.css
+++ b/wp-admin/css/login-rtl.min.css
--- a/wp-admin/css/login.css
+++ b/wp-admin/css/login.css
@@ -54,7 +54,7 @@ p {
 }

 .login .message {
-	border-left: 4px solid #2ea2cc;
+	border-left: 4px solid #7ad03a;
 	padding: 1px 12px;
 	background-color: #fff;
 	-webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
@@ -126,19 +126,19 @@ p {
 .login h1 a {
 	background-image: url(../images/w-logo-blue.png?ver=20131202);
 	background-image: none, url(../images/wordpress-logo.svg?ver=20131107);
-	-webkit-background-size: 84px;
-	background-size: 84px;
+	-webkit-background-size: 80px 80px;
+	background-size: 80px 80px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #999;
-	height: 84px;
+	height: 80px;
 	font-size: 20px;
 	font-weight: normal;
 	line-height: 1.3em;
 	margin: 0 auto 25px;
 	padding: 0;
 	text-decoration: none;
-	width: 84px;
+	width: 80px;
 	text-indent: -9999px;
 	outline: none;
 	overflow: hidden;
@@ -186,6 +186,7 @@ p {
 .login form .input,
 .login input[type="text"] {
 	font-size: 24px;
+	line-height: 1;
 	width: 100%;
 	padding: 3px;
 	margin: 2px 6px 16px 0;
@@ -266,4 +267,4 @@ body.interim-login {
 		font: normal 21px/1 'dashicons';
 		margin: -3px 0 0 -4px;
 	}
-}
+}
--- a/wp-admin/css/login.min.css
+++ b/wp-admin/css/login.min.css
--- a/wp-admin/css/media-rtl.css
+++ b/wp-admin/css/media-rtl.css
@@ -102,7 +102,6 @@
 	display: block;
 	line-height: 36px;
 	float: left;
-	margin-left: 10px;
 }

 .media-item .describe-toggle-off,
@@ -114,18 +113,19 @@
 	display: block;
 }

-.media-upload-form .media-item {
+#media-items .media-item {
+	border-bottom: 1px solid #dfdfdf;
 	min-height: 36px;
-	margin-bottom: 1px;
 	position: relative;
 	width: 100%;
-	background: #fff;
 }

-.media-upload-form .media-item,
-.media-upload-form .media-item .error {
-	-webkit-box-shadow: 0 1px 0 #dfdfdf;
-	box-shadow: 0 1px 0 #dfdfdf;
+#media-items {
+	width: 623px;
+}
+
+.media-new-php #media-items {
+	margin: 1em 0;
 }

 #media-items:empty {
@@ -135,12 +135,15 @@
 .media-item .filename {
 	line-height: 36px;
 	overflow: hidden;
-	margin-right: 6px;
+}
+
+.media-item .error-div {
+	padding-right: 10px;
 }

 .media-item .pinkynail {
 	float: right;
-	margin: 2px 3px 0 10px;
+	margin: 2px 0 0 10px;
 	max-width: 40px;
 	max-height: 32px;
 }
@@ -158,16 +161,17 @@
 .media-item .progress {
 	float: left;
 	height: 22px;
-	margin: 7px 6px;
+	margin: 7px 0 0;
 	width: 200px;
 	line-height: 2em;
 	padding: 0;
 	overflow: hidden;
+	margin-bottom: 2px;
 	-webkit-border-radius: 22px;
 	border-radius: 22px;
 	background: #ddd;
-	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
-	box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-webkit-box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
+	box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
 }

 .media-item .bar {
@@ -191,7 +195,7 @@
 	text-align: center;
 	line-height: 22px;
 	font-weight: 400;
-	text-shadow: 0 1px 2px rgba(0,0,0,0.2);
+	text-shadow: 0px 1px 2px rgba(0,0,0,0.2);
 }

 .upload-php .fixed .column-parent {
@@ -206,20 +210,22 @@
 	display: block;
 }

-.media-upload-form .media-item.error,
-.media-upload-form .media-item .error {
-	width: auto;
-	margin: 0 0 1px 0;
+.media-upload-form .media-item.error {
+	margin: 0;
+	padding: 0;
 }

-.media-upload-form .media-item .error {
-	padding: 10px 14px 10px 0;
+.media-upload-form .media-item.error p,
+.media-item .error-div {
+	line-height: 16px;
+	margin: 5px 10px;
+	padding: 0;
 }

 .media-item .error-div a.dismiss {
 	display: block;
 	float: left;
-	margin: 0 15px 0 10px;
+	margin: 5px 15px 0 4px;
 }

 /*------------------------------------------------------------------------------
@@ -274,14 +280,9 @@

 .find-box-search .spinner {
 	float: none;
-	right: 110px;
+	right: 125px;
 	position: absolute;
-	top: 2px;
-}
-
-.find-box-search,
-#find-posts-response {
-	position: relative; /* RTL fix, #WP28010 */
+	top: 18px;
 }

 #find-posts-input,
@@ -432,390 +433,6 @@ border color while dragging a file over the uploader drop area */
 	position: relative;
 }

-/**
- * Media Library grid view
- */
-
-.media-frame.mode-grid,
-.media-frame.mode-grid .media-frame-content,
-.media-frame.mode-grid .attachments-browser .attachments,
-.media-frame.mode-grid .uploader-inline-content {
-	position: static;
-}
-
-/* Regions we don't use at all */
-.media-frame.mode-grid .media-frame-title,
-.media-frame.mode-grid .media-frame-router,
-.media-frame.mode-grid .media-frame-menu {
-	display: none;
-}
-
-.media-frame.mode-grid .media-frame-content {
-	background-color: transparent;
-	border: none;
-}
-
-.upload-php .mode-grid .media-sidebar {
-	position: relative;
-	width: auto;
-	margin-bottom: 16px;
-	padding: 0 16px;
-	border: 1px solid #c00;
-	background-color: #feebe8;
-}
-
-.upload-php .mode-grid .hide-sidebar .media-sidebar {
-	display: none;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status {
-	border-bottom: none;
-	padding-bottom: 0;
-	max-width: 100%;
-}
-
-.upload-php .mode-grid .media-sidebar .upload-error {
-	margin: 20px 0;
-	padding: 0;
-	border: none;
-	background: none;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors {
-	font-size: 0;
-	top: -12px;
-	left: -10px;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before {
-	content: "\f158";
-	font: normal 20px/1 dashicons;
-	color: #666;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before,
-.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before {
-	color: #2ea2cc;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3 {
-	display: none;
-}
-
-.media-frame.mode-grid .uploader-inline {
-	position: relative;
-	top: auto;
-	left: auto;
-	right: auto;
-	bottom: auto;
-	padding-top: 0;
-	margin-top: 0;
-	border: 4px dashed #bbb;
-}
-
-.media-frame.mode-select .attachments-browser.fixed .attachments {
-	position: relative;
-	top: 94px; /* prevent jumping up when the toolbar becomes fixed */
-	padding-bottom: 94px; /* offset for above so the bottom doesn't get cut off */
-}
-
-.media-frame.mode-grid .attachment:focus,
-.media-frame.mode-grid .selected.attachment:focus,
-.media-frame.mode-grid .attachment.details:focus {
-	-webkit-box-shadow:
-		inset 0 0 2px 3px #f1f1f1,
-		inset 0 0 0 7px #5b9dd9;
-	box-shadow:
-		inset 0 0 2px 3px #f1f1f1,
-		inset 0 0 0 7px #5b9dd9;
-	outline: none;
-}
-
-.media-frame.mode-grid .selected.attachment {
-	-webkit-box-shadow:
-		inset 0 0 0 5px #f1f1f1,
-		inset 0 0 0 7px #ccc;
-	box-shadow:
-		inset 0 0 0 5px #f1f1f1,
-		inset 0 0 0 7px #ccc;
-}
-
-.media-frame.mode-grid .attachment.details {
-	-webkit-box-shadow:
-		inset 0 0 0 3px #f1f1f1,
-		inset 0 0 0 7px #1e8cbe;
-	box-shadow:
-		inset 0 0 0 3px #f1f1f1,
-		inset 0 0 0 7px #1e8cbe;
-}
-
-.media-frame.mode-grid.mode-select .attachment .thumbnail {
-	opacity: 0.65;
-}
-
-.media-frame.mode-select .attachment.selected .thumbnail {
-	opacity: 1;
-}
-
-.media-frame.mode-grid .media-toolbar {
-	margin-bottom: 15px;
-	height: auto;
-}
-
-.media-frame.mode-grid .media-toolbar select {
-	margin: 0 0 0 10px;
-	font-size: 14px;
-}
-
-.media-frame.mode-grid .media-toolbar-secondary > .media-button {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-.media-frame.mode-grid .attachments-browser .bulk-select {
-	display: inline-block;
-	margin: 0 0 0 10px;
-}
-
-.media-frame.mode-grid .search {
-	margin-top: 0;
-}
-
-.media-frame.mode-grid .spinner {
-	margin-top: 15px;
-}
-
-.attachments-browser .media-toolbar-secondary > .media-button {
-	margin-left: 10px;
-}
-
-.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
-	position: fixed;
-	top: 32px;
-	right: auto;
-	left: 20px;
-	margin-top: 0;
-}
-
-.media-frame.mode-grid .attachments-browser {
-	padding: 0;
-}
-
-.media-frame.mode-grid .attachments-browser .attachments {
-	padding: 2px;
-}
-
-.media-frame.mode-grid .attachments-browser .no-media {
-	color: #999;
-	font-size: 18px;
-	font-style: normal;
-	margin: 0;
-	padding: 100px 0 0;
-	text-align: center;
-}
-
-/**
- * Attachment details modal
- */
-
-.edit-attachment-frame {
-	display: block;
-	height: 100%;
-	width: 100%;
-}
-
-.edit-attachment-frame .edit-media-header {
-	overflow: hidden;
-}
-
-.upload-php .media-modal-close .media-modal-icon:before {
-	content: '\f335';
-	font-size: 22px;
-}
-
-.upload-php .media-modal-close .media-modal-icon {
-	margin: 14px;
-	width: 22px;
-}
-
-.upload-php .media-modal-close,
-.edit-attachment-frame .edit-media-header .left,
-.edit-attachment-frame .edit-media-header .right {
-	cursor: pointer;
-	color: #777;
-	background-color: transparent;
-	height: 50px;
-	width: 50px;
-	padding: 0;
-	position: absolute;
-	text-align: center;
-	border: 0;
-	border-right: 1px solid #ddd;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-    transition: color .1s ease-in-out, background .1s ease-in-out;
-}
-
-.upload-php .media-modal-close {
-	top: 0;
-	left: 0;
-}
-
-.edit-attachment-frame .edit-media-header .left {
-	left: 102px;
-}
-
-.edit-attachment-frame .edit-media-header .right {
-	left: 51px;
-}
-
-.edit-attachment-frame .media-frame-title {
-	right: 0;
-	left: 150px; /* leave space for prev/next/close */
-}
-
-.edit-attachment-frame .edit-media-header .right:before,
-.edit-attachment-frame .edit-media-header .left:before {
-	font: normal 20px/50px 'dashicons' !important;
-	display: inline;
-	font-weight: 300;
-}
-
-.upload-php .media-modal-close:hover,
-.upload-php .media-modal-close:focus,
-.edit-attachment-frame .edit-media-header .left:hover,
-.edit-attachment-frame .edit-media-header .right:hover,
-.edit-attachment-frame .edit-media-header .left:focus,
-.edit-attachment-frame .edit-media-header .right:focus {
-	background: #ddd;
-	border-color: #ccc;
-	color: #000;
-	outline: none;
-}
-
-.upload-php .media-modal-close:focus .media-modal-icon:before,
-.upload-php .media-modal-close:hover .media-modal-icon:before {
-	color: #000;
-}
-
-.edit-attachment-frame .edit-media-header .left:before,
-.rtl .edit-attachment-frame .edit-media-header .right:before {
-	content: '\f341';
-}
-
-.edit-attachment-frame .edit-media-header .right:before,
-.rtl .edit-attachment-frame .edit-media-header .left:before {
-	content: '\f345';
-}
-
-.edit-attachment-frame .edit-media-header .left.disabled,
-.edit-attachment-frame .edit-media-header .right.disabled,
-.edit-attachment-frame .edit-media-header .left.disabled:hover,
-.edit-attachment-frame .edit-media-header .right.disabled:hover {
-	color: #ccc;
-	background: inherit;
-	cursor: default;
-	pointer-events: none;
-}
-
-.edit-attachment-frame .media-frame-content,
-.edit-attachment-frame .media-frame-router {
-	right: 0;
-}
-
-.edit-attachment-frame .media-frame-content {
-	border-bottom: none;
-	bottom: 0;
-	top: 50px;
-}
-
-.edit-attachment-frame .attachment-details {
-	position: absolute;
-	overflow: auto;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	-webkit-box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
-	box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
-}
-
-.edit-attachment-frame .attachment-media-view {
-	float: right;
-	width: 65%;
-	height: 100%;
-}
-
-.edit-attachment-frame .attachment-media-view .thumbnail {
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	padding: 16px;
-	height: 100%;
-}
-
-.edit-attachment-frame .attachment-media-view .details-image {
-	display: block;
-	margin-bottom: 16px;
-	max-width: 100%;
-	max-height: 90%;
-	max-height: -webkit-calc( 100% - 42px );
-	max-height: calc( 100% - 42px ); /* leave space for actions underneath */
-}
-
-.edit-attachment-frame .wp-media-wrapper {
-	margin-bottom: 12px;
-}
-
-.edit-attachment-frame input,
-.edit-attachment-frame textarea {
-	padding: 6px 8px;
-	line-height: 16px;
-}
-
-.edit-attachment-frame .attachment-info {
-	overflow: auto;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	margin-bottom: 0;
-	padding: 12px 16px 0;
-	width: 35%;
-	height: 100%;
-	-webkit-box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
-	box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
-	border-bottom: 0;
-	border-right: 1px solid #ddd;
-	background: #f3f3f3;
-}
-
-.edit-attachment-frame .attachment-info .details,
-.edit-attachment-frame .attachment-info .settings {
-	position: relative; /* RTL fix, #WP29352 */
-	overflow: hidden;
-	float: none;
-	margin-bottom: 15px;
-	padding-bottom: 15px;
-	border-bottom: 1px solid #ddd;
-}
-
-.edit-attachment-frame .attachment-info .filename {
-	font-weight: normal;
-	color: #666;
-}
-
-.edit-attachment-frame .attachment-info .thumbnail {
-	margin-bottom: 12px;
-}
-
-.attachment-info .actions {
-	margin-bottom: 16px;
-}
-
-.attachment-info .actions a {
-	display: inline;
-	text-decoration: none;
-}
-

 /*------------------------------------------------------------------------------
  14.2 - Image Editor
@@ -890,7 +507,7 @@ border color while dragging a file over the uploader drop area */
 }

 .media-disabled,
-.imgedit-settings .disabled {
+.imgedit-settings .disabled  {
 	color: grey;
 }

@@ -1082,7 +699,6 @@ audio, video {

 .mejs-container {
 	width: 100%;
-	max-width: 100%;
 }

 /* =Media Queries
@@ -1105,93 +721,4 @@ audio, video {
 		font-size: 14px;
 		line-height: 1.5em;
 	}
-
-	.media-upload-form .media-item.error,
-	.media-upload-form .media-item .error {
-		font-size: 13px;
-		line-height: 1.5;
-	}
-
-	.media-upload-form .media-item.error {
-		padding: 1px 10px;
-	}
-
-	.media-upload-form .media-item .error {
-		padding: 10px 12px 10px 0;
-	}
-}
-
-/**
- * Media queries for media grid.
- */
-
-@media only screen and (max-width: 1120px) {
-	/* override for media-views.css */
-	#wp-media-grid .wp-filter .attachment-filters {
-		max-width: 100%;
-	}
-}
-
-@media only screen and ( max-width: 782px ) {
-	.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
-		top: 46px;
-		left: 10px;
-	}
-}
-
-@media only screen and (max-width: 600px) {
-	.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
-		top: 0;
-	}
-}
-
-@media only screen and (max-width: 480px) {
-	.edit-attachment-frame .media-frame-title {
-		left: 110px;
-	}
-
-	.upload-php .media-modal-close,
-	.edit-attachment-frame .edit-media-header .left,
-	.edit-attachment-frame .edit-media-header .right {
-		width: 40px;
-		height: 40px;
-	}
-
-	.upload-php .media-modal-close .media-modal-icon {
-		margin: 9px 10px;
-	}
-
-	.edit-attachment-frame .edit-media-header .right:before,
-	.edit-attachment-frame .edit-media-header .left:before {
-		line-height: 40px !important;
-	}
-
-	.edit-attachment-frame .edit-media-header .left {
-		left: 82px;
-	}
-
-	.edit-attachment-frame .edit-media-header .right {
-		left: 41px;
-	}
-
-	.edit-attachment-frame .media-frame-content {
-		top: 40px;
-	}
-
-	.edit-attachment-frame .attachment-media-view {
-		float: none;
-		height: auto;
-		width: 100%;
-	}
-
-	.edit-attachment-frame .attachment-info {
-		height: auto;
-		width: 100%;
-	}
-}
-
-@media only screen and (max-width: 640px), screen and (max-height: 400px) {
-	.upload-php .mode-grid .media-sidebar{
-		max-width: 100%;
-	}
 }
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -102,7 +102,6 @@
 	display: block;
 	line-height: 36px;
 	float: right;
-	margin-right: 10px;
 }

 .media-item .describe-toggle-off,
@@ -114,18 +113,19 @@
 	display: block;
 }

-.media-upload-form .media-item {
+#media-items .media-item {
+	border-bottom: 1px solid #dfdfdf;
 	min-height: 36px;
-	margin-bottom: 1px;
 	position: relative;
 	width: 100%;
-	background: #fff;
 }

-.media-upload-form .media-item,
-.media-upload-form .media-item .error {
-	-webkit-box-shadow: 0 1px 0 #dfdfdf;
-	box-shadow: 0 1px 0 #dfdfdf;
+#media-items {
+	width: 623px;
+}
+
+.media-new-php #media-items {
+	margin: 1em 0;
 }

 #media-items:empty {
@@ -135,12 +135,15 @@
 .media-item .filename {
 	line-height: 36px;
 	overflow: hidden;
-	margin-left: 6px;
+}
+
+.media-item .error-div {
+	padding-left: 10px;
 }

 .media-item .pinkynail {
 	float: left;
-	margin: 2px 10px 0 3px;
+	margin: 2px 10px 0 0;
 	max-width: 40px;
 	max-height: 32px;
 }
@@ -158,16 +161,17 @@
 .media-item .progress {
 	float: right;
 	height: 22px;
-	margin: 7px 6px;
+	margin: 7px 0 0;
 	width: 200px;
 	line-height: 2em;
 	padding: 0;
 	overflow: hidden;
+	margin-bottom: 2px;
 	-webkit-border-radius: 22px;
 	border-radius: 22px;
 	background: #ddd;
-	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
-	box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-webkit-box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
+	box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
 }

 .media-item .bar {
@@ -191,7 +195,7 @@
 	text-align: center;
 	line-height: 22px;
 	font-weight: 400;
-	text-shadow: 0 1px 2px rgba(0,0,0,0.2);
+	text-shadow: 0px 1px 2px rgba(0,0,0,0.2);
 }

 .upload-php .fixed .column-parent {
@@ -206,20 +210,22 @@
 	display: block;
 }

-.media-upload-form .media-item.error,
-.media-upload-form .media-item .error {
-	width: auto;
-	margin: 0 0 1px 0;
+.media-upload-form .media-item.error {
+	margin: 0;
+	padding: 0;
 }

-.media-upload-form .media-item .error {
-	padding: 10px 0 10px 14px;
+.media-upload-form .media-item.error p,
+.media-item .error-div {
+	line-height: 16px;
+	margin: 5px 10px;
+	padding: 0;
 }

 .media-item .error-div a.dismiss {
 	display: block;
 	float: right;
-	margin: 0 10px 0 15px;
+	margin: 5px 4px 0 15px;
 }

 /*------------------------------------------------------------------------------
@@ -274,14 +280,9 @@

 .find-box-search .spinner {
 	float: none;
-	left: 110px;
+	left: 125px;
 	position: absolute;
-	top: 2px;
-}
-
-.find-box-search,
-#find-posts-response {
-	position: relative; /* RTL fix, #WP28010 */
+	top: 18px;
 }

 #find-posts-input,
@@ -432,390 +433,6 @@ border color while dragging a file over the uploader drop area */
 	position: relative;
 }

-/**
- * Media Library grid view
- */
-
-.media-frame.mode-grid,
-.media-frame.mode-grid .media-frame-content,
-.media-frame.mode-grid .attachments-browser .attachments,
-.media-frame.mode-grid .uploader-inline-content {
-	position: static;
-}
-
-/* Regions we don't use at all */
-.media-frame.mode-grid .media-frame-title,
-.media-frame.mode-grid .media-frame-router,
-.media-frame.mode-grid .media-frame-menu {
-	display: none;
-}
-
-.media-frame.mode-grid .media-frame-content {
-	background-color: transparent;
-	border: none;
-}
-
-.upload-php .mode-grid .media-sidebar {
-	position: relative;
-	width: auto;
-	margin-bottom: 16px;
-	padding: 0 16px;
-	border: 1px solid #c00;
-	background-color: #feebe8;
-}
-
-.upload-php .mode-grid .hide-sidebar .media-sidebar {
-	display: none;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status {
-	border-bottom: none;
-	padding-bottom: 0;
-	max-width: 100%;
-}
-
-.upload-php .mode-grid .media-sidebar .upload-error {
-	margin: 20px 0;
-	padding: 0;
-	border: none;
-	background: none;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors {
-	font-size: 0;
-	top: -12px;
-	right: -10px;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before {
-	content: "\f158";
-	font: normal 20px/1 dashicons;
-	color: #666;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before,
-.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before {
-	color: #2ea2cc;
-}
-
-.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3 {
-	display: none;
-}
-
-.media-frame.mode-grid .uploader-inline {
-	position: relative;
-	top: auto;
-	right: auto;
-	left: auto;
-	bottom: auto;
-	padding-top: 0;
-	margin-top: 0;
-	border: 4px dashed #bbb;
-}
-
-.media-frame.mode-select .attachments-browser.fixed .attachments {
-	position: relative;
-	top: 94px; /* prevent jumping up when the toolbar becomes fixed */
-	padding-bottom: 94px; /* offset for above so the bottom doesn't get cut off */
-}
-
-.media-frame.mode-grid .attachment:focus,
-.media-frame.mode-grid .selected.attachment:focus,
-.media-frame.mode-grid .attachment.details:focus {
-	-webkit-box-shadow:
-		inset 0 0 2px 3px #f1f1f1,
-		inset 0 0 0 7px #5b9dd9;
-	box-shadow:
-		inset 0 0 2px 3px #f1f1f1,
-		inset 0 0 0 7px #5b9dd9;
-	outline: none;
-}
-
-.media-frame.mode-grid .selected.attachment {
-	-webkit-box-shadow:
-		inset 0 0 0 5px #f1f1f1,
-		inset 0 0 0 7px #ccc;
-	box-shadow:
-		inset 0 0 0 5px #f1f1f1,
-		inset 0 0 0 7px #ccc;
-}
-
-.media-frame.mode-grid .attachment.details {
-	-webkit-box-shadow:
-		inset 0 0 0 3px #f1f1f1,
-		inset 0 0 0 7px #1e8cbe;
-	box-shadow:
-		inset 0 0 0 3px #f1f1f1,
-		inset 0 0 0 7px #1e8cbe;
-}
-
-.media-frame.mode-grid.mode-select .attachment .thumbnail {
-	opacity: 0.65;
-}
-
-.media-frame.mode-select .attachment.selected .thumbnail {
-	opacity: 1;
-}
-
-.media-frame.mode-grid .media-toolbar {
-	margin-bottom: 15px;
-	height: auto;
-}
-
-.media-frame.mode-grid .media-toolbar select {
-	margin: 0 10px 0 0;
-	font-size: 14px;
-}
-
-.media-frame.mode-grid .media-toolbar-secondary > .media-button {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-.media-frame.mode-grid .attachments-browser .bulk-select {
-	display: inline-block;
-	margin: 0 10px 0 0;
-}
-
-.media-frame.mode-grid .search {
-	margin-top: 0;
-}
-
-.media-frame.mode-grid .spinner {
-	margin-top: 15px;
-}
-
-.attachments-browser .media-toolbar-secondary > .media-button {
-	margin-right: 10px;
-}
-
-.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
-	position: fixed;
-	top: 32px;
-	left: auto;
-	right: 20px;
-	margin-top: 0;
-}
-
-.media-frame.mode-grid .attachments-browser {
-	padding: 0;
-}
-
-.media-frame.mode-grid .attachments-browser .attachments {
-	padding: 2px;
-}
-
-.media-frame.mode-grid .attachments-browser .no-media {
-	color: #999;
-	font-size: 18px;
-	font-style: normal;
-	margin: 0;
-	padding: 100px 0 0;
-	text-align: center;
-}
-
-/**
- * Attachment details modal
- */
-
-.edit-attachment-frame {
-	display: block;
-	height: 100%;
-	width: 100%;
-}
-
-.edit-attachment-frame .edit-media-header {
-	overflow: hidden;
-}
-
-.upload-php .media-modal-close .media-modal-icon:before {
-	content: '\f335';
-	font-size: 22px;
-}
-
-.upload-php .media-modal-close .media-modal-icon {
-	margin: 14px;
-	width: 22px;
-}
-
-.upload-php .media-modal-close,
-.edit-attachment-frame .edit-media-header .left,
-.edit-attachment-frame .edit-media-header .right {
-	cursor: pointer;
-	color: #777;
-	background-color: transparent;
-	height: 50px;
-	width: 50px;
-	padding: 0;
-	position: absolute;
-	text-align: center;
-	border: 0;
-	border-left: 1px solid #ddd;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-    transition: color .1s ease-in-out, background .1s ease-in-out;
-}
-
-.upload-php .media-modal-close {
-	top: 0;
-	right: 0;
-}
-
-.edit-attachment-frame .edit-media-header .left {
-	right: 102px;
-}
-
-.edit-attachment-frame .edit-media-header .right {
-	right: 51px;
-}
-
-.edit-attachment-frame .media-frame-title {
-	left: 0;
-	right: 150px; /* leave space for prev/next/close */
-}
-
-.edit-attachment-frame .edit-media-header .right:before,
-.edit-attachment-frame .edit-media-header .left:before {
-	font: normal 20px/50px 'dashicons' !important;
-	display: inline;
-	font-weight: 300;
-}
-
-.upload-php .media-modal-close:hover,
-.upload-php .media-modal-close:focus,
-.edit-attachment-frame .edit-media-header .left:hover,
-.edit-attachment-frame .edit-media-header .right:hover,
-.edit-attachment-frame .edit-media-header .left:focus,
-.edit-attachment-frame .edit-media-header .right:focus {
-	background: #ddd;
-	border-color: #ccc;
-	color: #000;
-	outline: none;
-}
-
-.upload-php .media-modal-close:focus .media-modal-icon:before,
-.upload-php .media-modal-close:hover .media-modal-icon:before {
-	color: #000;
-}
-
-.edit-attachment-frame .edit-media-header .left:before,
-.rtl .edit-attachment-frame .edit-media-header .right:before {
-	content: '\f341';
-}
-
-.edit-attachment-frame .edit-media-header .right:before,
-.rtl .edit-attachment-frame .edit-media-header .left:before {
-	content: '\f345';
-}
-
-.edit-attachment-frame .edit-media-header .left.disabled,
-.edit-attachment-frame .edit-media-header .right.disabled,
-.edit-attachment-frame .edit-media-header .left.disabled:hover,
-.edit-attachment-frame .edit-media-header .right.disabled:hover {
-	color: #ccc;
-	background: inherit;
-	cursor: default;
-	pointer-events: none;
-}
-
-.edit-attachment-frame .media-frame-content,
-.edit-attachment-frame .media-frame-router {
-	left: 0;
-}
-
-.edit-attachment-frame .media-frame-content {
-	border-bottom: none;
-	bottom: 0;
-	top: 50px;
-}
-
-.edit-attachment-frame .attachment-details {
-	position: absolute;
-	overflow: auto;
-	top: 0;
-	bottom: 0;
-	right: 0;
-	left: 0;
-	-webkit-box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
-	box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
-}
-
-.edit-attachment-frame .attachment-media-view {
-	float: left;
-	width: 65%;
-	height: 100%;
-}
-
-.edit-attachment-frame .attachment-media-view .thumbnail {
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	padding: 16px;
-	height: 100%;
-}
-
-.edit-attachment-frame .attachment-media-view .details-image {
-	display: block;
-	margin-bottom: 16px;
-	max-width: 100%;
-	max-height: 90%;
-	max-height: -webkit-calc( 100% - 42px );
-	max-height: calc( 100% - 42px ); /* leave space for actions underneath */
-}
-
-.edit-attachment-frame .wp-media-wrapper {
-	margin-bottom: 12px;
-}
-
-.edit-attachment-frame input,
-.edit-attachment-frame textarea {
-	padding: 6px 8px;
-	line-height: 16px;
-}
-
-.edit-attachment-frame .attachment-info {
-	overflow: auto;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	margin-bottom: 0;
-	padding: 12px 16px 0;
-	width: 35%;
-	height: 100%;
-	-webkit-box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
-	box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
-	border-bottom: 0;
-	border-left: 1px solid #ddd;
-	background: #f3f3f3;
-}
-
-.edit-attachment-frame .attachment-info .details,
-.edit-attachment-frame .attachment-info .settings {
-	position: relative; /* RTL fix, #WP29352 */
-	overflow: hidden;
-	float: none;
-	margin-bottom: 15px;
-	padding-bottom: 15px;
-	border-bottom: 1px solid #ddd;
-}
-
-.edit-attachment-frame .attachment-info .filename {
-	font-weight: normal;
-	color: #666;
-}
-
-.edit-attachment-frame .attachment-info .thumbnail {
-	margin-bottom: 12px;
-}
-
-.attachment-info .actions {
-	margin-bottom: 16px;
-}
-
-.attachment-info .actions a {
-	display: inline;
-	text-decoration: none;
-}
-

 /*------------------------------------------------------------------------------
  14.2 - Image Editor
@@ -890,7 +507,7 @@ border color while dragging a file over the uploader drop area */
 }

 .media-disabled,
-.imgedit-settings .disabled {
+.imgedit-settings .disabled  {
 	color: grey;
 }

@@ -1082,7 +699,6 @@ audio, video {

 .mejs-container {
 	width: 100%;
-	max-width: 100%;
 }

 /* =Media Queries
@@ -1105,93 +721,4 @@ audio, video {
 		font-size: 14px;
 		line-height: 1.5em;
 	}
-
-	.media-upload-form .media-item.error,
-	.media-upload-form .media-item .error {
-		font-size: 13px;
-		line-height: 1.5;
-	}
-
-	.media-upload-form .media-item.error {
-		padding: 1px 10px;
-	}
-
-	.media-upload-form .media-item .error {
-		padding: 10px 0 10px 12px;
-	}
-}
-
-/**
- * Media queries for media grid.
- */
-
-@media only screen and (max-width: 1120px) {
-	/* override for media-views.css */
-	#wp-media-grid .wp-filter .attachment-filters {
-		max-width: 100%;
-	}
-}
-
-@media only screen and ( max-width: 782px ) {
-	.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
-		top: 46px;
-		right: 10px;
-	}
-}
-
-@media only screen and (max-width: 600px) {
-	.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
-		top: 0;
-	}
-}
-
-@media only screen and (max-width: 480px) {
-	.edit-attachment-frame .media-frame-title {
-		right: 110px;
-	}
-
-	.upload-php .media-modal-close,
-	.edit-attachment-frame .edit-media-header .left,
-	.edit-attachment-frame .edit-media-header .right {
-		width: 40px;
-		height: 40px;
-	}
-
-	.upload-php .media-modal-close .media-modal-icon {
-		margin: 9px 10px;
-	}
-
-	.edit-attachment-frame .edit-media-header .right:before,
-	.edit-attachment-frame .edit-media-header .left:before {
-		line-height: 40px !important;
-	}
-
-	.edit-attachment-frame .edit-media-header .left {
-		right: 82px;
-	}
-
-	.edit-attachment-frame .edit-media-header .right {
-		right: 41px;
-	}
-
-	.edit-attachment-frame .media-frame-content {
-		top: 40px;
-	}
-
-	.edit-attachment-frame .attachment-media-view {
-		float: none;
-		height: auto;
-		width: 100%;
-	}
-
-	.edit-attachment-frame .attachment-info {
-		height: auto;
-		width: 100%;
-	}
-}
-
-@media only screen and (max-width: 640px), screen and (max-height: 400px) {
-	.upload-php .mode-grid .media-sidebar{
-		max-width: 100%;
-	}
 }
--- a/wp-admin/css/nav-menus-rtl.css
+++ b/wp-admin/css/nav-menus-rtl.css
@@ -471,7 +471,6 @@ ul.add-menu-item-tabs li {
 	position: relative;
 	padding: 10px 15px;
 	height: auto;
-	min-height: 20px;
 	width: 382px;
 	line-height: 30px;
 	overflow: hidden;
@@ -508,10 +507,6 @@ ul.add-menu-item-tabs li {
 	margin-left: 13em;
 }

-.menu-item-handle .menu-item-title.no-title {
-	color: #999;
-}
-
 /* Sortables */
 li.menu-item.ui-sortable-helper dl {
 	margin-top: 0;
@@ -527,7 +522,7 @@ li.menu-item.ui-sortable-helper .menu-item-transport dl {
 	margin-top: 13px;
 }

-/* WARNING: The factor of 30px is hardcoded into the nav-menus JavaScript. */
+/* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */
 .menu-item-depth-0 { margin-right: 0px; }
 .menu-item-depth-1 { margin-right: 30px; }
 .menu-item-depth-2 { margin-right: 60px; }
--- a/wp-admin/css/nav-menus.css
+++ b/wp-admin/css/nav-menus.css
@@ -471,7 +471,6 @@ ul.add-menu-item-tabs li {
 	position: relative;
 	padding: 10px 15px;
 	height: auto;
-	min-height: 20px;
 	width: 382px;
 	line-height: 30px;
 	overflow: hidden;
@@ -508,10 +507,6 @@ ul.add-menu-item-tabs li {
 	margin-right: 13em;
 }

-.menu-item-handle .menu-item-title.no-title {
-	color: #999;
-}
-
 /* Sortables */
 li.menu-item.ui-sortable-helper dl {
 	margin-top: 0;
@@ -527,7 +522,7 @@ li.menu-item.ui-sortable-helper .menu-item-transport dl {
 	margin-top: 13px;
 }

-/* WARNING: The factor of 30px is hardcoded into the nav-menus JavaScript. */
+/* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */
 .menu-item-depth-0 { margin-left: 0px; }
 .menu-item-depth-1 { margin-left: 30px; }
 .menu-item-depth-2 { margin-left: 60px; }
--- a/wp-admin/css/revisions-rtl.css
+++ b/wp-admin/css/revisions-rtl.css
@@ -73,15 +73,12 @@
 }

 .revisions .loading-indicator {
-	position: absolute;
+	position: fixed;
 	vertical-align: middle;
 	opacity: 0;
 	width: 100%;
-	width: -webkit-calc( 100% - 30px );
-	width: calc( 100% - 30px );
 	top: 50%;
-	top: -webkit-calc( 50% - 10px );
-	top: calc( 50% - 10px );
+	margin-right: -90px;
 	-webkit-transition: opacity 0.5s;
 	transition: opacity 0.5s;
 	filter: alpha(opacity=0); /* ie8 and earlier */
@@ -408,7 +405,7 @@ table.diff .diff-addedline ins {
 	z-index: 10000;
 }

-.arrow:after {
+.arrow::after {
 	z-index: 9999;
 	background-color: #fff;
 	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
@@ -450,7 +447,7 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
 	margin-left: -10px;
 }

-/* jQuery UI Slider */
+ /* jQuery UI Slider */
 .wp-slider.ui-slider {
 	position: relative;
 	border: 1px solid #d7d7d7;
@@ -467,8 +464,6 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
 	position: absolute;
 	width: 18px;
 	z-index: 2;
-	-ms-touch-action: none;
-	touch-action: none;
 }

 .wp-slider .ui-slider-handle,
--- a/wp-admin/css/revisions.css
+++ b/wp-admin/css/revisions.css
@@ -73,15 +73,12 @@
 }

 .revisions .loading-indicator {
-	position: absolute;
+	position: fixed;
 	vertical-align: middle;
 	opacity: 0;
 	width: 100%;
-	width: -webkit-calc( 100% - 30px );
-	width: calc( 100% - 30px );
 	top: 50%;
-	top: -webkit-calc( 50% - 10px );
-	top: calc( 50% - 10px );
+	margin-left: -90px;
 	-webkit-transition: opacity 0.5s;
 	transition: opacity 0.5s;
 	filter: alpha(opacity=0); /* ie8 and earlier */
@@ -408,7 +405,7 @@ table.diff .diff-addedline ins {
 	z-index: 10000;
 }

-.arrow:after {
+.arrow::after {
 	z-index: 9999;
 	background-color: #fff;
 	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
@@ -450,7 +447,7 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
 	margin-right: -10px;
 }

-/* jQuery UI Slider */
+ /* jQuery UI Slider */
 .wp-slider.ui-slider {
 	position: relative;
 	border: 1px solid #d7d7d7;
@@ -467,8 +464,6 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
 	position: absolute;
 	width: 18px;
 	z-index: 2;
-	-ms-touch-action: none;
-	touch-action: none;
 }

 .wp-slider .ui-slider-handle,
--- a/wp-admin/css/themes-rtl.css
+++ b/wp-admin/css/themes-rtl.css
@@ -25,16 +25,23 @@
 	margin-right: 20px;
 }

-/* Search form */
-.themes-php .wp-filter-search {
+.themes-php .wrap .theme-count,
+.theme-navigation .theme-count {
+	color: #fff;
+	-webkit-border-radius: 30px;
+	border-radius: 30px;
+	background: #777;
+	font-size: 14px;
+	padding: 4px 10px;
+	font-weight: 600;
+	margin-right: 5px;
+	margin-left: 20px;
 	position: relative;
-	top: -2px;
-	right: 20px;
-	margin: 0;
-	width: 280px;
-	font-size: 16px;
-	font-weight: 300;
-	line-height: 1.5;
+	top: -3px;
+}
+
+.theme-navigation a {
+	text-decoration:none;
 }

 /* Position admin messages */
@@ -188,17 +195,13 @@
 	-webkit-transition: opacity 0.1s ease-in-out;
 	transition: opacity 0.1s ease-in-out;
 }
-
 .theme-browser .theme:focus {
-	border-color: #5b9dd9;
-	-webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
-	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	outline: 1px dotted #222;
 }

 .theme-browser .theme:focus .more-details {
 	opacity: 1;
 }
-
 /* Current theme needs to have its action always on view */
 .theme-browser .theme.active:focus .theme-actions {
 	display: block;
@@ -398,6 +401,19 @@
 	z-index: 2;
 }

+/*
+ * The search form
+ */
+.themes-php .theme-search {
+	position: relative;
+	top: -2px;
+	right: 20px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.5;
+	width: 280px;
+}
+
 /**
 * Theme Overlay
 * Shown when clicking a theme
@@ -413,6 +429,10 @@
 	z-index: 10;
 }

+body.theme-overlay-open {
+	overflow: hidden;
+}
+
 .theme-overlay .theme-header {
 	position: absolute;
 	top: 0;
@@ -431,12 +451,15 @@
 	border: 0;
 	border-right: 1px solid #ddd;
 	background-color: transparent;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-	transition: color .1s ease-in-out, background .1s ease-in-out;
+}
+
+.theme-overlay .theme-header .close:hover:before,
+.theme-overlay .theme-header .close:focus:before {
+	color: #fff;
 }

 .theme-overlay .theme-header .close:before {
-	font: normal 22px/50px 'dashicons' !important;
+	font: normal 30px/50px 'dashicons' !important;
 	color: #777;
 	display: inline-block;
 	content: '\f335';
@@ -455,32 +478,16 @@
 	text-align: center;
 	border: 0;
 	border-left: 1px solid #ddd;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-	transition: color .1s ease-in-out, background .1s ease-in-out;
 }

-.theme-overlay .theme-header .close:focus,
 .theme-overlay .theme-header .close:hover,
-.theme-overlay .theme-header .right:focus,
 .theme-overlay .theme-header .right:hover,
-.theme-overlay .theme-header .left:focus,
-.theme-overlay .theme-header .left:hover {
-	background: #ddd;
-	border-color: #ccc;
-	color: #000;
-}
-
-.theme-overlay .theme-header .close:focus:before,
-.theme-overlay .theme-header .close:hover:before {
-	color: #000;
-}
-
+.theme-overlay .theme-header .left:hover,
 .theme-overlay .theme-header .close:focus,
 .theme-overlay .theme-header .right:focus,
 .theme-overlay .theme-header .left:focus {
-    -webkit-box-shadow: none;
-    box-shadow: none;
-    outline: none;
+	background: #0074a2;
+	color: #fff;
 }

 .theme-overlay .theme-header .left.disabled,
@@ -499,17 +506,21 @@
 	font-weight: 300;
 }

-.theme-overlay .theme-header .left:before,
-.rtl .theme-overlay .theme-header .right:before {
-	content: '\f341';
+.theme-overlay .theme-header .left:before {
+	content: '\f340';
+}
+
+.theme-overlay .theme-header .right:before {
+	content: '\f344';
 }

-.theme-overlay .theme-header .right:before,
 .rtl .theme-overlay .theme-header .left:before {
 	content: '\f345';
 }

-
+.rtl .theme-overlay .theme-header .right:before {
+	content: '\f341';
+}

 .theme-overlay .theme-wrap {
 	clear: both;
@@ -580,15 +591,11 @@ body.folded .theme-overlay .theme-wrap {
 	margin-bottom: 5px;
 }

-/* Hide-if-customize for items we can't add classes to */
-.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-header"],
-.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-background"] {
-	display: none;
-}
-
-.broken-themes a.delete-theme,
 .theme-overlay .theme-actions .delete-theme {
 	color: #a00;
+	position: absolute;
+	left: 10px;
+	bottom: 5px;
 	text-decoration: none;
 	border-color: transparent;
 	-webkit-box-shadow: none;
@@ -596,14 +603,6 @@ body.folded .theme-overlay .theme-wrap {
 	background: transparent;
 }

-.theme-overlay .theme-actions .delete-theme {
-	position: absolute;
-	left: 10px;
-	bottom: 5px;
-}
-
-.broken-themes a.delete-theme:hover,
-.broken-themes a.delete-theme:focus,
 .theme-overlay .theme-actions .delete-theme:hover,
 .theme-overlay .theme-actions .delete-theme:focus {
 	background: #d54e21;
@@ -1026,7 +1025,7 @@ body.folded .theme-overlay .theme-wrap {
 		width: 100%;
 	}

-	.themes-php .wp-filter-search {
+	.themes-php .theme-search {
 		float: none;
 		clear: both;
 		right: 0;
@@ -1034,7 +1033,6 @@ body.folded .theme-overlay .theme-wrap {
 		left: 0;
 		margin: 10px 0;
 		width: 100%;
-		max-width: 280px;
 	}

 	.theme-browser .theme.add-new-theme span:after {
@@ -1090,6 +1088,21 @@ body.folded .theme-overlay .theme-wrap {
 	display: none !important;
 }

+.theme-navigation {
+	background: #fff;
+	-webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
+	box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	color: #555;
+	display: inline-block;
+	font-size: 13px;
+	margin: 20px 0 30px;
+	padding: 0 20px;
+	position: relative;
+	width: 100%;
+}
 .theme-install-php a.upload,
 .theme-install-php a.browse-themes {
 	cursor: pointer;
@@ -1101,33 +1114,29 @@ body.folded .theme-overlay .theme-wrap {
 .theme-install-php.show-upload-theme a.browse-themes {
 	display: inline;
 }
-.upload-theme,
-.upload-plugin {
+.upload-theme {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	display: none;
-	margin: 0;
+	margin: 0px 0 0;
 	padding: 0;
 	width: 100%;
 	overflow: hidden;
 	position: relative;
 	top: 10px;
 }
-body.show-upload-theme .upload-theme,
-.upload-plugin {
+body.show-upload-theme .upload-theme {
 	display: block;
 }
-.upload-theme .wp-upload-form,
-.upload-plugin .wp-upload-form {
+.upload-theme .wp-upload-form {
 	background: #fafafa;
 	border: 1px solid #e5e5e5;
 	padding: 30px;
 	margin: 30px auto;
 	max-width: 380px;
 }
-.upload-theme .install-help,
-.upload-plugin .install-help {
+.upload-theme .install-help {
 	color: #999;
 	font-size: 18px;
 	font-style: normal;
@@ -1135,11 +1144,190 @@ body.show-upload-theme .upload-theme,
 	padding: 40px 0 0;
 	text-align: center;
 }
-body.show-upload-theme .upload-theme + .wp-filter,
-body.show-upload-theme .upload-theme + .wp-filter + .theme-browser {
+body.show-upload-theme .upload-theme + .theme-navigation,
+body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser {
 	display: none;
 }
+.theme-navigation .theme-count {
+	margin-right: 0;
+	position: absolute;
+	top: 12px;
+}
+.theme-count + .theme-section {
+	margin-right: 60px;
+}
+.theme-section,
+.theme-filter {
+	border-bottom: 4px solid #fff;
+	color: #666;
+	cursor: pointer;
+	display: inline-block;
+	margin: 0 10px;
+	padding: 15px 0;
+}
+.theme-section.current,
+.theme-filter.current {
+	border-bottom: 4px solid #666;
+	color: #222;
+}
+.theme-top-filters {
+	display: inline-block;
+}
+.theme-navigation .more-filters {
+	color: #666;
+	cursor: pointer;
+	display: inline-block;
+	margin: 0 10px;
+	padding: 4px 6px;
+}
+body.more-filters-opened .more-filters,
+body.more-filters-opened .more-filters:before {
+	background: #777;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	border: none;
+	color: #fff;
+}

+body.more-filters-opened .more-filters:hover,
+body.more-filters-opened .more-filters:focus,
+body.more-filters-opened .more-filters:hover:before,
+body.more-filters-opened .more-filters:focus:before {
+	background: rgb(46, 162, 204);
+}
+
+.theme-install-php .theme-search {
+	position: absolute;
+	left: 10px;
+	top: 9px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.5;
+	width: 280px;
+}
+.more-filters:before {
+	color: #777;
+	text-align: center;
+	margin: 0 0 0 5px;
+	content: "\f111";
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	-webkit-font-smoothing: antialiased;
+	font-size: 16px;
+	line-height: 1;
+	font-family: "dashicons";
+	text-decoration: inherit;
+	font-weight: normal;
+	font-style: normal;
+	vertical-align: top;
+	-webkit-transition: color .1s ease-in 0;
+	transition: color .1s ease-in 0;
+	text-align: center;
+}
+.more-filters.current:before {
+	color: #fff;
+}
+.more-filters-container {
+	display: none;
+	padding: 20px;
+	border-top: 1px solid #eee;
+	margin: 0 -20px;
+	background: #fafafa;
+}
+body.more-filters-opened .more-filters-container {
+	display: block;
+	overflow: hidden;
+}
+body.more-filters-opened .theme-section.current {
+	border-bottom: none;
+}
+body.more-filters-opened .theme-browser,
+body.more-filters-opened.filters-applied.loading-themes .theme-browser {
+	display: none;
+}
+body.more-filters-opened.filters-applied .theme-browser {
+	display: block;
+}
+.more-filters-container .filters-group {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: right;
+	width: 19%;
+	background: #fff;
+	margin: 0 0 0 1%;
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	padding: 10px;
+}
+.more-filters-container .wide-filters-group {
+	width: 38%;
+}
+.more-filters-container .feature-name {
+	margin: 0;
+	position: relative;
+}
+.more-filters-container ol {
+	list-style-type: none;
+	margin: 20px 0 0;
+	font-size: 12px;
+}
+.more-filters-container li {
+	display: inline-block;
+	vertical-align: top;
+	list-style-type: none;
+	margin: 5px 0;
+	padding-left: 25px;
+	width: 160px;
+}
+.theme-navigation .more-filters-container .apply-filters {
+	margin: 0 0 20px;
+}
+.theme-navigation .more-filters-container .clear-filters {
+	display: none;
+	margin: 0 10px 20px 0;
+}
+.more-filters-container .apply-filters span {
+	display: inline-block;
+	font-size: 12px;
+	text-indent: 10px;
+	opacity: 0.8;
+}
+.more-filters-container .filtering-by {
+	display: none;
+	margin: 0;
+}
+.more-filters-container .filtering-by > span {
+	font-weight: 600;
+}
+.more-filters-container .filtering-by .tags {
+	display: inline;
+}
+.more-filters-container .filtering-by .tag {
+	background: #fff;
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	font-size: 11px;
+	margin: 0 5px;
+	padding: 4px 8px;
+}
+.more-filters-container .filtering-by a {
+	margin-right: 10px;
+}
+body.filters-applied .more-filters-container .filters-group,
+body.filters-applied .more-filters-container a.button,
+body.filters-applied .more-filters-container br {
+	display: none !important;
+}
+body.filters-applied .more-filters-container .filtering-by {
+	display: block;
+}
+body.filters-applied .more-filters-container {
+	padding: 20px;
+}
 p.no-themes {
 	color: #999;
 	font-size: 18px;
@@ -1156,11 +1344,20 @@ body.show-upload-theme p.no-themes {
 	display: none !important;
 }

+
 .theme-install-php .add-new-theme {
 	display: none !important;
 }

@media only screen and (max-width: 1120px) {
+	.theme-install-php .theme-search {
+		margin: 20px 0;
+		position: static;
+		width: 100%;
+	}
+	.more-filters-container {
+		border-bottom: 1px solid #eee;
+	}
 	.upload-theme .wp-upload-form {
 		margin: 20px 0;
 		max-width: 100%;
@@ -1170,10 +1367,27 @@ body.show-upload-theme p.no-themes {
 		padding: 20px 0 0;
 		text-align: right;
 	}
+	.more-filters-container .filters-group {
+		margin-bottom: 0;
+		margin-top: 5px;
+		width: 100%;
+	}
+	.more-filters-container .filters-group li {
+		margin: 10px 0;
+	}
+}
+
+@media only screen and (max-width: 782px) {
+	.more-filters-container .filters-group {
+		width: 100%;
+	}
+	.more-filters-container .filters-group li {
+		width: 100%;
+	}
 }

 .rating {
-	margin: 15px 0 0;
+	margin: 30px 0;
 }
 .rating span:before {
 	color: #e6b800;
@@ -1228,10 +1442,20 @@ body.show-upload-theme p.no-themes {
 	content: "\f155";
 }
 .rating .ratings {
-	display: block;
+	display: inline;
+	margin-right: 10px;
 	line-height: 20px;
 	color: #999;
 }
+.loading-themes .theme-browser,
+.error .theme-browser {
+	display: none;
+}
+.loading-themes .spinner {
+	display: block;
+	margin: 40px auto 0;
+	float: none;
+}

 /*------------------------------------------------------------------------------
  16.3 - Custom Header Screen
@@ -1316,6 +1540,7 @@ body.full-overlay-active {
 	padding: 0;
 	margin: 0;
 	z-index: 10;
+	overflow: auto;
 	background: #eee;
 	border-left: none;
 }
@@ -1392,85 +1617,9 @@ body.full-overlay-active {
 	overflow: auto;
 }

-/* Close & Navigation Links */
-.theme-install-overlay .wp-full-overlay-sidebar .wp-full-overlay-header {
-	padding: 0;
-}
-
-.theme-install-overlay .close-full-overlay,
-.theme-install-overlay .previous-theme,
-.theme-install-overlay .next-theme {
-	display: block;
-	position: relative;
-	float: right;
-	width: 45px;
-	height: 45px;
-	padding-left: 2px;
-	background: #eee;
-	border-left: 1px solid #ddd;
-	color: #444;
-	cursor: pointer;
+/* Close Link */
+.wp-full-overlay .close-full-overlay {
 	text-decoration: none;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-	transition: color .1s ease-in-out, background .1s ease-in-out;
-}
-
-.theme-install-overlay .close-full-overlay:hover,
-.theme-install-overlay .close-full-overlay:focus,
-.theme-install-overlay .previous-theme:hover,
-.theme-install-overlay .previous-theme:focus,
-.theme-install-overlay .next-theme:hover,
-.theme-install-overlay .next-theme:focus {
-	background: #ddd;
-	border-color: #ccc;
-	color: #000;
-	outline: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-
-.theme-install-overlay .close-full-overlay:before {
-	font: normal 22px/1 dashicons;
-	content: "\f335";
-	position: relative;
-	top: 7px;
-	right: 13px;
-}
-
-.theme-install-overlay .previous-theme:before {
-	font: normal 20px/1 dashicons;
-	content: "\f341";
-	position: relative;
-	top: 6px;
-	right: 14px;
-}
-
-.theme-install-overlay .next-theme:before {
-	font: normal 20px/1 dashicons;
-	content: "\f345";
-	position: relative;
-	top: 6px;
-	right: 13px;
-}
-
-.theme-install-overlay .previous-theme.disabled,
-.theme-install-overlay .next-theme.disabled,
-.theme-install-overlay .previous-theme.disabled:hover,
-.theme-install-overlay .previous-theme.disabled:focus,
-.theme-install-overlay .next-theme.disabled:hover,
-.theme-install-overlay .next-theme.disabled:focus {
-	color: #bbb;
-	background: #eee;
-	cursor: default;
-	pointer-events: none;
-}
-
-.rtl .theme-install-overlay .previous-theme:before {
-	content: "\f345";
-}
-
-.rtl .theme-install-overlay .next-theme:before {
-	content: "\f341";
 }

 /* Collapse Button */
@@ -1555,6 +1704,19 @@ body.full-overlay-active {
 	display: none;
 }

+.wp-full-overlay .theme-navigation {
+	padding: 10px 20px;
+	position: absolute;
+		bottom: 10px;
+	text-align: right;
+}
+.wp-full-overlay .theme-navigation .next-theme {
+	float: left;
+}
+.wp-full-overlay.no-navigation .theme-navigation {
+	display: none;
+}
+
 /* Animations */
 .wp-full-overlay,
 .wp-full-overlay-sidebar,
@@ -1683,22 +1845,19 @@ body.full-overlay-active {
 	max-width: 100%;
 }

+.theme-install-overlay .wp-full-overlay-header {
+	margin-top: 9px;
+}
+
 .theme-install-overlay .wp-full-overlay-header .theme-install {
 	float: left;
-	margin: 8px 0 0 10px;
 	/* For when .theme-install is a span rather than a.button-primary (already installed theme) */
 	line-height: 26px;
 }

 .theme-install-overlay .wp-full-overlay-sidebar {
-	background: #eee;
-	border-left: 1px solid #ddd;
-}
-
-.theme-install-overlay .wp-full-overlay-sidebar-content {
-	background: #fff;
-	border-top: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
+	background: #EEE;
+	border-left: 1px solid #DDD;
 }

 .theme-install-overlay .wp-full-overlay-main {
@@ -1727,10 +1886,6 @@ body.full-overlay-active {
 	.theme-install-overlay .wp-full-overlay-main {
 		background-image: url(../images/spinner-2x.gif);
 	}
-
-	.theme-install-overlay .wp-full-overlay-header .theme-install {
-		margin-top: 2px;
-	}
 }

@media screen and ( max-width: 782px ) {
@@ -1744,13 +1899,4 @@ body.full-overlay-active {
 	.available-theme .action-links .delete-theme a {
 		padding: 0;
 	}
-
-	.broken-themes table {
-		width: 100%;
-	}
-
-	.theme-install-overlay .wp-full-overlay-header .theme-install {
-		margin-top: 6px;
-		line-height: normal;
-	}
 }
--- a/wp-admin/css/themes.css
+++ b/wp-admin/css/themes.css
@@ -25,16 +25,23 @@
 	margin-left: 20px;
 }

-/* Search form */
-.themes-php .wp-filter-search {
+.themes-php .wrap .theme-count,
+.theme-navigation .theme-count {
+	color: #fff;
+	-webkit-border-radius: 30px;
+	border-radius: 30px;
+	background: #777;
+	font-size: 14px;
+	padding: 4px 10px;
+	font-weight: 600;
+	margin-left: 5px;
+	margin-right: 20px;
 	position: relative;
-	top: -2px;
-	left: 20px;
-	margin: 0;
-	width: 280px;
-	font-size: 16px;
-	font-weight: 300;
-	line-height: 1.5;
+	top: -3px;
+}
+
+.theme-navigation a {
+	text-decoration:none;
 }

 /* Position admin messages */
@@ -188,17 +195,13 @@
 	-webkit-transition: opacity 0.1s ease-in-out;
 	transition: opacity 0.1s ease-in-out;
 }
-
 .theme-browser .theme:focus {
-	border-color: #5b9dd9;
-	-webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
-	box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 );
+	outline: 1px dotted #222;
 }

 .theme-browser .theme:focus .more-details {
 	opacity: 1;
 }
-
 /* Current theme needs to have its action always on view */
 .theme-browser .theme.active:focus .theme-actions {
 	display: block;
@@ -398,6 +401,19 @@
 	z-index: 2;
 }

+/*
+ * The search form
+ */
+.themes-php .theme-search {
+	position: relative;
+	top: -2px;
+	left: 20px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.5;
+	width: 280px;
+}
+
 /**
 * Theme Overlay
 * Shown when clicking a theme
@@ -413,6 +429,10 @@
 	z-index: 10;
 }

+body.theme-overlay-open {
+	overflow: hidden;
+}
+
 .theme-overlay .theme-header {
 	position: absolute;
 	top: 0;
@@ -431,12 +451,15 @@
 	border: 0;
 	border-left: 1px solid #ddd;
 	background-color: transparent;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-	transition: color .1s ease-in-out, background .1s ease-in-out;
+}
+
+.theme-overlay .theme-header .close:hover:before,
+.theme-overlay .theme-header .close:focus:before {
+	color: #fff;
 }

 .theme-overlay .theme-header .close:before {
-	font: normal 22px/50px 'dashicons' !important;
+	font: normal 30px/50px 'dashicons' !important;
 	color: #777;
 	display: inline-block;
 	content: '\f335';
@@ -455,32 +478,16 @@
 	text-align: center;
 	border: 0;
 	border-right: 1px solid #ddd;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-	transition: color .1s ease-in-out, background .1s ease-in-out;
 }

-.theme-overlay .theme-header .close:focus,
 .theme-overlay .theme-header .close:hover,
-.theme-overlay .theme-header .right:focus,
 .theme-overlay .theme-header .right:hover,
-.theme-overlay .theme-header .left:focus,
-.theme-overlay .theme-header .left:hover {
-	background: #ddd;
-	border-color: #ccc;
-	color: #000;
-}
-
-.theme-overlay .theme-header .close:focus:before,
-.theme-overlay .theme-header .close:hover:before {
-	color: #000;
-}
-
+.theme-overlay .theme-header .left:hover,
 .theme-overlay .theme-header .close:focus,
 .theme-overlay .theme-header .right:focus,
 .theme-overlay .theme-header .left:focus {
-    -webkit-box-shadow: none;
-    box-shadow: none;
-    outline: none;
+	background: #0074a2;
+	color: #fff;
 }

 .theme-overlay .theme-header .left.disabled,
@@ -499,17 +506,21 @@
 	font-weight: 300;
 }

-.theme-overlay .theme-header .left:before,
-.rtl .theme-overlay .theme-header .right:before {
-	content: '\f341';
+.theme-overlay .theme-header .left:before {
+	content: '\f340';
+}
+
+.theme-overlay .theme-header .right:before {
+	content: '\f344';
 }

-.theme-overlay .theme-header .right:before,
 .rtl .theme-overlay .theme-header .left:before {
 	content: '\f345';
 }

-
+.rtl .theme-overlay .theme-header .right:before {
+	content: '\f341';
+}

 .theme-overlay .theme-wrap {
 	clear: both;
@@ -580,15 +591,11 @@ body.folded .theme-overlay .theme-wrap {
 	margin-bottom: 5px;
 }

-/* Hide-if-customize for items we can't add classes to */
-.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-header"],
-.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-background"] {
-	display: none;
-}
-
-.broken-themes a.delete-theme,
 .theme-overlay .theme-actions .delete-theme {
 	color: #a00;
+	position: absolute;
+	right: 10px;
+	bottom: 5px;
 	text-decoration: none;
 	border-color: transparent;
 	-webkit-box-shadow: none;
@@ -596,14 +603,6 @@ body.folded .theme-overlay .theme-wrap {
 	background: transparent;
 }

-.theme-overlay .theme-actions .delete-theme {
-	position: absolute;
-	right: 10px;
-	bottom: 5px;
-}
-
-.broken-themes a.delete-theme:hover,
-.broken-themes a.delete-theme:focus,
 .theme-overlay .theme-actions .delete-theme:hover,
 .theme-overlay .theme-actions .delete-theme:focus {
 	background: #d54e21;
@@ -1026,7 +1025,7 @@ body.folded .theme-overlay .theme-wrap {
 		width: 100%;
 	}

-	.themes-php .wp-filter-search {
+	.themes-php .theme-search {
 		float: none;
 		clear: both;
 		left: 0;
@@ -1034,7 +1033,6 @@ body.folded .theme-overlay .theme-wrap {
 		right: 0;
 		margin: 10px 0;
 		width: 100%;
-		max-width: 280px;
 	}

 	.theme-browser .theme.add-new-theme span:after {
@@ -1090,6 +1088,21 @@ body.folded .theme-overlay .theme-wrap {
 	display: none !important;
 }

+.theme-navigation {
+	background: #fff;
+	-webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
+	box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	color: #555;
+	display: inline-block;
+	font-size: 13px;
+	margin: 20px 0 30px;
+	padding: 0 20px;
+	position: relative;
+	width: 100%;
+}
 .theme-install-php a.upload,
 .theme-install-php a.browse-themes {
 	cursor: pointer;
@@ -1101,33 +1114,29 @@ body.folded .theme-overlay .theme-wrap {
 .theme-install-php.show-upload-theme a.browse-themes {
 	display: inline;
 }
-.upload-theme,
-.upload-plugin {
+.upload-theme {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	display: none;
-	margin: 0;
+	margin: 0px 0 0;
 	padding: 0;
 	width: 100%;
 	overflow: hidden;
 	position: relative;
 	top: 10px;
 }
-body.show-upload-theme .upload-theme,
-.upload-plugin {
+body.show-upload-theme .upload-theme {
 	display: block;
 }
-.upload-theme .wp-upload-form,
-.upload-plugin .wp-upload-form {
+.upload-theme .wp-upload-form {
 	background: #fafafa;
 	border: 1px solid #e5e5e5;
 	padding: 30px;
 	margin: 30px auto;
 	max-width: 380px;
 }
-.upload-theme .install-help,
-.upload-plugin .install-help {
+.upload-theme .install-help {
 	color: #999;
 	font-size: 18px;
 	font-style: normal;
@@ -1135,11 +1144,190 @@ body.show-upload-theme .upload-theme,
 	padding: 40px 0 0;
 	text-align: center;
 }
-body.show-upload-theme .upload-theme + .wp-filter,
-body.show-upload-theme .upload-theme + .wp-filter + .theme-browser {
+body.show-upload-theme .upload-theme + .theme-navigation,
+body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser {
 	display: none;
 }
+.theme-navigation .theme-count {
+	margin-left: 0;
+	position: absolute;
+	top: 12px;
+}
+.theme-count + .theme-section {
+	margin-left: 60px;
+}
+.theme-section,
+.theme-filter {
+	border-bottom: 4px solid #fff;
+	color: #666;
+	cursor: pointer;
+	display: inline-block;
+	margin: 0 10px;
+	padding: 15px 0;
+}
+.theme-section.current,
+.theme-filter.current {
+	border-bottom: 4px solid #666;
+	color: #222;
+}
+.theme-top-filters {
+	display: inline-block;
+}
+.theme-navigation .more-filters {
+	color: #666;
+	cursor: pointer;
+	display: inline-block;
+	margin: 0 10px;
+	padding: 4px 6px;
+}
+body.more-filters-opened .more-filters,
+body.more-filters-opened .more-filters:before {
+	background: #777;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	border: none;
+	color: #fff;
+}

+body.more-filters-opened .more-filters:hover,
+body.more-filters-opened .more-filters:focus,
+body.more-filters-opened .more-filters:hover:before,
+body.more-filters-opened .more-filters:focus:before {
+	background: rgb(46, 162, 204);
+}
+
+.theme-install-php .theme-search {
+	position: absolute;
+	right: 10px;
+	top: 9px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.5;
+	width: 280px;
+}
+.more-filters:before {
+	color: #777;
+	text-align: center;
+	margin: 0 5px 0 0;
+	content: "\f111";
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	-webkit-font-smoothing: antialiased;
+	font-size: 16px;
+	line-height: 1;
+	font-family: "dashicons";
+	text-decoration: inherit;
+	font-weight: normal;
+	font-style: normal;
+	vertical-align: top;
+	-webkit-transition: color .1s ease-in 0;
+	transition: color .1s ease-in 0;
+	text-align: center;
+}
+.more-filters.current:before {
+	color: #fff;
+}
+.more-filters-container {
+	display: none;
+	padding: 20px;
+	border-top: 1px solid #eee;
+	margin: 0 -20px;
+	background: #fafafa;
+}
+body.more-filters-opened .more-filters-container {
+	display: block;
+	overflow: hidden;
+}
+body.more-filters-opened .theme-section.current {
+	border-bottom: none;
+}
+body.more-filters-opened .theme-browser,
+body.more-filters-opened.filters-applied.loading-themes .theme-browser {
+	display: none;
+}
+body.more-filters-opened.filters-applied .theme-browser {
+	display: block;
+}
+.more-filters-container .filters-group {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+	width: 19%;
+	background: #fff;
+	margin: 0 1% 0 0;
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	padding: 10px;
+}
+.more-filters-container .wide-filters-group {
+	width: 38%;
+}
+.more-filters-container .feature-name {
+	margin: 0;
+	position: relative;
+}
+.more-filters-container ol {
+	list-style-type: none;
+	margin: 20px 0 0;
+	font-size: 12px;
+}
+.more-filters-container li {
+	display: inline-block;
+	vertical-align: top;
+	list-style-type: none;
+	margin: 5px 0;
+	padding-right: 25px;
+	width: 160px;
+}
+.theme-navigation .more-filters-container .apply-filters {
+	margin: 0 0 20px;
+}
+.theme-navigation .more-filters-container .clear-filters {
+	display: none;
+	margin: 0 0 20px 10px;
+}
+.more-filters-container .apply-filters span {
+	display: inline-block;
+	font-size: 12px;
+	text-indent: 10px;
+	opacity: 0.8;
+}
+.more-filters-container .filtering-by {
+	display: none;
+	margin: 0;
+}
+.more-filters-container .filtering-by > span {
+	font-weight: 600;
+}
+.more-filters-container .filtering-by .tags {
+	display: inline;
+}
+.more-filters-container .filtering-by .tag {
+	background: #fff;
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	font-size: 11px;
+	margin: 0 5px;
+	padding: 4px 8px;
+}
+.more-filters-container .filtering-by a {
+	margin-left: 10px;
+}
+body.filters-applied .more-filters-container .filters-group,
+body.filters-applied .more-filters-container a.button,
+body.filters-applied .more-filters-container br {
+	display: none !important;
+}
+body.filters-applied .more-filters-container .filtering-by {
+	display: block;
+}
+body.filters-applied .more-filters-container {
+	padding: 20px;
+}
 p.no-themes {
 	color: #999;
 	font-size: 18px;
@@ -1156,11 +1344,20 @@ body.show-upload-theme p.no-themes {
 	display: none !important;
 }

+
 .theme-install-php .add-new-theme {
 	display: none !important;
 }

@media only screen and (max-width: 1120px) {
+	.theme-install-php .theme-search {
+		margin: 20px 0;
+		position: static;
+		width: 100%;
+	}
+	.more-filters-container {
+		border-bottom: 1px solid #eee;
+	}
 	.upload-theme .wp-upload-form {
 		margin: 20px 0;
 		max-width: 100%;
@@ -1170,10 +1367,27 @@ body.show-upload-theme p.no-themes {
 		padding: 20px 0 0;
 		text-align: left;
 	}
+	.more-filters-container .filters-group {
+		margin-bottom: 0;
+		margin-top: 5px;
+		width: 100%;
+	}
+	.more-filters-container .filters-group li {
+		margin: 10px 0;
+	}
+}
+
+@media only screen and (max-width: 782px) {
+	.more-filters-container .filters-group {
+		width: 100%;
+	}
+	.more-filters-container .filters-group li {
+		width: 100%;
+	}
 }

 .rating {
-	margin: 15px 0 0;
+	margin: 30px 0;
 }
 .rating span:before {
 	color: #e6b800;
@@ -1228,10 +1442,20 @@ body.show-upload-theme p.no-themes {
 	content: "\f155";
 }
 .rating .ratings {
-	display: block;
+	display: inline;
+	margin-left: 10px;
 	line-height: 20px;
 	color: #999;
 }
+.loading-themes .theme-browser,
+.error .theme-browser {
+	display: none;
+}
+.loading-themes .spinner {
+	display: block;
+	margin: 40px auto 0;
+	float: none;
+}

 /*------------------------------------------------------------------------------
  16.3 - Custom Header Screen
@@ -1316,6 +1540,7 @@ body.full-overlay-active {
 	padding: 0;
 	margin: 0;
 	z-index: 10;
+	overflow: auto;
 	background: #eee;
 	border-right: none;
 }
@@ -1392,85 +1617,9 @@ body.full-overlay-active {
 	overflow: auto;
 }

-/* Close & Navigation Links */
-.theme-install-overlay .wp-full-overlay-sidebar .wp-full-overlay-header {
-	padding: 0;
-}
-
-.theme-install-overlay .close-full-overlay,
-.theme-install-overlay .previous-theme,
-.theme-install-overlay .next-theme {
-	display: block;
-	position: relative;
-	float: left;
-	width: 45px;
-	height: 45px;
-	padding-right: 2px;
-	background: #eee;
-	border-right: 1px solid #ddd;
-	color: #444;
-	cursor: pointer;
+/* Close Link */
+.wp-full-overlay .close-full-overlay {
 	text-decoration: none;
-	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
-	transition: color .1s ease-in-out, background .1s ease-in-out;
-}
-
-.theme-install-overlay .close-full-overlay:hover,
-.theme-install-overlay .close-full-overlay:focus,
-.theme-install-overlay .previous-theme:hover,
-.theme-install-overlay .previous-theme:focus,
-.theme-install-overlay .next-theme:hover,
-.theme-install-overlay .next-theme:focus {
-	background: #ddd;
-	border-color: #ccc;
-	color: #000;
-	outline: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-
-.theme-install-overlay .close-full-overlay:before {
-	font: normal 22px/1 dashicons;
-	content: "\f335";
-	position: relative;
-	top: 7px;
-	left: 13px;
-}
-
-.theme-install-overlay .previous-theme:before {
-	font: normal 20px/1 dashicons;
-	content: "\f341";
-	position: relative;
-	top: 6px;
-	left: 14px;
-}
-
-.theme-install-overlay .next-theme:before {
-	font: normal 20px/1 dashicons;
-	content: "\f345";
-	position: relative;
-	top: 6px;
-	left: 13px;
-}
-
-.theme-install-overlay .previous-theme.disabled,
-.theme-install-overlay .next-theme.disabled,
-.theme-install-overlay .previous-theme.disabled:hover,
-.theme-install-overlay .previous-theme.disabled:focus,
-.theme-install-overlay .next-theme.disabled:hover,
-.theme-install-overlay .next-theme.disabled:focus {
-	color: #bbb;
-	background: #eee;
-	cursor: default;
-	pointer-events: none;
-}
-
-.rtl .theme-install-overlay .previous-theme:before {
-	content: "\f345";
-}
-
-.rtl .theme-install-overlay .next-theme:before {
-	content: "\f341";
 }

 /* Collapse Button */
@@ -1555,6 +1704,19 @@ body.full-overlay-active {
 	display: none;
 }

+.wp-full-overlay .theme-navigation {
+	padding: 10px 20px;
+	position: absolute;
+		bottom: 10px;
+	text-align: left;
+}
+.wp-full-overlay .theme-navigation .next-theme {
+	float: right;
+}
+.wp-full-overlay.no-navigation .theme-navigation {
+	display: none;
+}
+
 /* Animations */
 .wp-full-overlay,
 .wp-full-overlay-sidebar,
@@ -1683,22 +1845,19 @@ body.full-overlay-active {
 	max-width: 100%;
 }

+.theme-install-overlay .wp-full-overlay-header {
+	margin-top: 9px;
+}
+
 .theme-install-overlay .wp-full-overlay-header .theme-install {
 	float: right;
-	margin: 8px 10px 0 0;
 	/* For when .theme-install is a span rather than a.button-primary (already installed theme) */
 	line-height: 26px;
 }

 .theme-install-overlay .wp-full-overlay-sidebar {
-	background: #eee;
-	border-right: 1px solid #ddd;
-}
-
-.theme-install-overlay .wp-full-overlay-sidebar-content {
-	background: #fff;
-	border-top: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
+	background: #EEE;
+	border-right: 1px solid #DDD;
 }

 .theme-install-overlay .wp-full-overlay-main {
@@ -1727,10 +1886,6 @@ body.full-overlay-active {
 	.theme-install-overlay .wp-full-overlay-main {
 		background-image: url(../images/spinner-2x.gif);
 	}
-
-	.theme-install-overlay .wp-full-overlay-header .theme-install {
-		margin-top: 2px;
-	}
 }

@media screen and ( max-width: 782px ) {
@@ -1744,13 +1899,4 @@ body.full-overlay-active {
 	.available-theme .action-links .delete-theme a {
 		padding: 0;
 	}
-
-	.broken-themes table {
-		width: 100%;
-	}
-
-	.theme-install-overlay .wp-full-overlay-header .theme-install {
-		margin-top: 6px;
-		line-height: normal;
-	}
 }
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -16,9 +16,6 @@

 .widget-top a.widget-action,
 .widget-top a.widget-action:hover {
-	-webkit-box-shadow: none;
-	box-shadow: none;
-	outline: none;
 	text-decoration: none;
 }

--- a/wp-admin/css/widgets.css
+++ b/wp-admin/css/widgets.css
@@ -16,9 +16,6 @@

 .widget-top a.widget-action,
 .widget-top a.widget-action:hover {
-	-webkit-box-shadow: none;
-	box-shadow: none;
-	outline: none;
 	text-decoration: none;
 }

--- a/wp-admin/css/wp-admin-rtl.min.css
+++ b/wp-admin/css/wp-admin-rtl.min.css
--- a/wp-admin/css/wp-admin.min.css
+++ b/wp-admin/css/wp-admin.min.css
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -22,7 +22,7 @@ class Custom_Background {
 	 * @since 3.0.0
 	 * @access private
 	 */
-	private $admin_header_callback;
+	var $admin_header_callback;

 	/**
 	 * Callback for header div.
@@ -31,7 +31,7 @@ class Custom_Background {
 	 * @since 3.0.0
 	 * @access private
 	 */
-	private $admin_image_div_callback;
+	var $admin_image_div_callback;

 	/**
 	 * Holds the page menu hook.
@@ -40,12 +40,7 @@ class Custom_Background {
 	 * @since 3.0.0
 	 * @access private
 	 */
-	private $page = '';
-
-	/**
-	 * @var bool
-	 */
-	private $updated;
+	var $page = '';

 	/**
 	 * Constructor - Register administration header callback.
@@ -55,76 +50,20 @@ class Custom_Background {
 	 * @param callback $admin_image_div_callback Optional custom image div output callback.
 	 * @return Custom_Background
 	 */
-	public function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
+	function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
 		$this->admin_header_callback = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;

 		add_action( 'admin_menu', array( $this, 'init' ) );
-
-		add_action( 'wp_ajax_custom-background-add', array( $this, 'ajax_background_add' ) );
-
-		// Unused since 3.5.0.
 		add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
 	}

-	/**
-	 * Make private properties readable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property name.
-	 * @return mixed Property.
-	 */
-	public function __get( $name ) {
-		return $this->$name;
-	}
-
-	/**
-	 * Make private properties settable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name  Property to set.
-	 * @param mixed  $value Property value.
-	 * @return mixed Newly-set property.
-	 */
-	public function __set( $name, $value ) {
-		return $this->$name = $value;
-	}
-
-	/**
-	 * Make private properties checkable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
-	 */
-	public function __isset( $name ) {
-		return isset( $this->$name );
-	}
-
-	/**
-	 * Make private properties un-settable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to unset.
-	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
-	}
-
 	/**
 	 * Set up the hooks for the Custom Background admin page.
 	 *
 	 * @since 3.0.0
 	 */
-	public function init() {
+	function init() {
 		if ( ! current_user_can('edit_theme_options') )
 			return;

@@ -143,7 +82,7 @@ class Custom_Background {
 	 *
 	 * @since 3.0.0
 	 */
-	public function admin_load() {
+	function admin_load() {
 		get_current_screen()->add_help_tab( array(
 			'id'      => 'overview',
 			'title'   => __('Overview'),
@@ -170,7 +109,7 @@ class Custom_Background {
 	 *
 	 * @since 3.0.0
 	 */
-	public function take_action() {
+	function take_action() {

 		if ( empty($_POST) )
 			return;
@@ -237,24 +176,11 @@ class Custom_Background {
 	 *
 	 * @since 3.0.0
 	 */
-	public function admin_page() {
+	function admin_page() {
 ?>
 <div class="wrap" id="custom-background">
 <h2><?php _e( 'Custom Background' ); ?></h2>

-<?php if ( current_user_can( 'customize' ) ) { ?>
-<div class="notice notice-info hide-if-no-customize">
-	<p>
-		<?php
-		printf(
-			__( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
-			admin_url( 'customize.php?autofocus[control]=background_image' )
-		);
-		?>
-	</p>
-</div>
-<?php } ?>
-
 <?php if ( ! empty( $this->updated ) ) { ?>
 <div id="message" class="updated">
 <p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
@@ -278,8 +204,7 @@ class Custom_Background {

 		if ( get_background_image() ) {
 			$background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', get_background_image() ) ) ) );
-
-			// Background-image URL must be single quote, see below.
+			// background-image URL must be single quote, see below
 			$background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
 				. ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) . ';'
 				. ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
@@ -334,9 +259,9 @@ class Custom_Background {
 	</p>
 	<p>
 		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
-		<button id="choose-from-library-link" class="button"
+		<a id="choose-from-library-link" class="button"
 			data-choose="<?php esc_attr_e( 'Choose a Background Image' ); ?>"
-			data-update="<?php esc_attr_e( 'Set as background' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+			data-update="<?php esc_attr_e( 'Set as background' ); ?>"><?php _e( 'Choose Image' ); ?></a>
 	</p>
 	</form>
 </td>
@@ -418,7 +343,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	 *
 	 * @since 3.0.0
 	 */
-	public function handle_upload() {
+	function handle_upload() {

 		if ( empty($_FILES) )
 			return;
@@ -468,53 +393,23 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	}

 	/**
-	 * AJAX handler for adding custom background context to an attachment.
-	 *
-	 * Triggered when the user adds a new background image from the
-	 * Media Manager.
-	 *
-	 * @since 4.1.0
-	 */
-	public function ajax_background_add() {
-		check_ajax_referer( 'background-add', 'nonce' );
-
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			wp_send_json_error();
-		}
-
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
-			wp_send_json_error();
-		}
-
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_stylesheet() );
-
-		wp_send_json_success();
-	}
-
-	/**
+	 * Unused since 3.5.0.
 	 *
 	 * @since 3.4.0
-	 * @deprecated 3.5.0
 	 */
-	public function attachment_fields_to_edit( $form_fields ) {
+	function attachment_fields_to_edit( $form_fields ) {
 		return $form_fields;
 	}

 	/**
+	 * Unused since 3.5.0.
 	 *
 	 * @since 3.4.0
-	 * @deprecated 3.5.0
 	 */
-	public function filter_upload_tabs( $tabs ) {
+	function filter_upload_tabs( $tabs ) {
 		return $tabs;
 	}

-	/**
-	 *
-	 * @since 3.4.0
-	 * @deprecated 3.5.0
-	 */
 	public function wp_set_background_image() {
 		if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit;
 		$attachment_id = absint($_POST['attachment_id']);
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -22,7 +22,7 @@ class Custom_Image_Header {
 	 * @since 2.1.0
 	 * @access private
 	 */
-	private $admin_header_callback;
+	var $admin_header_callback;

 	/**
 	 * Callback for header div.
@@ -31,7 +31,7 @@ class Custom_Image_Header {
 	 * @since 3.0.0
 	 * @access private
 	 */
-	private $admin_image_div_callback;
+	var $admin_image_div_callback;

 	/**
 	 * Holds default headers.
@@ -40,7 +40,7 @@ class Custom_Image_Header {
 	 * @since 3.0.0
 	 * @access private
 	 */
-	private $default_headers = array();
+	var $default_headers = array();

 	/**
 	 * Holds custom headers uploaded by the user.
@@ -49,7 +49,7 @@ class Custom_Image_Header {
 	 * @since 3.2.0
 	 * @access private
 	 */
-	private $uploaded_headers = array();
+	var $uploaded_headers = array();

 	/**
 	 * Holds the page menu hook.
@@ -58,12 +58,7 @@ class Custom_Image_Header {
 	 * @since 3.0.0
 	 * @access private
 	 */
-	private $page = '';
-
-	/**
-	 * @var bool
-	 */
-	private $updated;
+	var $page = '';

 	/**
 	 * Constructor - Register administration header callback.
@@ -73,7 +68,7 @@ class Custom_Image_Header {
 	 * @param callback $admin_image_div_callback Optional custom image div output callback.
 	 * @return Custom_Image_Header
 	 */
-	public function __construct($admin_header_callback, $admin_image_div_callback = '') {
+	function __construct($admin_header_callback, $admin_image_div_callback = '') {
 		$this->admin_header_callback = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;

@@ -85,64 +80,12 @@ class Custom_Image_Header {
 		add_action( 'wp_ajax_custom-header-remove', array( $this, 'ajax_header_remove'      ) );
 	}

-	/**
-	 * Make private properties readable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to get.
-	 * @return mixed Property.
-	 */
-	public function __get( $name ) {
-		return $this->$name;
-	}
-
-	/**
-	 * Make private properties settable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name  Property to set.
-	 * @param mixed  $value Property value.
-	 * @return mixed Newly-set property.
-	 */
-	public function __set( $name, $value ) {
-		return $this->$name = $value;
-	}
-
-	/**
-	 * Make private properties checkable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
-	 */
-	public function __isset( $name ) {
-		return isset( $this->$name );
-	}
-
-	/**
-	 * Make private properties un-settable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to unset.
-	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
-	}
-
 	/**
 	 * Set up the hooks for the Custom Header admin page.
 	 *
 	 * @since 2.1.0
 	 */
-	public function init() {
+	function init() {
 		if ( ! current_user_can('edit_theme_options') )
 			return;

@@ -163,7 +106,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 3.0.0
 	 */
-	public function help() {
+	function help() {
 		get_current_screen()->add_help_tab( array(
 			'id'      => 'overview',
 			'title'   => __('Overview'),
@@ -205,7 +148,7 @@ class Custom_Image_Header {
 	 *
 	 * @return int Current step
 	 */
-	public function step() {
+	function step() {
 		if ( ! isset( $_GET['step'] ) )
 			return 1;

@@ -224,7 +167,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.1.0
 	 */
-	public function js_includes() {
+	function js_includes() {
 		$step = $this->step();

 		if ( ( 1 == $step || 3 == $step ) ) {
@@ -242,7 +185,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.7.0
 	 */
-	public function css_includes() {
+	function css_includes() {
 		$step = $this->step();

 		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
@@ -256,7 +199,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.6.0
 	 */
-	public function take_action() {
+	function take_action() {
 		if ( ! current_user_can('edit_theme_options') )
 			return;

@@ -302,9 +245,12 @@ class Custom_Image_Header {
 	 *
 	 * @since 3.0.0
 	 */
-	public function process_default_headers() {
+	function process_default_headers() {
 		global $_wp_default_headers;

+		if ( !empty($this->headers) )
+			return;
+
 		if ( !isset($_wp_default_headers) )
 			return;

@@ -329,7 +275,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 3.0.0
 	 */
-	public function show_header_selector( $type = 'default' ) {
+	function show_header_selector( $type = 'default' ) {
 		if ( 'default' == $type ) {
 			$headers = $this->default_headers;
 		} else {
@@ -362,11 +308,11 @@ class Custom_Image_Header {
 	}

 	/**
-	 * Execute JavaScript depending on step.
+	 * Execute Javascript depending on step.
 	 *
 	 * @since 2.1.0
 	 */
-	public function js() {
+	function js() {
 		$step = $this->step();
 		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
 			$this->js_1();
@@ -375,24 +321,15 @@ class Custom_Image_Header {
 	}

 	/**
-	 * Display JavaScript based on Step 1 and 3.
+	 * Display Javascript based on Step 1 and 3.
 	 *
 	 * @since 2.6.0
 	 */
-	public function js_1() {
-		$default_color = '';
-		if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-			$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-			if ( $default_color && false === strpos( $default_color, '#' ) ) {
-				$default_color = '#' . $default_color;
-			}
-		}
-		?>
-
+	function js_1() { ?>
 <script type="text/javascript">
 /* <![CDATA[ */
 (function($){
-	var default_color = '<?php echo $default_color; ?>',
+	var default_color = '#<?php echo get_theme_support( 'custom-header', 'default-text-color' ); ?>',
 		header_text_fields;

 	function pickColor(color) {
@@ -439,11 +376,11 @@ class Custom_Image_Header {
 	}

 	/**
-	 * Display JavaScript based on Step 2.
+	 * Display Javascript based on Step 2.
 	 *
 	 * @since 2.6.0
 	 */
-	public function js_2() { ?>
+	function js_2() { ?>
 <script type="text/javascript">
 /* <![CDATA[ */
 	function onEndCrop( coords ) {
@@ -517,26 +454,13 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.1.0
 	 */
-	public function step_1() {
+	function step_1() {
 		$this->process_default_headers();
 ?>

 <div class="wrap">
 <h2><?php _e( 'Custom Header' ); ?></h2>

-<?php if ( current_user_can( 'customize' ) ) { ?>
-<div class="notice notice-info hide-if-no-customize">
-	<p>
-		<?php
-		printf(
-			__( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
-			admin_url( 'customize.php?autofocus[control]=header_image' )
-		);
-		?>
-	</p>
-</div>
-<?php } ?>
-
 <?php if ( ! empty( $this->updated ) ) { ?>
 <div id="message" class="updated">
 <p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
@@ -570,7 +494,7 @@ class Custom_Image_Header {
 		else
 			$style = ' style="display:none;"';
 		?>
-		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
+		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
 	</div>
 	<?php } ?>
@@ -617,10 +541,10 @@ class Custom_Image_Header {
 	?>
 	<p>
 		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
-		<button id="choose-from-library-link" class="button"
+		<a id="choose-from-library-link" class="button"
 			data-update-link="<?php echo esc_attr( $modal_update_href ); ?>"
 			data-choose="<?php esc_attr_e( 'Choose a Custom Header' ); ?>"
-			data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+			data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></a>
 	</p>
 	</form>
 </td>
@@ -630,7 +554,6 @@ class Custom_Image_Header {
 </table>

 <form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ) ?>">
-<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
 <table class="form-table">
 <tbody>
 	<?php if ( get_uploaded_header_images() ) : ?>
@@ -701,27 +624,17 @@ class Custom_Image_Header {
 <th scope="row"><?php _e( 'Text Color' ); ?></th>
 <td>
 	<p>
-	<?php
-	$default_color = '';
-	if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-		$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-		if ( $default_color && false === strpos( $default_color, '#' ) ) {
-			$default_color = '#' . $default_color;
-		}
-	}
-
-	$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
-
-	$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
-	if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
-		$header_textcolor = '#' . $header_textcolor;
-	}
-
-	echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
-	if ( $default_color ) {
-		echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
-	}
-	?>
+<?php
+$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
+$default_color = '';
+if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
+	$default_color = '#' . get_theme_support( 'custom-header', 'default-text-color' );
+	$default_color_attr = ' data-default-color="' . esc_attr( $default_color ) . '"';
+	echo '<input type="text" name="text-color" id="text-color" value="#' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
+	if ( $default_color )
+		echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), $default_color ) . '</span>';
+}
+?>
 	</p>
 </td>
 </tr>
@@ -749,21 +662,18 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 2.1.0
 	 */
-	public function step_2() {
+	function step_2() {
 		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+			wp_die( __( 'Cheatin&#8217; uh?' ) );

 		if ( empty( $_POST ) && isset( $_GET['file'] ) ) {
 			$attachment_id = absint( $_GET['file'] );
 			$file = get_attached_file( $attachment_id, true );
-			$url = wp_get_attachment_image_src( $attachment_id, 'full' );
+			$url = wp_get_attachment_image_src( $attachment_id, 'full');
 			$url = $url[0];
 		} elseif ( isset( $_POST ) ) {
-			$data = $this->step_2_manage_upload();
-			$attachment_id = $data['attachment_id'];
-			$file = $data['file'];
-			$url = $data['url'];
+			extract($this->step_2_manage_upload());
 		}

 		if ( file_exists( $file ) ) {
@@ -862,7 +772,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 3.4.0
 	 */
-	public function step_2_manage_upload() {
+	function step_2_manage_upload() {
 		$overrides = array('test_form' => false);

 		$uploaded_file = $_FILES['import'];
@@ -899,14 +809,14 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 2.1.0
 	 */
-	public function step_3() {
+	function step_3() {
 		check_admin_referer( 'custom-header-crop-image' );

 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+			wp_die( __( 'Cheatin&#8217; uh?' ) );

 		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+			wp_die( __( 'Cheatin&#8217; uh?' ) );

 		if ( $_POST['oitar'] > 1 ) {
 			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
@@ -949,7 +859,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		$url = $object['guid'];
 		$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );

-		// Cleanup.
+		// cleanup
 		$medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
 		if ( file_exists( $medium ) ) {
 			/**
@@ -975,7 +885,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 2.1.0
 	 */
-	public function finished() {
+	function finished() {
 		$this->updated = true;
 		$this->step_1();
 	}
@@ -985,7 +895,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 2.1.0
 	 */
-	public function admin_page() {
+	function admin_page() {
 		if ( ! current_user_can('edit_theme_options') )
 			wp_die(__('You do not have permission to customize headers.'));
 		$step = $this->step();
@@ -1002,7 +912,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 3.4.0
 	 */
-	public function attachment_fields_to_edit( $form_fields ) {
+	function attachment_fields_to_edit( $form_fields ) {
 		return $form_fields;
 	}

@@ -1011,7 +921,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 3.4.0
 	 */
-	public function filter_upload_tabs( $tabs ) {
+	function filter_upload_tabs( $tabs ) {
 		return $tabs;
 	}

@@ -1122,7 +1032,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		$has_flex_width = current_theme_supports( 'custom-header', 'flex-width' );
 		$has_flex_height = current_theme_supports( 'custom-header', 'flex-height' );
 		$has_max_width = current_theme_supports( 'custom-header', 'max-width' ) ;
-		$dst = array( 'dst_height' => null, 'dst_width' => null );
+		$dst = array( 'dst_height' => null, 'dst_height' => null );

 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
 		if ( $has_flex_width ) {
@@ -1186,7 +1096,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	}

 	/**
-	 * Insert an attachment and its metadata.
+	 * Insert an attachment & its metadata.
 	 *
 	 * @param array $object Attachment object.
 	 * @param string $cropped Cropped image URL.
@@ -1197,13 +1107,8 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		$attachment_id = wp_insert_attachment( $object, $cropped );
 		$metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
 		/**
-		 * Filter the header image attachment metadata.
+		 * Allows us to insert custom meta data for an attachment.
 		 *
-		 * @since 3.9.0
-		 *
-		 * @see wp_generate_attachment_metadata()
-		 *
-		 * @param array $metadata Attachment metadata.
 		 */
 		$metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
 		wp_update_attachment_metadata( $attachment_id, $metadata );
@@ -1214,7 +1119,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * Gets attachment uploaded by Media Manager, crops it, then saves it as a
 	 * new object. Returns JSON-encoded object details.
 	 */
-	public function ajax_header_crop() {
+	function ajax_header_crop() {
 		check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );

 		if ( ! current_user_can( 'edit_theme_options' ) ) {
@@ -1248,7 +1153,6 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 			wp_send_json_error( array( 'message' => __( 'Image could not be processed. Please go back and try again.' ) ) );
 		}

-		/** This filter is documented in wp-admin/custom-header.php */
 		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication

 		$object = $this->create_attachment_object( $cropped, $attachment_id );
@@ -1271,7 +1175,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * Triggered when the user tries adds a new header image from the
 	 * Media Manager, even if s/he doesn't save that change.
 	 */
-	public function ajax_header_add() {
+	function ajax_header_add() {
 		check_ajax_referer( 'header-add', 'nonce' );

 		if ( ! current_user_can( 'edit_theme_options' ) ) {
@@ -1297,7 +1201,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * Triggered when the user clicks the overlay "X" button next to each image
 	 * choice in the Customizer's Header tool.
 	 */
-	public function ajax_header_remove() {
+	function ajax_header_remove() {
 		check_ajax_referer( 'header-remove', 'nonce' );

 		if ( ! current_user_can( 'edit_theme_options' ) ) {
@@ -1316,7 +1220,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		wp_send_json_success();
 	}

-	public function customize_set_last_used( $wp_customize ) {
+	function customize_set_last_used( $wp_customize ) {
 		$data = $wp_customize->get_setting( 'header_image_data' )->post_value();

 		if ( ! isset( $data['attachment_id'] ) ) {
--- a/Show More
+++ b/Show More