Tag 4.0.

Built from https://develop.svn.wordpress.org/@29711 git-svn-id: http://core.svn.wordpress.org/tags/4.0@29485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Branch 4.0.
2014-09-04 17:14:07 +00:00 · 2014-09-04 16:09:30 +00:00 · 2014-09-04 15:32:15 +00:00 · 2014-09-04 15:24:16 +00:00 · 2014-09-04 15:23:16 +00:00 · 2014-09-04 15:05:18 +00:00
520 changed files with 29768 additions and 13812 deletions
--- a/readme.html
+++ b/readme.html
@@ -9,7 +9,7 @@
 <body>
 <h1 id="logo">
 	<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
-	<br /> Version 3.9
+	<br /> Version 4.0
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>

--- 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,18 +105,17 @@ get_header();
 			    echo '<p>'.$result->get_error_message().'</p>';
 			}
 		} else {
-			extract($result);
-			$url = get_blogaddress_by_id( (int) $blog_id);
-			$user = get_userdata( (int) $user_id);
+			$url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
+			$user = get_userdata( (int) $result['user_id'] );
 			?>
 			<h2><?php _e('Your account is now active!'); ?></h2>

 			<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 $password; ?></p>
+				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
 			</div>

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

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

 $title = __( 'About' );

@@ -24,7 +27,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 has lots of refinements we think you&#8217;ll love.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s brings you a smoother writing and management experience.' ), $display_version ); ?></div>

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

@@ -40,205 +43,123 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

 <div class="changelog">
 	<div class="about-overview">
-	<?php
-	if ( ( $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>
-	<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-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>
+		<?php if ( ( $locale = get_locale() ) && 'en_' === substr( $locale, 0, 3 ) ) : ?>
+			<embed src="//v.wordpress.com/bUdzKMro" type="application/x-shockwave-flash" width="640" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent"></embed>
+		<?php else : ?>
+			<img class="about-overview-img" src="//s.w.org/images/core/4.0/wp40.png" width="640" height="360" />
+		<?php endif; ?>
 	</div>

-	<hr>
+	<hr />

 	<div class="feature-section col two-col">
 		<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>
+			<h3><?php _e( 'Manage your media with style' ); ?></h3>
+			<p><?php _e( 'Explore your uploads in a beautiful, endless grid. A new details preview makes viewing and editing any amount of media in sequence a snap.' ); ?></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/';
-				?>
-
-				<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>
+			<img src="//s.w.org/images/core/4.0/media.jpg" />
 		</div>
 	</div>
-</div>

-<hr>
+	<hr />

-<div class="changelog customize">
 	<div class="feature-section col two-col">
-		<div>
-			<?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 class="col-1">
+			<div class="about-video about-video-embed">
+				<?php
+					echo wp_video_shortcode( array(
+						'mp4'      => '//s.w.org/images/core/4.0/embed.mp4',
+						'ogv'      => '//s.w.org/images/core/4.0/embed.ogv',
+						'webm'      => '//s.w.org/images/core/4.0/embed.webm',
+						'loop'     => true,
+						'autoplay' => true,
+						'width'    => 500,
+						'height'   => 352
+					) );
+				?>
+			</div>
 		</div>
-		<div class="last-feature">
-			<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 class="col-2 last-feature">
+			<h3><?php _e( 'Working with embeds has never been easier' ); ?></h3>
+			<p><?php _e( 'Paste in a YouTube URL on a new line, and watch it magically become an embedded video. Now try it with a tweet. Oh yeah &#8212; embedding has become a visual experience. The editor shows a true preview of your embedded content, saving you time and giving you confidence.' ); ?></p>
+			<p><?php _e( 'We&#8217;ve expanded the services supported by default, too &#8212; you can embed videos from CollegeHumor, playlists from YouTube, and talks from TED. <a href="http://codex.wordpress.org/Embeds">Check out all of the embeds</a> that WordPress supports.' ); ?></p>
+		</div>
+	</div>
+
+	<hr />
+
+	<div class="feature-section col two-col">
+		<div class="col-1">
+			<h3><?php _e( 'Focus on your content' ); ?></h3>
+			<p><?php _e( 'Writing and editing is smoother and more immersive with an editor that expands to fit your content as you write, and keeps the formatting tools available at all times.' ); ?></p>
+		</div>
+		<div class="col-2 last-feature">
+			<div class="about-video about-video-focus">
+				<?php
+					echo wp_video_shortcode( array(
+						'mp4'      => '//s.w.org/images/core/4.0/focus.mp4',
+						'ogv'      => '//s.w.org/images/core/4.0/focus.ogv',
+						'webm'      => '//s.w.org/images/core/4.0/focus.webm',
+						'loop'     => true,
+						'autoplay' => true,
+						'width'    => 500,
+						'height'   => 281
+					) );
+				?>
+			</div>
+		</div>
+	</div>
+
+	<hr />
+
+	<div class="feature-section col two-col">
+		<div class="col-1">
+			<img src="//s.w.org/images/core/4.0/plugins.png" />
+		</div>
+		<div class="col-2 last-feature">
+			<h3 class="higher"><?php _e( 'Finding the right plugin' ); ?></h3>
+			<p><?php _e( 'There are more than 30,000 free and open source plugins in the WordPress plugin directory. WordPress 4.0 makes it easier to find the right one for your needs, with new metrics, improved search, and a more visual browsing experience.' ); ?></p>
+			<a href="<?php echo admin_url( 'plugin-install.php' ); ?>" class="button button-large button-primary"><?php _e( 'Browse plugins' ); ?></a>
 		</div>
 	</div>
 </div>

-<hr>
+<hr />

 <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>
+		<h4><?php _e( 'Customizer API' ); ?></h4>
+			<p><?php _e( 'Contexts, panels, and a wider array of controls are now supported in the customizer.' ); ?></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>
+			<h4><?php _e( 'Query Ordering' ); ?></h4>
+			<p><?php
+				/* translators: 1: "ORDER BY" (SQL), 2: "WP_Query" */
+				printf( __( 'Developers have more flexibility creating %1$s clauses through %2$s.' ), '<code>ORDER&nbsp;BY</code>', '<code>WP_Query</code>' );
+			?></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>
+			<h4><?php _e( 'External Libraries' ); ?></h4>
+			<p><?php _e( 'Updated libraries: TinyMCE&nbsp;4.1.3, jQuery&nbsp;1.11.1, MediaElement&nbsp;2.15.' ); ?></p>
 		</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="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>
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -14,7 +14,9 @@
 * @since 2.1.0
 */
 define( 'DOING_AJAX', true );
-define( 'WP_ADMIN', true );
+if ( ! defined( 'WP_ADMIN' ) ) {
+	define( 'WP_ADMIN', true );
+}

 /** Load WordPress Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
@@ -58,7 +60,8 @@ $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',
+	'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
+	'parse-media-shortcode'
 );

 // Register core Ajax calls.
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -177,8 +177,9 @@ $admin_body_class .= ' no-customize-support no-svg';

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

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

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

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

-$action = 'admin_post';
+$action = empty( $_REQUEST['action'] ) ? '' : $_REQUEST['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 );
+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}" );
+	}
+}
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -11,8 +11,9 @@
 *
 * @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);
@@ -50,8 +51,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, it is automatically fired, but only when this filter
-	 * returns true.
+	 * In multisite, the DB upgrade routine is automatically fired, but only
+	 * when this filter returns true.
 	 *
 	 * If the network is 50 sites or less, it will run every time. Otherwise,
 	 * it will throttle itself to reduce load.
@@ -150,7 +151,8 @@ 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' ]) )
@@ -204,8 +206,7 @@ if ( isset($plugin_page) ) {
 		/**
 		 * Used to call the registered callback for a plugin screen.
 		 *
-		 * @access private
-		 *
+		 * @internal
 		 * @since 1.5.0
 		 */
 		do_action( $page_hook );
@@ -289,8 +290,9 @@ 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,13 +310,17 @@ if ( isset($plugin_page) ) {
 	 *
 	 * 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 );
-	// Backwards compatibility with old load-page-new.php, load-page.php,
-	// and load-categories.php actions.
+
+	/*
+	 * The following hooks are fired to ensure backward compatibility.
+	 * In all other cases, 'load-' . $pagenow should be used instead.
+	 */
 	if ( $typenow == 'page' ) {
 		if ( $pagenow == 'post-new.php' )
 			do_action( 'load-page-new.php' );
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -10,7 +10,9 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
 	define( 'DOING_AJAX', true );
 }

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

 if ( defined('ABSPATH') )
 	require_once(ABSPATH . 'wp-load.php');
@@ -36,7 +38,7 @@ if ( !current_user_can('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();
@@ -84,7 +86,7 @@ if ( isset( $_REQUEST['post_id'] ) ) {

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

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

 	wp_redirect( $redir );
 	die;
-	break;

 case 'editedcomment' :

@@ -291,11 +290,9 @@ 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 to WordPress %s, the most beautiful WordPress&nbsp;yet.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s brings you a smoother writing and management experience.' ), $display_version ); ?></div>

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

@@ -179,6 +179,7 @@ __( '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
@@ -25,6 +25,7 @@
 .about-wrap img {
 	margin: 0;
 	max-width: 100%;
+	height: auto;
 	vertical-align: middle;
 }

@@ -80,6 +81,10 @@
 	line-height: 1.5em;
 }

+.about-wrap h3.higher {
+	margin-top: .5em;
+}
+
 .customize h3 {
 	margin-top: 1.75em;
 	text-align: center;
@@ -174,17 +179,16 @@

 .about-overview {
 	margin-top: 40px;
+	margin-bottom: 40px;
 	text-align: center;
 }

-.about-overview .wp-video {
-	margin: 0 auto;
-}
-
-.changelog .wp-playlist .wp-playlist-current-item img {
-	height: 64px;
-	width: auto;
-	max-width: 100%;
+.about-overview p {
+	margin: 1em auto 50px;
+	max-width: 770px;
+	font-size: 18px;
+	line-height: 1.5;
+	text-align: center;
 }

 .about-wrap .feature-section {
@@ -194,8 +198,8 @@

 .about-wrap .feature-section.two-col > div {
 	position: relative;
-	width: 47.5%;
-	margin-left: 4.999999999%;
+	width: 47.6%;
+	margin-left: 4.799999999%;
 	float: right;
 }

@@ -228,6 +232,31 @@
 	max-width: 20%;
 }

+/* responsive videos for 4.0 */
+.about-video {
+	position: relative;
+	width: 100%;
+	height: 0;
+}
+
+.about-video-embed {
+	padding-bottom: 70.4%; /* 352 / 500 */
+}
+
+.about-video-focus {
+	padding-bottom: 56.2%; /* 281 / 500 */
+}
+
+.about-video .wp-video,
+.about-video .mejs-container,
+.about-video video {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 100% !important;
+	height: 100% !important;
+}
+
 .about-wrap .changelog li {
 	list-style-type: disc;
 	margin-right: 3em;
@@ -349,6 +378,24 @@

 }

+/* Responsive release video */
+@media screen and ( max-width: 710px ) {
+	.about-overview {
+		position: relative;
+		padding-bottom: 56.25%; /* 360 / 640 */
+		width: 100%;
+		height: 0;
+	}
+
+	.about-overview embed {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+	}
+}
+
@media only screen and (max-width: 500px) {
 	.about-wrap {
 		margin-left: 20px;
@@ -370,6 +417,17 @@
 		width: 100%;
 	}

+	.about-wrap h2.nav-tab-wrapper {
+		padding-right: 0;
+		border-bottom: 0;
+	}
+
+	.about-wrap h2 .nav-tab {
+		margin-top: 10px;
+		margin-left: 10px;
+		border-bottom: 1px solid #ccc;
+	}
+
 	.about-wrap .feature-section.three-col div {
 		width: 100%;
 		float: none;
@@ -385,4 +443,4 @@
 		width: 100%;
 		float: none;
 	}
-}
+}
--- a/wp-admin/css/about.css
+++ b/wp-admin/css/about.css
@@ -25,6 +25,7 @@
 .about-wrap img {
 	margin: 0;
 	max-width: 100%;
+	height: auto;
 	vertical-align: middle;
 }

@@ -80,6 +81,10 @@
 	line-height: 1.5em;
 }

+.about-wrap h3.higher {
+	margin-top: .5em;
+}
+
 .customize h3 {
 	margin-top: 1.75em;
 	text-align: center;
@@ -174,17 +179,16 @@

 .about-overview {
 	margin-top: 40px;
+	margin-bottom: 40px;
 	text-align: center;
 }

-.about-overview .wp-video {
-	margin: 0 auto;
-}
-
-.changelog .wp-playlist .wp-playlist-current-item img {
-	height: 64px;
-	width: auto;
-	max-width: 100%;
+.about-overview p {
+	margin: 1em auto 50px;
+	max-width: 770px;
+	font-size: 18px;
+	line-height: 1.5;
+	text-align: center;
 }

 .about-wrap .feature-section {
@@ -194,8 +198,8 @@

 .about-wrap .feature-section.two-col > div {
 	position: relative;
-	width: 47.5%;
-	margin-right: 4.999999999%;
+	width: 47.6%;
+	margin-right: 4.799999999%;
 	float: left;
 }

@@ -228,6 +232,31 @@
 	max-width: 20%;
 }

+/* responsive videos for 4.0 */
+.about-video {
+	position: relative;
+	width: 100%;
+	height: 0;
+}
+
+.about-video-embed {
+	padding-bottom: 70.4%; /* 352 / 500 */
+}
+
+.about-video-focus {
+	padding-bottom: 56.2%; /* 281 / 500 */
+}
+
+.about-video .wp-video,
+.about-video .mejs-container,
+.about-video video {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100% !important;
+	height: 100% !important;
+}
+
 .about-wrap .changelog li {
 	list-style-type: disc;
 	margin-left: 3em;
@@ -349,6 +378,24 @@

 }

+/* Responsive release video */
+@media screen and ( max-width: 710px ) {
+	.about-overview {
+		position: relative;
+		padding-bottom: 56.25%; /* 360 / 640 */
+		width: 100%;
+		height: 0;
+	}
+
+	.about-overview embed {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
+}
+
@media only screen and (max-width: 500px) {
 	.about-wrap {
 		margin-right: 20px;
@@ -370,6 +417,17 @@
 		width: 100%;
 	}

+	.about-wrap h2.nav-tab-wrapper {
+		padding-left: 0;
+		border-bottom: 0;
+	}
+
+	.about-wrap h2 .nav-tab {
+		margin-top: 10px;
+		margin-right: 10px;
+		border-bottom: 1px solid #ccc;
+	}
+
 	.about-wrap .feature-section.three-col div {
 		width: 100%;
 		float: none;
@@ -385,4 +443,4 @@
 		width: 100%;
 		float: none;
 	}
-}
+}
--- a/wp-admin/css/admin-menu-rtl.css
+++ b/wp-admin/css/admin-menu-rtl.css
@@ -500,7 +500,7 @@ ul#adminmenu > li.current > a.current:after {
 }

 #adminmenu .awaiting-mod,
-#adminmenu span.update-plugins,
+#adminmenu .update-plugins,
 #sidemenu li a span.update-plugins {
 	display: inline-block;
 	background-color: #d54e21;
@@ -612,10 +612,10 @@ li#wp-admin-bar-menu-toggle {


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

 	.auto-fold #adminmenuback,
--- a/wp-admin/css/admin-menu.css
+++ b/wp-admin/css/admin-menu.css
@@ -500,7 +500,7 @@ ul#adminmenu > li.current > a.current:after {
 }

 #adminmenu .awaiting-mod,
-#adminmenu span.update-plugins,
+#adminmenu .update-plugins,
 #sidemenu li a span.update-plugins {
 	display: inline-block;
 	background-color: #d54e21;
@@ -612,10 +612,10 @@ li#wp-admin-bar-menu-toggle {


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

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

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

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

 .wp-color-result:focus {
-	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;
+	-webkit-box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
 }

 .wp-picker-open + .wp-picker-input-wrap {
--- 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: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}
+.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}
--- a/wp-admin/css/color-picker.css
+++ b/wp-admin/css/color-picker.css
@@ -47,13 +47,15 @@
 	box-shadow: inset 0 1px 0 #fff;
 }

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

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

 .wp-color-result:focus {
-	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;
+	-webkit-box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba( 30, 140, 190, 0.8 );
 }

 .wp-picker-open + .wp-picker-input-wrap {
--- 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: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}
+.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}
--- a/wp-admin/css/colors/_admin.scss
+++ b/wp-admin/css/colors/_admin.scss
@@ -400,7 +400,7 @@ ul#adminmenu > li.current > a.current:after {
 }


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

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

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

 .attachment.details .check {
@@ -416,6 +418,15 @@ 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 */

@@ -428,28 +439,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:before {
+body.more-filters-opened .more-filters {
 	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,
+body.more-filters-opened .more-filters:focus {
+	background-color: $menu-highlight-background;
+	color: $menu-highlight-text;
+}
+
 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;
 }

@@ -472,7 +483,6 @@ 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,14 +13,22 @@
 		background: darken( $button-color, 5% );
 		border-color: darken( $button-color, 15% );
 		color: $text-color;
-		box-shadow: inset 0 1px 0 lighten( $button-color, 10% ), 0 1px 0 rgba(0,0,0,.15);
+		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 );
 	}

 	&: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 );
+	 	box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ),
+		            0 0 0 1px #5b9dd9,
+		            0 0 2px 1px rgba( 30, 140, 190, .8 );
 	}

 	&[disabled],
--- a/wp-admin/css/colors/blue/colors-rtl.css
+++ b/wp-admin/css/colors/blue/colors-rtl.css
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #d39323;
  color: white;
  -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #dd9f32;
    border-color: #bd831f;
    color: white;
-    -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); }
+    -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); }
  .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);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #d1cdc7 !important;
    background: #db9825 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #096484; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484; }

 .attachment.details .check {
  background-color: #096484;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #52accc; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #e1a948;
  border-color: #d39323;
  -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #d39323;
  color: white;
  -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #dd9f32;
    border-color: #bd831f;
    color: white;
-    -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); }
+    -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); }
  .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);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #d1cdc7 !important;
    background: #db9825 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #096484; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484; }

 .attachment.details .check {
  background-color: #096484;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #52accc; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #e1a948;
  border-color: #d39323;
  -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  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); }
+          box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #bf9878;
    border-color: #ae7d55;
    color: white;
-    -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); }
+    -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); }
  .wp-core-ui .button-primary:active {
    background: #b78a66;
    border-color: #ae7d55;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #d1cbc7 !important;
    background: #ba906d !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #c7a589; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589; }

 .attachment.details .check {
  background-color: #c7a589;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #59524c; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #c7a589;
  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); }
+          box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  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); }
+          box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #bf9878;
    border-color: #ae7d55;
    color: white;
-    -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); }
+    -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); }
  .wp-core-ui .button-primary:active {
    background: #b78a66;
    border-color: #ae7d55;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #d1cbc7 !important;
    background: #ba906d !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #c7a589; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589; }

 .attachment.details .check {
  background-color: #c7a589;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #59524c; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #c7a589;
  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); }
+          box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #839237;
  color: white;
  -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); }
+          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 #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); }
+    -webkit-box-shadow: inset 0 1px 0 #b7c669;
+            box-shadow: inset 0 1px 0 #b7c669; }
+  .wp-core-ui .button-primary:focus {
+    -webkit-box-shadow: inset 0 1px 0 #b7c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 1px 0 #b7c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary:active {
    background: #839237;
    border-color: #727f30;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #cfd1c7 !important;
    background: #89993a !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #a3b745; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745; }

 .attachment.details .check {
  background-color: #a3b745;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #523f6d; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #a3b745;
  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); }
+          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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #839237;
  color: white;
  -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); }
+          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 #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); }
+    -webkit-box-shadow: inset 0 1px 0 #b7c669;
+            box-shadow: inset 0 1px 0 #b7c669; }
+  .wp-core-ui .button-primary:focus {
+    -webkit-box-shadow: inset 0 1px 0 #b7c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 1px 0 #b7c669, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary:active {
    background: #839237;
    border-color: #727f30;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #cfd1c7 !important;
    background: #89993a !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #a3b745; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745; }

 .attachment.details .check {
  background-color: #a3b745;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #523f6d; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #a3b745;
  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); }
+          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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #037c9a;
  color: white;
  -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #0490b3;
    border-color: #036881;
    color: white;
-    -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); }
+    -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); }
  .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);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #c7cfd1 !important;
    background: #0384a4 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #04a4cc; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc; }

 .attachment.details .check {
  background-color: #04a4cc;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #333;
  background-color: #e5e5e5; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #333; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #04a4cc;
  border-color: #037c9a;
  -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #037c9a;
  color: white;
  -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #0490b3;
    border-color: #036881;
    color: white;
-    -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); }
+    -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); }
  .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);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #c7cfd1 !important;
    background: #0384a4 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #04a4cc; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc; }

 .attachment.details .check {
  background-color: #04a4cc;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #333;
  background-color: #e5e5e5; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #333; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #04a4cc;
  border-color: #037c9a;
  -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #d02a21;
  color: white;
  -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); }
+          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: #dd362d;
    border-color: #ba251e;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 1px 0 #e8756f;
+            box-shadow: inset 0 1px 0 #e8756f; }
+  .wp-core-ui .button-primary:focus {
+    -webkit-box-shadow: inset 0 1px 0 #e8756f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 1px 0 #e8756f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary:active {
    background: #d02a21;
    border-color: #ba251e;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #d1c7c7 !important;
    background: #d92c23 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #e14d43; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43; }

 .attachment.details .check {
  background-color: #e14d43;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #363b3f; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #e14d43;
  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); }
+          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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #d02a21;
  color: white;
  -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); }
+          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: #dd362d;
    border-color: #ba251e;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 1px 0 #e8756f;
+            box-shadow: inset 0 1px 0 #e8756f; }
+  .wp-core-ui .button-primary:focus {
+    -webkit-box-shadow: inset 0 1px 0 #e8756f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 1px 0 #e8756f, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary:active {
    background: #d02a21;
    border-color: #ba251e;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #d1c7c7 !important;
    background: #d92c23 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #e14d43; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43; }

 .attachment.details .check {
  background-color: #e14d43;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #363b3f; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #e14d43;
  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); }
+          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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #80a583;
  color: white;
  -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #8faf91;
    border-color: #719a74;
    color: white;
-    -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); }
+    -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); }
  .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);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #c7d1c8 !important;
    background: #86a988 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #9ebaa0; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0; }

 .attachment.details .check {
  background-color: #9ebaa0;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #738e96; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #9ebaa0;
  border-color: #80a583;
  -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #80a583;
  color: white;
  -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }
  .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus {
    background: #8faf91;
    border-color: #719a74;
    color: white;
-    -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); }
+    -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); }
  .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);
-    box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #c7d1c8 !important;
    background: #86a988 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #9ebaa0; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0; }

 .attachment.details .check {
  background-color: #9ebaa0;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #738e96; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #9ebaa0;
  border-color: #80a583;
  -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }
+          box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }

 /* Thickbox: Plugin information */
 #sidemenu a.current {
--- 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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #c36822;
  color: white;
  -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); }
+          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: #d97326;
    border-color: #ad5c1e;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 1px 0 #e59d66;
+            box-shadow: inset 0 1px 0 #e59d66; }
+  .wp-core-ui .button-primary:focus {
+    -webkit-box-shadow: inset 0 1px 0 #e59d66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 1px 0 #e59d66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary:active {
    background: #c36822;
    border-color: #ad5c1e;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #d1cbc7 !important;
    background: #cc6c23 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #dd823b; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b; }

 .attachment.details .check {
  background-color: #dd823b;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #cf4944; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #dd823b;
  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); }
+          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
@@ -30,19 +30,22 @@ input[type=radio]:checked:before {
  border-color: #c36822;
  color: white;
  -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); }
+          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: #d97326;
    border-color: #ad5c1e;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 1px 0 #e59d66;
+            box-shadow: inset 0 1px 0 #e59d66; }
+  .wp-core-ui .button-primary:focus {
+    -webkit-box-shadow: inset 0 1px 0 #e59d66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 1px 0 #e59d66, 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary:active {
    background: #c36822;
    border-color: #ad5c1e;
    color: white;
-    -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); }
+    -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
+            box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8); }
  .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled {
    color: #d1cbc7 !important;
    background: #cc6c23 !important;
@@ -254,18 +257,22 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
 .wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow {
  border-bottom-color: #dd823b; }

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

 .details.attachment {
-  -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; }
+  -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b;
+          box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b; }

 .attachment.details .check {
  background-color: #dd823b;
  -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b;
-  box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b; }
+          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 {
@@ -274,20 +281,23 @@ 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:before {
+body.more-filters-opened .more-filters {
  color: #fff;
  background-color: #cf4944; }

-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 {
+body.more-filters-opened .more-filters:before {
+  color: #fff; }
+
+body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus {
  background-color: #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;
@@ -306,7 +316,7 @@ body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-fil
  background: #dd823b;
  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); }
+          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
@@ -9,16 +9,17 @@

 #wpcontent {
 	height: 100%;
+	padding-right: 20px;
 }

 #wpcontent,
 #wpfooter {
-	margin-right: 180px;
+	margin-right: 160px;
 }

 .folded #wpcontent,
 .folded #wpfooter {
-	margin-right: 56px;
+	margin-right: 36px;
 }

 #wpbody-content {
@@ -218,6 +219,10 @@ body.iframe {
 	padding-top: 1px;
 }

+body.modal-open {
+	overflow: hidden;
+}
+
 iframe,
 img {
 	border: 0;
@@ -252,16 +257,22 @@ a:active {

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

-a:focus,
-a:active {
-	outline: thin dotted;
+.ie8 a:focus {
+	outline: #5b9dd9 solid 1px;
 }

 #adminmenu a:focus,
-#adminmenu a:active,
 .screen-reader-text:focus {
+	-webkit-box-shadow: none;
+	box-shadow: none;
 	outline: none;
 }

@@ -699,12 +710,9 @@ td.help {
 ------------------------------------------------------------------------------*/

 .widget .widget-top,
-.postbox h3,
-.stuffbox h3,
+.postbox .hndle,
+.stuffbox .hndle,
 .control-section .accordion-section-title,
-h3.dashboard-widget-title,
-h3.dashboard-widget-title span,
-h3.dashboard-widget-title small,
 .sidebar-name,
 #nav-menu-header,
 #nav-menu-footer,
@@ -723,9 +731,8 @@ h3.dashboard-widget-title small,
 	color: #222;
 }

-.postbox h3,
-#namediv h3,
-#submitdiv h3 {
+.postbox .hndle,
+.stuffbox .hndle {
 	border-bottom: 1px solid #eee;
 }

@@ -741,7 +748,7 @@ h3.dashboard-widget-title small,
 }

 /* @todo can we combine these into a class or use an existing dashicon one? */
-#welcome-panel.welcome-panel .welcome-panel-close::before,
+#welcome-panel.welcome-panel .welcome-panel-close:before,
 .tagchecklist span a:before,
 #bulk-titles div a:before {
 	background: none;
@@ -751,12 +758,20 @@ h3.dashboard-widget-title small,
 	font: normal 16px/1 'dashicons';
 	speak: none;
 	height: 20px;
-	margin: 2px 0;
 	text-align: center;
 	width: 20px;
 	-webkit-font-smoothing: antialiased !important;
 }

+#welcome-panel.welcome-panel .welcome-panel-close:before {
+	margin: 0;
+}
+
+.tagchecklist span a:before,
+#bulk-titles div a:before {
+	margin: 2px 0;
+}
+
 #welcome-panel.welcome-panel .welcome-panel-close:hover:before,
 .tagchecklist span a:hover:before,
 #bulk-titles div a:hover:before {
@@ -918,6 +933,320 @@ th.action-links {
 	text-align: left;
 }

+/* Filter bar */
+.wp-filter {
+	display: inline-block;
+	position: relative;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	margin: 12px 0 25px;
+	padding: 0 20px;
+	width: 100%;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	border: 1px solid #e5e5e5;
+	background: #fff;
+	color: #555;
+	font-size: 13px;
+}
+
+.wp-filter a {
+	text-decoration: none;
+}
+
+.filter-count {
+	display: inline-block;
+	vertical-align: middle;
+	min-width: 4em;
+}
+
+.title-count,
+.filter-count .count {
+	display: inline-block;
+	position: relative;
+	top: -1px;
+	padding: 4px 10px;
+	-webkit-border-radius: 30px;
+	border-radius: 30px;
+	background: #777;
+	color: #fff;
+	font-size: 14px;
+	font-weight: 600;
+}
+
+/* not a part of filter bar, but derived from it, so here for now */
+.title-count {
+	display: inline;
+	top: -3px;
+	margin-right: 5px;
+	margin-left: 20px;
+}
+
+.filter-links {
+	display: inline-block;
+	margin: 0;
+}
+
+.filter-links li {
+	display: inline-block;
+	margin: 0;
+}
+
+.filter-links li > a {
+	display: inline-block;
+	margin: 0 10px;
+	padding: 15px 0;
+	border-bottom: 4px solid #fff;
+	color: #666;
+	cursor: pointer;
+}
+
+.filter-links .current {
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	border-bottom: 4px solid #666;
+	color: #222;
+}
+
+.filter-links li > a:hover,
+.filter-links li > a:focus,
+.show-filters .filter-links a.current:hover,
+.show-filters .filter-links a.current:focus {
+	color: #2ea2cc;
+}
+
+.wp-filter .search-form {
+	float: left;
+	margin-top: 9px;
+}
+
+.wp-filter .search-form input[type="search"] {
+	margin: 0;
+	padding: 3px 5px;
+	width: 280px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.5;
+}
+
+.wp-filter .search-form select {
+	height: 33px;
+	vertical-align: top;
+}
+
+.wp-filter .drawer-toggle {
+	display: inline-block;
+	margin: 0 10px;
+	padding: 4px 6px;
+	color: #666;
+	cursor: pointer;
+}
+
+.wp-filter .drawer-toggle:before {
+	display: inline-block;
+	vertical-align: top;
+	content: "\f111";
+	margin: 0 0 0 5px;
+	width: 16px;
+	height: 16px;
+	color: #777;
+	-webkit-transition: color .1s ease-in 0;
+	transition: color .1s ease-in 0;
+	font-family: "dashicons";
+	font-size: 16px;
+	line-height: 1;
+	text-align: center;
+	text-decoration: inherit;
+	font-weight: normal;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+}
+
+.wp-filter .drawer-toggle:hover,
+.wp-filter .drawer-toggle:hover:before {
+	color: #2ea2cc;
+}
+
+.wp-filter .drawer-toggle.current:before {
+	color: #fff;
+}
+
+.filter-drawer {
+	display: none;
+	margin: 0 -20px;
+	padding: 20px;
+	border-top: 1px solid #eee;
+	background: #fafafa;
+}
+
+.show-filters .filter-drawer {
+	display: block;
+	overflow: hidden;
+}
+
+.show-filters .wp-filter .drawer-toggle:hover,
+.show-filters .wp-filter .drawer-toggle:focus {
+	background: rgb(46, 162, 204);
+}
+
+.show-filters .filter-links a.current {
+	border-bottom: none;
+}
+
+.show-filters .wp-filter .drawer-toggle {
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	border: none;
+	background: #777;
+	color: #fff;
+}
+
+.show-filters .wp-filter .drawer-toggle:before {
+	color: #fff;
+}
+
+.filter-group {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: right;
+	margin: 0 0 0 1%;
+	padding: 10px;
+	width: 19%;
+	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);
+}
+
+.filter-group.wide {
+	width: 38%;
+}
+
+.filter-group h4 {
+	position: relative;
+	margin: 0;
+}
+
+.filter-drawer ol {
+	margin: 20px 0 0;
+	list-style-type: none;
+	font-size: 12px;
+}
+
+.filter-drawer li {
+	display: inline-block;
+	vertical-align: top;
+	margin: 5px 0;
+	padding-left: 25px;
+	width: 160px;
+	list-style-type: none;
+}
+
+.filter-drawer .buttons {
+	margin-bottom: 20px;
+}
+
+.filter-drawer .buttons .button span {
+	display: inline-block;
+	opacity: 0.8;
+	font-size: 12px;
+	text-indent: 10px;
+}
+
+.wp-filter .button.clear-filters {
+	display: none;
+	margin: 0 10px 20px 0;
+}
+
+.filtered-by {
+	display: none;
+	margin: 0;
+}
+
+.filtered-by > span {
+	font-weight: 600;
+}
+
+.filtered-by a {
+	margin-right: 10px;
+}
+
+.filtered-by .tags {
+	display: inline;
+}
+
+.filtered-by .tag {
+	margin: 0 5px;
+	padding: 4px 8px;
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	background: #fff;
+	font-size: 11px;
+}
+
+.filters-applied .filter-group,
+.filters-applied .filter-drawer .buttons,
+.filters-applied .filter-drawer br {
+	display: none !important;
+}
+
+.filters-applied .filtered-by {
+	display: block;
+}
+
+.filters-applied .filter-drawer {
+	padding: 20px;
+}
+
+.show-filters .content-filterable,
+.show-filters.filters-applied.loading-content .content-filterable,
+.loading-content .content-filterable,
+.error .content-filterable {
+	display: none;
+}
+
+.show-filters.filters-applied .content-filterable {
+	display: block;
+}
+
+.loading-content .spinner {
+	display: block;
+	margin: 40px auto 0;
+	float: none;
+}
+
+@media only screen and (max-width: 1120px) {
+	.wp-filter .search-form {
+		float: none;
+		margin: 20px 0;
+	}
+
+	.filter-drawer {
+		border-bottom: 1px solid #eee;
+	}
+
+	.filter-group {
+		margin-bottom: 0;
+		margin-top: 5px;
+		width: 100%;
+	}
+
+	.filter-group li {
+		margin: 10px 0;
+	}
+}
+
+@media only screen and (max-width: 782px) {
+	.filter-group,
+	.filter-group li {
+		width: 100%;
+	}
+
+}
+

 /*------------------------------------------------------------------------------
  4.0 - Notifications
@@ -1054,12 +1383,6 @@ form.upgrade .hint {
 	color: #333;
 }

-#screen-meta-links a:focus {
-	border-color: #aaa;
-	-webkit-box-shadow: 0 2px 3px rgba(0,0,0,0.15);
-	box-shadow: 0 2px 3px rgba(0,0,0,0.15);
-}
-
 #screen-meta-links a.show-settings {
 	display: block;
 	font-size: 13px;
@@ -1343,6 +1666,7 @@ html.wp-toolbar {
 	}
 }

+.js .widget .widget-top,
 .js .postbox .hndle {
 	cursor: move;
 }
@@ -1374,20 +1698,15 @@ html.wp-toolbar {
 	line-height: 1;
 }

-.postbox h3,
-.stuffbox h3 {
-	margin-top: 1px;
+/* user-select is not a part of the CSS standard - may change behavior in the future */
+.postbox .hndle,
+.stuffbox .hndle {
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
 }

-.js .widget .widget-top,
-.js .postbox h3 {
-	cursor: move;
-}
-
 .postbox .inside,
 .stuffbox .inside {
 	padding: 0 12px 12px;
@@ -1454,8 +1773,7 @@ html.wp-toolbar {
 	bottom: 0;
 	right: 0;
 	left: 0;
-	padding: 10px 0;
-	margin-left: 20px;
+	padding: 10px 20px;
 	color: #777;
 }

@@ -1651,6 +1969,10 @@ td.media-icon img {
 	max-height: 60px;
 }

+td.image-icon img {
+	border: 1px solid rgba(0, 0, 0, 0.07);
+}
+
 #howto {
 	font-size: 11px;
 	margin: 0 5px;
@@ -1795,21 +2117,28 @@ div.action-links {

 /* Plugin install thickbox */
 #plugin-information {
-	background: #fcfcfc;
+	background: #fff;
 	position: fixed;
 	top: 0;
 	left: 0;
 	bottom: 0;
 	right: 0;
-	height: auto;
+	height: 100%;
 	padding: 0;
 }

+#plugin-information-scrollable {
+	overflow: auto;
+	height: 100%;
+}
+
 #plugin-information-title {
-	padding: 0 20px 0 76px;
+	padding: 0 20px;
+	background: #f5f5f5;
 	font-size: 22px;
 	font-weight: 600;
 	line-height: 56px;
+	position: relative;
 	top: 0;
 	left: 0;
 	right: 0;
@@ -1819,20 +2148,72 @@ div.action-links {
 	white-space: nowrap;
 }

+#plugin-information-title.with-banner {
+	margin-left: 0;
+	height: 250px;
+	bottom: 250px;
+	-webkit-background-size: 100% auto;
+	background-size: 100% auto;
+}
+
+#plugin-information-title h2 {
+	font-size: 1em;
+	font-weight: bold;
+	padding: 0;
+	margin: 0;
+	max-width: 680px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+#plugin-information-title.with-banner h2 {
+	font-family: "Helvetica Neue", sans-serif;
+	display: inline-block;
+	font-size: 30px;
+	line-height: 50px;
+	padding: 0 15px;
+	margin: 174px 10px 0 0;
+	color: #fff;
+	background: rgba( 30, 30, 30, 0.9 );
+	text-shadow: 0 1px 3px rgba( 0, 0, 0, 0.4 );
+	-webkit-box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 );
+	box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 );
+	-webkit-border-radius: 8px;
+	border-radius: 8px;
+}
+
+#plugin-information-title div.vignette {
+	display: none;
+}
+
+#plugin-information-title.with-banner div.vignette {
+	display: block;
+	float: left;
+	top: 0;
+	height: 250px;
+	width: 830px;
+	margin: 0 -20px;
+	background: transparent;
+	-webkit-box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 );
+	box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 );
+}
+
 #plugin-information-tabs {
 	padding: 0 16px;
-	position: absolute;
-	top: 56px;
+	position: relative;
 	left: 0;
 	right: 0;
 	height: 36px;
 	z-index: 1;
+	border-bottom: 1px solid #ddd;
+	background: #f3f3f3;
 }

 #plugin-information-tabs a {
 	position: relative;
 	float: right;
-	padding: 8px 10px 9px;
+	padding: 9px 10px;
 	margin: 0;
 	height: 18px;
 	line-height: 18px;
@@ -1843,38 +2224,53 @@ div.action-links {
 }

 #plugin-information-tabs a.current {
-	margin: -1px -1px 0;
+	margin: 0 -1px 0;
 	background: #fff;
 	border: 1px solid #ddd;
-	border-bottom: none;
+	border-bottom-color: #fff;
+	padding-top: 8px;
 	color: #333;
 }

+#plugin-information-tabs.with-banner a.current {
+	border-top: none;
+	padding-top: 9px;
+}
+
 #plugin-information-tabs a:active,
 #plugin-information-tabs a:focus {
 	outline: none;
 }

 #plugin-information-content {
+	overflow: hidden; /* equal height column trick */
 	background: #fff;
-	border-top: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
-	position: absolute;
-	top: 90px;
+	position: relative;
+	top: 0;
 	left: 0;
-	bottom: 58px;
 	right: 0;
+	min-height: 100%;
+	/* Height of title + tabs + install now */
+	min-height: -webkit-calc( 100% - 152px );
+	min-height: calc( 100% - 152px );
+}
+
+#plugin-information-content.with-banner {
+	/* Height of banner + tabs + install now */
+	min-height: -webkit-calc( 100% - 346px );
+	min-height: calc( 100% - 346px );
 }

 #section-holder {
-	margin: 0;
-	padding: 10px 26px;
-	position: absolute;
+	position: relative;
 	top: 0;
 	left: 250px;
 	bottom: 0;
 	right: 0;
-	overflow: auto;
+	margin-left: 250px; /* FYI box */
+	padding: 10px 26px;
+	margin-bottom: -99930px; /* a bit less than the padding below to accommodate footer */
+	padding-bottom: 99999px; /* equal height column trick */
 }

 #section-holder .updated {
@@ -1882,16 +2278,18 @@ div.action-links {
 }

 #plugin-information .fyi {
-	background: #f3f3f3;
-	border-right: 1px solid #ddd;
-	color: #666;
-	padding: 16px;
-	position: absolute;
+	display: block;
+	float: left;
+	position: relative;
 	top: 0;
 	left: 0;
-	bottom: 0;
+	padding: 16px;
+	margin-bottom: -99930px; /* slightly less than the padding below to accommodate footer */
+	padding-bottom: 99999px; /* equal height column trick */
 	width: 217px;
-	overflow: auto;
+	border-right: 1px solid #ddd;
+	background: #f3f3f3;
+	color: #666;
 }

 #plugin-information .fyi strong {
@@ -1922,6 +2320,54 @@ div.action-links {
 	margin: 0 0 10px;
 }

+#plugin-information .counter-container {
+	margin: 3px 0;
+}
+
+#plugin-information .counter-label {
+	float: right;
+	margin-left: 5px;
+	min-width: 55px;
+}
+
+#plugin-information .counter-back {
+	height: 17px;
+	width: 92px;
+	background-color: #ececec;
+	float: right;
+}
+
+#plugin-information .counter-bar {
+	height: 17px;
+	background-color: #fddb5a;
+	float: right;
+}
+
+#plugin-information .counter-count {
+	margin-right: 5px;
+}
+
+#plugin-information .fyi ul.contributors {
+	margin-top: 10px;
+}
+
+#plugin-information .fyi ul.contributors li {
+	display: inline-block;
+	margin-left: 8px;
+	vertical-align: middle;
+}
+
+#plugin-information .fyi ul.contributors li {
+	display: inline-block;
+	margin-left: 8px;
+	vertical-align: middle;
+}
+
+#plugin-information .fyi ul.contributors li img {
+	vertical-align: middle;
+	margin-left: 4px;
+}
+
 #plugin-information-footer {
 	padding: 15px 16px;
 	position: absolute;
@@ -1929,12 +2375,20 @@ div.action-links {
 	bottom: 0;
 	right: 0;
 	height: 28px;
+	border-top: 1px solid #ddd;
+	background: #f3f3f3;
 }

+/* @noflip */
+#plugin-information .section {
+	direction: ltr;
+}
+
+/* @noflip */
 #plugin-information .section ul,
 #plugin-information .section ol {
 	list-style-type: disc;
-	margin-right: 24px;
+	margin-left: 24px;
 }

 #plugin-information .section,
@@ -1958,9 +2412,10 @@ div.action-links {
 	box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.3 );
 }

+/* @noflip */
 #plugin-information #section-screenshots li p {
 	font-style: italic;
-	padding-right: 20px;
+	padding-left: 20px;
 }

 #plugin-information pre {
@@ -1969,25 +2424,101 @@ div.action-links {
 	border: 1px solid #ccc;
 }

+/* @noflip */
+#plugin-information .review {
+	overflow: hidden; /* clearfix */
+	width: 100%;
+	margin-bottom: 20px;
+	border-bottom: 1px solid #e6e6e6;
+}
+
+#plugin-information .review-title-section {
+	overflow: hidden; /* clearfix */
+}
+
+/* @noflip */
+#plugin-information .review-title-section h4 {
+	display: inline-block;
+	float: left;
+	margin: 0 6px 0 0;
+}
+
+#plugin-information .reviewer-info p {
+	clear: both;
+	margin: 0;
+	padding-top: 2px;
+}
+
+/* @noflip */
+#plugin-information .reviewer-info .avatar {
+	float: left;
+	margin: 4px 6px 0 0;
+}
+
+/* @noflip */
+#plugin-information .reviewer-info .star-rating {
+	float: left;
+}
+
+/* @noflip */
+#plugin-information .review-meta {
+	float: left;
+	margin-left: 0.75em;
+}
+
+/* @noflip */
+#plugin-information .review-body {
+	float: left;
+	width: 100%;
+}
+
 .plugin-version-author-uri {
 	font-size: 13px;
 }

-@media screen and ( max-width: 782px ) {
-	#plugin-information-content {
-		overflow: auto;
-		bottom: 58px;
+@media screen and ( max-width: 771px ) {
+	#plugin-information-title.with-banner {
+		height: 100px;
+		bottom: 100px;
+	}
+
+	#plugin-information-title.with-banner h2 {
+		margin-top: 30px;
+		font-size: 20px;
+		line-height: 40px;
+		max-width: 85%;
+	}
+
+	#plugin-information-title.with-banner div.vignette {
+		height: 100px;
+		bottom: 100px;
+		width: 800%;
+	}
+
+	#plugin-information-tabs {
+		overflow: hidden; /* clearfix */
+		padding: 0;
+		height: auto; /* let tabs wrap */
+	}
+
+	#plugin-information-tabs a.current {
+		margin-bottom: 0;
+		border-bottom: none;
 	}

 	#plugin-information .fyi {
+		float: none;
 		border: 1px solid #ddd;
 		position: static;
 		width: auto;
-		margin: 26px 26px 16px;
+		margin: 26px 26px 0;
+		padding-bottom: 0; /* reset from the two column height fix */
 	}

 	#section-holder {
 		position: static;
+		margin: 0;
+		padding-bottom: 70px; /* reset from the two column height fix, plus accomodate footer */
 	}

 	#plugin-information .fyi h3,
@@ -2048,9 +2579,37 @@ body.import-php .tb-close-icon,
 body.plugins-php .tb-close-icon,
 body.update-core-php .tb-close-icon,
 body.index-php .tb-close-icon {
-	line-height: 48px;
-	width: 48px;
-	height: 48px;
+	right: auto;
+	left: -30px;
+	color: #eee;
+	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
+	transition: color .1s ease-in-out, background .1s ease-in-out;
+}
+
+body.plugin-install-php #TB_closeWindowButton:focus,
+body.plugin-install-php #TB_closeWindowButton:focus .tb-close-icon,
+body.plugin-install-php .tb-close-icon:focus,
+body.plugin-install-php .tb-close-icon:hover,
+body.import-php #TB_closeWindowButton:focus,
+body.import-php #TB_closeWindowButton:focus .tb-close-icon,
+body.import-php .tb-close-icon:focus,
+body.import-php .tb-close-icon:hover,
+body.plugins-php #TB_closeWindowButton:focus,
+body.plugins-php #TB_closeWindowButton:focus .tb-close-icon,
+body.plugins-php .tb-close-icon:focus,
+body.plugins-php .tb-close-icon:hover,
+body.update-core-php #TB_closeWindowButton:focus,
+body.update-core-php #TB_closeWindowButton:focus .tb-close-icon,
+body.update-core-php .tb-close-icon:focus,
+body.update-core-php .tb-close-icon:hover,
+body.index-php #TB_closeWindowButton:focus,
+body.index-php #TB_closeWindowButton:focus .tb-close-icon,
+body.index-php .tb-close-icon:focus,
+body.index-php .tb-close-icon:hover {
+	color: #2ea2cc;
+	outline: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }

 body.plugin-install-php .tb-close-icon:before,
@@ -2058,7 +2617,20 @@ body.import-php .tb-close-icon:before,
 body.plugins-php .tb-close-icon:before,
 body.update-core-php .tb-close-icon:before,
 body.index-php .tb-close-icon:before {
-	line-height: 48px;
+	content: "\f335";
+	font-size: 32px;
+}
+
+/* move plugin install close icon to top on narrow screens */
+@media screen and ( max-width: 830px ) {
+	body.plugin-install-php .tb-close-icon,
+	body.import-php .tb-close-icon,
+	body.plugins-php .tb-close-icon,
+	body.update-core-php .tb-close-icon,
+	body.index-php .tb-close-icon {
+		left: 0;
+		top: -30px;
+	}
 }

 /* @todo: move this. */
@@ -2270,7 +2842,8 @@ img {

 .control-section.open .accordion-section-title:after,
 #customize-info.open .accordion-section-title:after,
-.nav-menus-php .menu-item-edit-active .item-edit:before {
+.nav-menus-php .menu-item-edit-active .item-edit:before,
+.widget.open .widget-top a.widget-action:after {
 	content: '\f142';
 }

@@ -2487,10 +3060,6 @@ img {
 		-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
 	}

-	#wpwrap {
-		background: #f0f0f0;
-	}
-
 	#wpcontent {
 		position: relative;
 		margin-right: 0;
@@ -2550,6 +3119,10 @@ img {
 		left: -190px;
 	}

+	code {
+		word-wrap: break-word;
+	}
+
 	/* General Metabox */
 	.postbox {
 		font-size: 14px;
--- a/wp-admin/css/common.css
+++ b/wp-admin/css/common.css
@@ -9,16 +9,17 @@

 #wpcontent {
 	height: 100%;
+	padding-left: 20px;
 }

 #wpcontent,
 #wpfooter {
-	margin-left: 180px;
+	margin-left: 160px;
 }

 .folded #wpcontent,
 .folded #wpfooter {
-	margin-left: 56px;
+	margin-left: 36px;
 }

 #wpbody-content {
@@ -218,6 +219,10 @@ body.iframe {
 	padding-top: 1px;
 }

+body.modal-open {
+	overflow: hidden;
+}
+
 iframe,
 img {
 	border: 0;
@@ -252,16 +257,22 @@ a:active {

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

-a:focus,
-a:active {
-	outline: thin dotted;
+.ie8 a:focus {
+	outline: #5b9dd9 solid 1px;
 }

 #adminmenu a:focus,
-#adminmenu a:active,
 .screen-reader-text:focus {
+	-webkit-box-shadow: none;
+	box-shadow: none;
 	outline: none;
 }

@@ -699,12 +710,9 @@ td.help {
 ------------------------------------------------------------------------------*/

 .widget .widget-top,
-.postbox h3,
-.stuffbox h3,
+.postbox .hndle,
+.stuffbox .hndle,
 .control-section .accordion-section-title,
-h3.dashboard-widget-title,
-h3.dashboard-widget-title span,
-h3.dashboard-widget-title small,
 .sidebar-name,
 #nav-menu-header,
 #nav-menu-footer,
@@ -723,9 +731,8 @@ h3.dashboard-widget-title small,
 	color: #222;
 }

-.postbox h3,
-#namediv h3,
-#submitdiv h3 {
+.postbox .hndle,
+.stuffbox .hndle {
 	border-bottom: 1px solid #eee;
 }

@@ -741,7 +748,7 @@ h3.dashboard-widget-title small,
 }

 /* @todo can we combine these into a class or use an existing dashicon one? */
-#welcome-panel.welcome-panel .welcome-panel-close::before,
+#welcome-panel.welcome-panel .welcome-panel-close:before,
 .tagchecklist span a:before,
 #bulk-titles div a:before {
 	background: none;
@@ -751,12 +758,20 @@ h3.dashboard-widget-title small,
 	font: normal 16px/1 'dashicons';
 	speak: none;
 	height: 20px;
-	margin: 2px 0;
 	text-align: center;
 	width: 20px;
 	-webkit-font-smoothing: antialiased !important;
 }

+#welcome-panel.welcome-panel .welcome-panel-close:before {
+	margin: 0;
+}
+
+.tagchecklist span a:before,
+#bulk-titles div a:before {
+	margin: 2px 0;
+}
+
 #welcome-panel.welcome-panel .welcome-panel-close:hover:before,
 .tagchecklist span a:hover:before,
 #bulk-titles div a:hover:before {
@@ -918,6 +933,320 @@ th.action-links {
 	text-align: right;
 }

+/* Filter bar */
+.wp-filter {
+	display: inline-block;
+	position: relative;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	margin: 12px 0 25px;
+	padding: 0 20px;
+	width: 100%;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	border: 1px solid #e5e5e5;
+	background: #fff;
+	color: #555;
+	font-size: 13px;
+}
+
+.wp-filter a {
+	text-decoration: none;
+}
+
+.filter-count {
+	display: inline-block;
+	vertical-align: middle;
+	min-width: 4em;
+}
+
+.title-count,
+.filter-count .count {
+	display: inline-block;
+	position: relative;
+	top: -1px;
+	padding: 4px 10px;
+	-webkit-border-radius: 30px;
+	border-radius: 30px;
+	background: #777;
+	color: #fff;
+	font-size: 14px;
+	font-weight: 600;
+}
+
+/* not a part of filter bar, but derived from it, so here for now */
+.title-count {
+	display: inline;
+	top: -3px;
+	margin-left: 5px;
+	margin-right: 20px;
+}
+
+.filter-links {
+	display: inline-block;
+	margin: 0;
+}
+
+.filter-links li {
+	display: inline-block;
+	margin: 0;
+}
+
+.filter-links li > a {
+	display: inline-block;
+	margin: 0 10px;
+	padding: 15px 0;
+	border-bottom: 4px solid #fff;
+	color: #666;
+	cursor: pointer;
+}
+
+.filter-links .current {
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	border-bottom: 4px solid #666;
+	color: #222;
+}
+
+.filter-links li > a:hover,
+.filter-links li > a:focus,
+.show-filters .filter-links a.current:hover,
+.show-filters .filter-links a.current:focus {
+	color: #2ea2cc;
+}
+
+.wp-filter .search-form {
+	float: right;
+	margin-top: 9px;
+}
+
+.wp-filter .search-form input[type="search"] {
+	margin: 0;
+	padding: 3px 5px;
+	width: 280px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.5;
+}
+
+.wp-filter .search-form select {
+	height: 33px;
+	vertical-align: top;
+}
+
+.wp-filter .drawer-toggle {
+	display: inline-block;
+	margin: 0 10px;
+	padding: 4px 6px;
+	color: #666;
+	cursor: pointer;
+}
+
+.wp-filter .drawer-toggle:before {
+	display: inline-block;
+	vertical-align: top;
+	content: "\f111";
+	margin: 0 5px 0 0;
+	width: 16px;
+	height: 16px;
+	color: #777;
+	-webkit-transition: color .1s ease-in 0;
+	transition: color .1s ease-in 0;
+	font-family: "dashicons";
+	font-size: 16px;
+	line-height: 1;
+	text-align: center;
+	text-decoration: inherit;
+	font-weight: normal;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+}
+
+.wp-filter .drawer-toggle:hover,
+.wp-filter .drawer-toggle:hover:before {
+	color: #2ea2cc;
+}
+
+.wp-filter .drawer-toggle.current:before {
+	color: #fff;
+}
+
+.filter-drawer {
+	display: none;
+	margin: 0 -20px;
+	padding: 20px;
+	border-top: 1px solid #eee;
+	background: #fafafa;
+}
+
+.show-filters .filter-drawer {
+	display: block;
+	overflow: hidden;
+}
+
+.show-filters .wp-filter .drawer-toggle:hover,
+.show-filters .wp-filter .drawer-toggle:focus {
+	background: rgb(46, 162, 204);
+}
+
+.show-filters .filter-links a.current {
+	border-bottom: none;
+}
+
+.show-filters .wp-filter .drawer-toggle {
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	border: none;
+	background: #777;
+	color: #fff;
+}
+
+.show-filters .wp-filter .drawer-toggle:before {
+	color: #fff;
+}
+
+.filter-group {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+	margin: 0 1% 0 0;
+	padding: 10px;
+	width: 19%;
+	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);
+}
+
+.filter-group.wide {
+	width: 38%;
+}
+
+.filter-group h4 {
+	position: relative;
+	margin: 0;
+}
+
+.filter-drawer ol {
+	margin: 20px 0 0;
+	list-style-type: none;
+	font-size: 12px;
+}
+
+.filter-drawer li {
+	display: inline-block;
+	vertical-align: top;
+	margin: 5px 0;
+	padding-right: 25px;
+	width: 160px;
+	list-style-type: none;
+}
+
+.filter-drawer .buttons {
+	margin-bottom: 20px;
+}
+
+.filter-drawer .buttons .button span {
+	display: inline-block;
+	opacity: 0.8;
+	font-size: 12px;
+	text-indent: 10px;
+}
+
+.wp-filter .button.clear-filters {
+	display: none;
+	margin: 0 0 20px 10px;
+}
+
+.filtered-by {
+	display: none;
+	margin: 0;
+}
+
+.filtered-by > span {
+	font-weight: 600;
+}
+
+.filtered-by a {
+	margin-left: 10px;
+}
+
+.filtered-by .tags {
+	display: inline;
+}
+
+.filtered-by .tag {
+	margin: 0 5px;
+	padding: 4px 8px;
+	border: 1px solid #e5e5e5;
+	-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
+	background: #fff;
+	font-size: 11px;
+}
+
+.filters-applied .filter-group,
+.filters-applied .filter-drawer .buttons,
+.filters-applied .filter-drawer br {
+	display: none !important;
+}
+
+.filters-applied .filtered-by {
+	display: block;
+}
+
+.filters-applied .filter-drawer {
+	padding: 20px;
+}
+
+.show-filters .content-filterable,
+.show-filters.filters-applied.loading-content .content-filterable,
+.loading-content .content-filterable,
+.error .content-filterable {
+	display: none;
+}
+
+.show-filters.filters-applied .content-filterable {
+	display: block;
+}
+
+.loading-content .spinner {
+	display: block;
+	margin: 40px auto 0;
+	float: none;
+}
+
+@media only screen and (max-width: 1120px) {
+	.wp-filter .search-form {
+		float: none;
+		margin: 20px 0;
+	}
+
+	.filter-drawer {
+		border-bottom: 1px solid #eee;
+	}
+
+	.filter-group {
+		margin-bottom: 0;
+		margin-top: 5px;
+		width: 100%;
+	}
+
+	.filter-group li {
+		margin: 10px 0;
+	}
+}
+
+@media only screen and (max-width: 782px) {
+	.filter-group,
+	.filter-group li {
+		width: 100%;
+	}
+
+}
+

 /*------------------------------------------------------------------------------
  4.0 - Notifications
@@ -1054,12 +1383,6 @@ form.upgrade .hint {
 	color: #333;
 }

-#screen-meta-links a:focus {
-	border-color: #aaa;
-	-webkit-box-shadow: 0 2px 3px rgba(0,0,0,0.15);
-	box-shadow: 0 2px 3px rgba(0,0,0,0.15);
-}
-
 #screen-meta-links a.show-settings {
 	display: block;
 	font-size: 13px;
@@ -1343,6 +1666,7 @@ html.wp-toolbar {
 	}
 }

+.js .widget .widget-top,
 .js .postbox .hndle {
 	cursor: move;
 }
@@ -1374,20 +1698,15 @@ html.wp-toolbar {
 	line-height: 1;
 }

-.postbox h3,
-.stuffbox h3 {
-	margin-top: 1px;
+/* user-select is not a part of the CSS standard - may change behavior in the future */
+.postbox .hndle,
+.stuffbox .hndle {
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
 }

-.js .widget .widget-top,
-.js .postbox h3 {
-	cursor: move;
-}
-
 .postbox .inside,
 .stuffbox .inside {
 	padding: 0 12px 12px;
@@ -1454,8 +1773,7 @@ html.wp-toolbar {
 	bottom: 0;
 	left: 0;
 	right: 0;
-	padding: 10px 0;
-	margin-right: 20px;
+	padding: 10px 20px;
 	color: #777;
 }

@@ -1651,6 +1969,10 @@ td.media-icon img {
 	max-height: 60px;
 }

+td.image-icon img {
+	border: 1px solid rgba(0, 0, 0, 0.07);
+}
+
 #howto {
 	font-size: 11px;
 	margin: 0 5px;
@@ -1795,21 +2117,28 @@ div.action-links {

 /* Plugin install thickbox */
 #plugin-information {
-	background: #fcfcfc;
+	background: #fff;
 	position: fixed;
 	top: 0;
 	right: 0;
 	bottom: 0;
 	left: 0;
-	height: auto;
+	height: 100%;
 	padding: 0;
 }

+#plugin-information-scrollable {
+	overflow: auto;
+	height: 100%;
+}
+
 #plugin-information-title {
-	padding: 0 76px 0 20px;
+	padding: 0 20px;
+	background: #f5f5f5;
 	font-size: 22px;
 	font-weight: 600;
 	line-height: 56px;
+	position: relative;
 	top: 0;
 	right: 0;
 	left: 0;
@@ -1819,20 +2148,72 @@ div.action-links {
 	white-space: nowrap;
 }

+#plugin-information-title.with-banner {
+	margin-right: 0;
+	height: 250px;
+	bottom: 250px;
+	-webkit-background-size: 100% auto;
+	background-size: 100% auto;
+}
+
+#plugin-information-title h2 {
+	font-size: 1em;
+	font-weight: bold;
+	padding: 0;
+	margin: 0;
+	max-width: 680px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+#plugin-information-title.with-banner h2 {
+	font-family: "Helvetica Neue", sans-serif;
+	display: inline-block;
+	font-size: 30px;
+	line-height: 50px;
+	padding: 0 15px;
+	margin: 174px 0 0 10px;
+	color: #fff;
+	background: rgba( 30, 30, 30, 0.9 );
+	text-shadow: 0 1px 3px rgba( 0, 0, 0, 0.4 );
+	-webkit-box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 );
+	box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 );
+	-webkit-border-radius: 8px;
+	border-radius: 8px;
+}
+
+#plugin-information-title div.vignette {
+	display: none;
+}
+
+#plugin-information-title.with-banner div.vignette {
+	display: block;
+	float: right;
+	top: 0;
+	height: 250px;
+	width: 830px;
+	margin: 0 -20px;
+	background: transparent;
+	-webkit-box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 );
+	box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 );
+}
+
 #plugin-information-tabs {
 	padding: 0 16px;
-	position: absolute;
-	top: 56px;
+	position: relative;
 	right: 0;
 	left: 0;
 	height: 36px;
 	z-index: 1;
+	border-bottom: 1px solid #ddd;
+	background: #f3f3f3;
 }

 #plugin-information-tabs a {
 	position: relative;
 	float: left;
-	padding: 8px 10px 9px;
+	padding: 9px 10px;
 	margin: 0;
 	height: 18px;
 	line-height: 18px;
@@ -1843,38 +2224,53 @@ div.action-links {
 }

 #plugin-information-tabs a.current {
-	margin: -1px -1px 0;
+	margin: 0 -1px 0;
 	background: #fff;
 	border: 1px solid #ddd;
-	border-bottom: none;
+	border-bottom-color: #fff;
+	padding-top: 8px;
 	color: #333;
 }

+#plugin-information-tabs.with-banner a.current {
+	border-top: none;
+	padding-top: 9px;
+}
+
 #plugin-information-tabs a:active,
 #plugin-information-tabs a:focus {
 	outline: none;
 }

 #plugin-information-content {
+	overflow: hidden; /* equal height column trick */
 	background: #fff;
-	border-top: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
-	position: absolute;
-	top: 90px;
+	position: relative;
+	top: 0;
 	right: 0;
-	bottom: 58px;
 	left: 0;
+	min-height: 100%;
+	/* Height of title + tabs + install now */
+	min-height: -webkit-calc( 100% - 152px );
+	min-height: calc( 100% - 152px );
+}
+
+#plugin-information-content.with-banner {
+	/* Height of banner + tabs + install now */
+	min-height: -webkit-calc( 100% - 346px );
+	min-height: calc( 100% - 346px );
 }

 #section-holder {
-	margin: 0;
-	padding: 10px 26px;
-	position: absolute;
+	position: relative;
 	top: 0;
 	right: 250px;
 	bottom: 0;
 	left: 0;
-	overflow: auto;
+	margin-right: 250px; /* FYI box */
+	padding: 10px 26px;
+	margin-bottom: -99930px; /* a bit less than the padding below to accommodate footer */
+	padding-bottom: 99999px; /* equal height column trick */
 }

 #section-holder .updated {
@@ -1882,16 +2278,18 @@ div.action-links {
 }

 #plugin-information .fyi {
-	background: #f3f3f3;
-	border-left: 1px solid #ddd;
-	color: #666;
-	padding: 16px;
-	position: absolute;
+	display: block;
+	float: right;
+	position: relative;
 	top: 0;
 	right: 0;
-	bottom: 0;
+	padding: 16px;
+	margin-bottom: -99930px; /* slightly less than the padding below to accommodate footer */
+	padding-bottom: 99999px; /* equal height column trick */
 	width: 217px;
-	overflow: auto;
+	border-left: 1px solid #ddd;
+	background: #f3f3f3;
+	color: #666;
 }

 #plugin-information .fyi strong {
@@ -1922,6 +2320,54 @@ div.action-links {
 	margin: 0 0 10px;
 }

+#plugin-information .counter-container {
+	margin: 3px 0;
+}
+
+#plugin-information .counter-label {
+	float: left;
+	margin-right: 5px;
+	min-width: 55px;
+}
+
+#plugin-information .counter-back {
+	height: 17px;
+	width: 92px;
+	background-color: #ececec;
+	float: left;
+}
+
+#plugin-information .counter-bar {
+	height: 17px;
+	background-color: #fddb5a;
+	float: left;
+}
+
+#plugin-information .counter-count {
+	margin-left: 5px;
+}
+
+#plugin-information .fyi ul.contributors {
+	margin-top: 10px;
+}
+
+#plugin-information .fyi ul.contributors li {
+	display: inline-block;
+	margin-right: 8px;
+	vertical-align: middle;
+}
+
+#plugin-information .fyi ul.contributors li {
+	display: inline-block;
+	margin-right: 8px;
+	vertical-align: middle;
+}
+
+#plugin-information .fyi ul.contributors li img {
+	vertical-align: middle;
+	margin-right: 4px;
+}
+
 #plugin-information-footer {
 	padding: 15px 16px;
 	position: absolute;
@@ -1929,8 +2375,16 @@ div.action-links {
 	bottom: 0;
 	left: 0;
 	height: 28px;
+	border-top: 1px solid #ddd;
+	background: #f3f3f3;
 }

+/* @noflip */
+#plugin-information .section {
+	direction: ltr;
+}
+
+/* @noflip */
 #plugin-information .section ul,
 #plugin-information .section ol {
 	list-style-type: disc;
@@ -1958,6 +2412,7 @@ div.action-links {
 	box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.3 );
 }

+/* @noflip */
 #plugin-information #section-screenshots li p {
 	font-style: italic;
 	padding-left: 20px;
@@ -1969,25 +2424,101 @@ div.action-links {
 	border: 1px solid #ccc;
 }

+/* @noflip */
+#plugin-information .review {
+	overflow: hidden; /* clearfix */
+	width: 100%;
+	margin-bottom: 20px;
+	border-bottom: 1px solid #e6e6e6;
+}
+
+#plugin-information .review-title-section {
+	overflow: hidden; /* clearfix */
+}
+
+/* @noflip */
+#plugin-information .review-title-section h4 {
+	display: inline-block;
+	float: left;
+	margin: 0 6px 0 0;
+}
+
+#plugin-information .reviewer-info p {
+	clear: both;
+	margin: 0;
+	padding-top: 2px;
+}
+
+/* @noflip */
+#plugin-information .reviewer-info .avatar {
+	float: left;
+	margin: 4px 6px 0 0;
+}
+
+/* @noflip */
+#plugin-information .reviewer-info .star-rating {
+	float: left;
+}
+
+/* @noflip */
+#plugin-information .review-meta {
+	float: left;
+	margin-left: 0.75em;
+}
+
+/* @noflip */
+#plugin-information .review-body {
+	float: left;
+	width: 100%;
+}
+
 .plugin-version-author-uri {
 	font-size: 13px;
 }

-@media screen and ( max-width: 782px ) {
-	#plugin-information-content {
-		overflow: auto;
-		bottom: 58px;
+@media screen and ( max-width: 771px ) {
+	#plugin-information-title.with-banner {
+		height: 100px;
+		bottom: 100px;
+	}
+
+	#plugin-information-title.with-banner h2 {
+		margin-top: 30px;
+		font-size: 20px;
+		line-height: 40px;
+		max-width: 85%;
+	}
+
+	#plugin-information-title.with-banner div.vignette {
+		height: 100px;
+		bottom: 100px;
+		width: 800%;
+	}
+
+	#plugin-information-tabs {
+		overflow: hidden; /* clearfix */
+		padding: 0;
+		height: auto; /* let tabs wrap */
+	}
+
+	#plugin-information-tabs a.current {
+		margin-bottom: 0;
+		border-bottom: none;
 	}

 	#plugin-information .fyi {
+		float: none;
 		border: 1px solid #ddd;
 		position: static;
 		width: auto;
-		margin: 26px 26px 16px;
+		margin: 26px 26px 0;
+		padding-bottom: 0; /* reset from the two column height fix */
 	}

 	#section-holder {
 		position: static;
+		margin: 0;
+		padding-bottom: 70px; /* reset from the two column height fix, plus accomodate footer */
 	}

 	#plugin-information .fyi h3,
@@ -2048,9 +2579,37 @@ body.import-php .tb-close-icon,
 body.plugins-php .tb-close-icon,
 body.update-core-php .tb-close-icon,
 body.index-php .tb-close-icon {
-	line-height: 48px;
-	width: 48px;
-	height: 48px;
+	left: auto;
+	right: -30px;
+	color: #eee;
+	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
+	transition: color .1s ease-in-out, background .1s ease-in-out;
+}
+
+body.plugin-install-php #TB_closeWindowButton:focus,
+body.plugin-install-php #TB_closeWindowButton:focus .tb-close-icon,
+body.plugin-install-php .tb-close-icon:focus,
+body.plugin-install-php .tb-close-icon:hover,
+body.import-php #TB_closeWindowButton:focus,
+body.import-php #TB_closeWindowButton:focus .tb-close-icon,
+body.import-php .tb-close-icon:focus,
+body.import-php .tb-close-icon:hover,
+body.plugins-php #TB_closeWindowButton:focus,
+body.plugins-php #TB_closeWindowButton:focus .tb-close-icon,
+body.plugins-php .tb-close-icon:focus,
+body.plugins-php .tb-close-icon:hover,
+body.update-core-php #TB_closeWindowButton:focus,
+body.update-core-php #TB_closeWindowButton:focus .tb-close-icon,
+body.update-core-php .tb-close-icon:focus,
+body.update-core-php .tb-close-icon:hover,
+body.index-php #TB_closeWindowButton:focus,
+body.index-php #TB_closeWindowButton:focus .tb-close-icon,
+body.index-php .tb-close-icon:focus,
+body.index-php .tb-close-icon:hover {
+	color: #2ea2cc;
+	outline: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }

 body.plugin-install-php .tb-close-icon:before,
@@ -2058,7 +2617,20 @@ body.import-php .tb-close-icon:before,
 body.plugins-php .tb-close-icon:before,
 body.update-core-php .tb-close-icon:before,
 body.index-php .tb-close-icon:before {
-	line-height: 48px;
+	content: "\f335";
+	font-size: 32px;
+}
+
+/* move plugin install close icon to top on narrow screens */
+@media screen and ( max-width: 830px ) {
+	body.plugin-install-php .tb-close-icon,
+	body.import-php .tb-close-icon,
+	body.plugins-php .tb-close-icon,
+	body.update-core-php .tb-close-icon,
+	body.index-php .tb-close-icon {
+		right: 0;
+		top: -30px;
+	}
 }

 /* @todo: move this. */
@@ -2270,7 +2842,8 @@ img {

 .control-section.open .accordion-section-title:after,
 #customize-info.open .accordion-section-title:after,
-.nav-menus-php .menu-item-edit-active .item-edit:before {
+.nav-menus-php .menu-item-edit-active .item-edit:before,
+.widget.open .widget-top a.widget-action:after {
 	content: '\f142';
 }

@@ -2487,10 +3060,6 @@ img {
 		-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
 	}

-	#wpwrap {
-		background: #f0f0f0;
-	}
-
 	#wpcontent {
 		position: relative;
 		margin-left: 0;
@@ -2550,6 +3119,10 @@ img {
 		right: -190px;
 	}

+	code {
+		word-wrap: break-word;
+	}
+
 	/* General Metabox */
 	.postbox {
 		font-size: 14px;
--- a/wp-admin/css/customize-controls-rtl.css
+++ b/wp-admin/css/customize-controls-rtl.css
@@ -32,6 +32,15 @@ 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;
@@ -45,22 +54,12 @@ 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;
@@ -83,11 +82,6 @@ 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;
 }
@@ -100,14 +94,17 @@ body {

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

-#customize-theme-controls .control-section:hover .accordion-section-title,
+#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 .accordion-section-title:hover,
 #customize-theme-controls .control-section.open .accordion-section-title,
 #customize-theme-controls .control-section .accordion-section-title:focus {
-	color: #555555;
+	color: #222;
 	background: #f5f5f5;
 }

@@ -118,13 +115,14 @@ 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: #555555;
+#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-info.open,
 #customize-theme-controls .control-section.open {
 	border-bottom: 1px solid #eeeeee;
 }
@@ -134,7 +132,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;
 }

@@ -143,6 +141,192 @@ 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: "\f344";
+}
+
+.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;
@@ -151,18 +335,28 @@ body {
 }

 .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="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"] {
 	width: 98%;
 	line-height: 18px;
 	margin: 0;
 }

+.customize-control-textarea textarea {
+	width: 100%;
+	resize: vertical;
+}
+
 .customize-control select {
 	min-width: 50%;
 	max-width: 100%;
@@ -182,6 +376,13 @@ body {
 	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 {
@@ -201,6 +402,10 @@ body {
 	line-height: 22px;
 }

+.customize-control-radio .customize-control-title + .customize-control-description {
+	margin-top: 7px;
+}
+
 .customize-control-radio label {
 	line-height: 32px;
 }
@@ -224,8 +429,8 @@ body {
 	border: none !important;
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
-	-webkit-border-radius: !important 0;
-	border-radius: !important 0;
+	-webkit-border-radius: 0 !important;
+	border-radius: 0 !important;
 }


--- 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
@@ -32,6 +32,15 @@ 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;
@@ -45,22 +54,12 @@ 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;
@@ -83,11 +82,6 @@ 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;
 }
@@ -100,14 +94,17 @@ body {

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

-#customize-theme-controls .control-section:hover .accordion-section-title,
+#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 .accordion-section-title:hover,
 #customize-theme-controls .control-section.open .accordion-section-title,
 #customize-theme-controls .control-section .accordion-section-title:focus {
-	color: #555555;
+	color: #222;
 	background: #f5f5f5;
 }

@@ -118,13 +115,14 @@ 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: #555555;
+#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-info.open,
 #customize-theme-controls .control-section.open {
 	border-bottom: 1px solid #eeeeee;
 }
@@ -134,7 +132,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;
 }

@@ -143,6 +141,192 @@ 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: "\f344";
+}
+
+.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;
@@ -151,18 +335,28 @@ body {
 }

 .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="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"] {
 	width: 98%;
 	line-height: 18px;
 	margin: 0;
 }

+.customize-control-textarea textarea {
+	width: 100%;
+	resize: vertical;
+}
+
 .customize-control select {
 	min-width: 50%;
 	max-width: 100%;
@@ -182,6 +376,13 @@ body {
 	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 {
@@ -201,6 +402,10 @@ body {
 	line-height: 22px;
 }

+.customize-control-radio .customize-control-title + .customize-control-description {
+	margin-top: 7px;
+}
+
 .customize-control-radio label {
 	line-height: 32px;
 }
--- a/wp-admin/css/customize-controls.min.css
+++ b/wp-admin/css/customize-controls.min.css
--- a/wp-admin/css/customize-widgets-rtl.min.css
+++ b/wp-admin/css/customize-widgets-rtl.min.css
--- 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,20 +74,6 @@
 	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;
@@ -168,7 +154,7 @@ h3.dashboard-widget-title small a:hover {
 	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;
@@ -301,15 +287,6 @@ 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;
@@ -710,6 +687,7 @@ 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,
@@ -725,7 +703,6 @@ form.initial-form.quickpress-open input#title {

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

@@ -767,7 +744,6 @@ 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;
 }
@@ -842,7 +818,8 @@ h3:hover .edit-box {
 	position: relative;
 }

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

 /* QuickDraft */

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

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

@@ -1128,7 +1105,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,20 +74,6 @@
 	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;
@@ -168,7 +154,7 @@ h3.dashboard-widget-title small a:hover {
 	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;
@@ -301,15 +287,6 @@ 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;
@@ -710,6 +687,7 @@ 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,
@@ -725,7 +703,6 @@ form.initial-form.quickpress-open input#title {

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

@@ -767,7 +744,6 @@ 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;
 }
@@ -842,7 +818,8 @@ h3:hover .edit-box {
 	position: relative;
 }

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

 /* QuickDraft */

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

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

@@ -1128,7 +1105,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,11 +24,6 @@ body#media-upload ul#sidemenu {
 	clear: both;
 }

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

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

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

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

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

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

 p.media-types {
-	margin: 1em;
+	padding: 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,#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}}
+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) 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: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}}
--- a/wp-admin/css/deprecated-media.css
+++ b/wp-admin/css/deprecated-media.css
@@ -24,11 +24,6 @@ body#media-upload ul#sidemenu {
 	clear: both;
 }

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

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

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

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

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

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

 p.media-types {
-	margin: 1em;
+	padding: 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,#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}}
+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) 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: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}}
--- a/wp-admin/css/edit-rtl.css
+++ b/wp-admin/css/edit-rtl.css
@@ -37,7 +37,6 @@

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

 #titlediv label {
@@ -337,6 +336,7 @@ 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 {
@@ -344,7 +344,7 @@ td.plugin-title p {
 }

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

@@ -355,18 +355,94 @@ td.plugin-title p {
 #content-resize-handle {
 	background: transparent url(../images/resize.gif) no-repeat scroll left bottom;
 	width: 12px;
-	cursor: n-resize;
+	cursor: row-resize;
 }

 .rtl #content-resize-handle {
 	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;
+}
+
+#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;
@@ -594,6 +670,7 @@ span.wp-media-buttons-icon:before {
 	padding: 0;
 }

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

-.form-field input,
+.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 textarea {
 	border-style: solid;
 	border-width: 1px;
@@ -1008,7 +1091,6 @@ input.newtag:focus ~ div.taghint {
 p.popular-tags {
 	border: none;
 	line-height: 2em;
-	max-width: 1000px;
 	padding: 8px 12px 12px;
 	text-align: justify;
 }
@@ -1185,6 +1267,7 @@ table.links-table {

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

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

-	#wp-content-editor-tools {
-		overflow: hidden;
-		padding: 20px 0 1px 15px;
-		top: 1px;
-	}
-
 	a.wp-switch-editor {
 		font-size: 16px;
 		line-height: 1em;
--- a/wp-admin/css/edit.css
+++ b/wp-admin/css/edit.css
@@ -37,7 +37,6 @@

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

 #titlediv label {
@@ -337,6 +336,7 @@ 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 {
@@ -344,7 +344,7 @@ td.plugin-title p {
 }

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

@@ -355,18 +355,94 @@ td.plugin-title p {
 #content-resize-handle {
 	background: transparent url(../images/resize.gif) no-repeat scroll right bottom;
 	width: 12px;
-	cursor: n-resize;
+	cursor: row-resize;
 }

 .rtl #content-resize-handle {
 	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;
+}
+
+#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;
@@ -594,6 +670,7 @@ span.wp-media-buttons-icon:before {
 	padding: 0;
 }

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

-.form-field input,
+.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 textarea {
 	border-style: solid;
 	border-width: 1px;
@@ -1008,7 +1091,6 @@ input.newtag:focus ~ div.taghint {
 p.popular-tags {
 	border: none;
 	line-height: 2em;
-	max-width: 1000px;
 	padding: 8px 12px 12px;
 	text-align: justify;
 }
@@ -1185,6 +1267,7 @@ table.links-table {

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

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

-	#wp-content-editor-tools {
-		overflow: hidden;
-		padding: 20px 15px 1px 0;
-		top: 1px;
-	}
-
 	a.wp-switch-editor {
 		font-size: 16px;
 		line-height: 1em;
--- a/wp-admin/css/forms-rtl.css
+++ b/wp-admin/css/forms-rtl.css
@@ -1,17 +1,66 @@
-/* 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"] {
@@ -36,11 +85,8 @@ input[type="radio"] {
 	width: 16px;
 	min-width: 16px;
 	-webkit-appearance: none;
-	-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-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;
 }
@@ -55,46 +101,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:disabled,
-input.disabled,
-textarea:disabled,
-textarea.disabled {
-	-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=checkbox]:disabled,
-input[type=radio]:disabled,
-input[type=checkbox]:disabled:checked:before,
-input[type=radio]:disabled:checked:before {
-	opacity: 0.7;
-}
-
-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;
@@ -105,13 +133,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;
@@ -124,13 +152,9 @@ 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;
 	}
@@ -163,7 +187,6 @@ 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 */
 }
@@ -174,17 +197,6 @@ 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;
 }
@@ -208,45 +220,10 @@ textarea.code {
 	padding: 4px 6px 1px 6px;
 }

-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] {
+input.readonly,
+input[readonly],
+textarea.readonly,
+textarea[readonly] {
 	background-color: #eee;
 }

@@ -268,6 +245,39 @@ input[readonly] {
 	color: #666;
 }

+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 );
+}
+
+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 {
+	opacity: 0.7;
+}
+
 /*------------------------------------------------------------------------------
  2.0 - Forms
 ------------------------------------------------------------------------------*/
@@ -364,7 +374,8 @@ input[type="number"].small-text {

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

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

 .search-box input[name="s"],
-#search-plugins input[name="s"],
+.tablenav .search-plugins input[name="s"],
 .tagsdiv .newtag {
 	float: right;
 	height: 28px;
@@ -585,7 +596,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;
@@ -760,8 +771,8 @@ table.form-table td .updated {
 		-webkit-appearance: none;
 	}

-	input[type=text], 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;
 	}
@@ -771,32 +782,32 @@ table.form-table td .updated {
 		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;
@@ -804,7 +815,7 @@ table.form-table td .updated {
 		line-height: 16px;
 	}

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

@@ -866,12 +877,16 @@ table.form-table td .updated {
 		box-sizing: border-box;
 	}

-	input[type=text].small-text,
-	input[type=search].small-text,
-	input[type=password].small-text,
-	input[type=number].small-text,
+	#wpbody .form-table td select {
+		height: 40px;
+	}
+
+	input[type="text"].small-text,
+	input[type="search"].small-text,
+	input[type="password"].small-text,
 	input[type="number"].small-text,
-	.form-table input[type=text].small-text {
+	input[type="number"].small-text,
+	.form-table input[type="text"].small-text {
 		width: auto;
 		max-width: 55px;
 		display: inline;
--- a/wp-admin/css/forms.css
+++ b/wp-admin/css/forms.css
@@ -1,17 +1,66 @@
-/* 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"] {
@@ -36,11 +85,8 @@ input[type="radio"] {
 	width: 16px;
 	min-width: 16px;
 	-webkit-appearance: none;
-	-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-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;
 }
@@ -55,46 +101,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:disabled,
-input.disabled,
-textarea:disabled,
-textarea.disabled {
-	-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=checkbox]:disabled,
-input[type=radio]:disabled,
-input[type=checkbox]:disabled:checked:before,
-input[type=radio]:disabled:checked:before {
-	opacity: 0.7;
-}
-
-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;
@@ -105,13 +133,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;
@@ -124,13 +152,9 @@ 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;
 	}
@@ -163,7 +187,6 @@ 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 */
 }
@@ -174,17 +197,6 @@ 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;
 }
@@ -208,45 +220,10 @@ textarea.code {
 	padding: 4px 6px 1px 6px;
 }

-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] {
+input.readonly,
+input[readonly],
+textarea.readonly,
+textarea[readonly] {
 	background-color: #eee;
 }

@@ -268,6 +245,39 @@ input[readonly] {
 	color: #666;
 }

+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 );
+}
+
+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 {
+	opacity: 0.7;
+}
+
 /*------------------------------------------------------------------------------
  2.0 - Forms
 ------------------------------------------------------------------------------*/
@@ -364,7 +374,8 @@ input[type="number"].small-text {

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

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

 .search-box input[name="s"],
-#search-plugins input[name="s"],
+.tablenav .search-plugins input[name="s"],
 .tagsdiv .newtag {
 	float: left;
 	height: 28px;
@@ -585,7 +596,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;
@@ -760,8 +771,8 @@ table.form-table td .updated {
 		-webkit-appearance: none;
 	}

-	input[type=text], 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;
 	}
@@ -771,32 +782,32 @@ table.form-table td .updated {
 		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;
@@ -804,7 +815,7 @@ table.form-table td .updated {
 		line-height: 16px;
 	}

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

@@ -866,12 +877,16 @@ table.form-table td .updated {
 		box-sizing: border-box;
 	}

-	input[type=text].small-text,
-	input[type=search].small-text,
-	input[type=password].small-text,
-	input[type=number].small-text,
+	#wpbody .form-table td select {
+		height: 40px;
+	}
+
+	input[type="text"].small-text,
+	input[type="search"].small-text,
+	input[type="password"].small-text,
 	input[type="number"].small-text,
-	.form-table input[type=text].small-text {
+	input[type="number"].small-text,
+	.form-table input[type="text"].small-text {
 		width: auto;
 		max-width: 55px;
 		display: inline;
--- 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 h3 {
+#wpbody-content .postbox .hndle {
 	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 h3 {
+#wpbody-content .postbox .hndle {
 	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,6 +60,11 @@ abbr {
 	border: 0;
 	font-variant: normal;
 }
+
+label {
+	cursor: pointer;
+}
+
 #logo {
 	margin: 6px 0 14px 0;
 	border-bottom: none;
@@ -68,19 +73,19 @@ abbr {
 #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: 80px 80px;
-	background-size: 80px 80px;
+	-webkit-background-size: 84px;
+	background-size: 84px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #999;
-	height: 80px;
+	height: 84px;
 	font-size: 20px;
 	font-weight: normal;
 	line-height: 1.3em;
 	margin: -130px auto 25px;
 	padding: 0;
 	text-decoration: none;
-	width: 80px;
+	width: 84px;
 	text-indent: -9999px;
 	outline: none;
 	overflow: hidden;
@@ -93,7 +98,9 @@ abbr {
 	text-align: right;
 	padding: 0;
 }
-.step .button-large {
+.language-chooser.wp-core-ui .step .button.button-large {
+	height: 36px;
+	vertical-align: middle;
 	font-size: 14px;
 }
 textarea {
@@ -152,6 +159,8 @@ submit {
 }

 .form-table input[type=text],
+.form-table input[type=email],
+.form-table input[type=url],
 .form-table input[type=password] {
 	width: 206px;
 }
@@ -295,6 +304,8 @@ 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,
@@ -311,3 +322,68 @@ 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,6 +60,11 @@ abbr {
 	border: 0;
 	font-variant: normal;
 }
+
+label {
+	cursor: pointer;
+}
+
 #logo {
 	margin: 6px 0 14px 0;
 	border-bottom: none;
@@ -68,19 +73,19 @@ abbr {
 #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: 80px 80px;
-	background-size: 80px 80px;
+	-webkit-background-size: 84px;
+	background-size: 84px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #999;
-	height: 80px;
+	height: 84px;
 	font-size: 20px;
 	font-weight: normal;
 	line-height: 1.3em;
 	margin: -130px auto 25px;
 	padding: 0;
 	text-decoration: none;
-	width: 80px;
+	width: 84px;
 	text-indent: -9999px;
 	outline: none;
 	overflow: hidden;
@@ -93,7 +98,9 @@ abbr {
 	text-align: left;
 	padding: 0;
 }
-.step .button-large {
+.language-chooser.wp-core-ui .step .button.button-large {
+	height: 36px;
+	vertical-align: middle;
 	font-size: 14px;
 }
 textarea {
@@ -152,6 +159,8 @@ submit {
 }

 .form-table input[type=text],
+.form-table input[type=email],
+.form-table input[type=url],
 .form-table input[type=password] {
 	width: 206px;
 }
@@ -295,6 +304,8 @@ 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,
@@ -311,3 +322,68 @@ 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
@@ -75,7 +75,8 @@ 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-php .tagsdiv .newtag,
+.locale-ru-ru.post-new-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
@@ -75,7 +75,8 @@ 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-php .tagsdiv .newtag,
+.locale-ru-ru.post-new-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,6 +263,10 @@ table.fixed {
 	width: 10%;
 }

+.fixed .column-posts {
+    width: 74px;
+}
+
 .fixed .column-comment .comment-author {
 	display: none;
 }
@@ -591,6 +595,11 @@ 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;
 }
@@ -613,13 +622,16 @@ classes exist in paginate_links() but not seen in list table output. */
 	color: #2ea2cc;
 }

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

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

 .view-switch a {
@@ -634,7 +646,6 @@ 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';
@@ -645,6 +656,10 @@ 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;
 }
@@ -653,11 +668,18 @@ classes exist in paginate_links() but not seen in list table output. */
 	color: #0074a2;
 }

-.view-switch > a + a:before {
+.view-switch > a + a {
 	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;
@@ -671,6 +693,10 @@ 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;
@@ -1201,10 +1227,214 @@ 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-card .compatibility-untested strong {
+	font-weight: normal;
+}
+
+.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 {
@@ -1223,9 +1453,38 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 /* =Media Queries
 -------------------------------------------------------------- */

-/**
- * HiDPI Displays
- */
+@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;
+	}
+}
+
@media screen and ( max-width: 782px ) {
 	/* WP List Table Options & Filters */
 	.tablenav {
@@ -1233,7 +1492,7 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 	}

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

 	.tablenav.bottom {
@@ -1249,7 +1508,8 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 		display: block;
 	}

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

@@ -1416,7 +1676,7 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {

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

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

+.fixed .column-posts {
+    width: 74px;
+}
+
 .fixed .column-comment .comment-author {
 	display: none;
 }
@@ -591,6 +595,11 @@ 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;
 }
@@ -613,13 +622,16 @@ classes exist in paginate_links() but not seen in list table output. */
 	color: #2ea2cc;
 }

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

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

 .view-switch a {
@@ -634,7 +646,6 @@ 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';
@@ -645,6 +656,10 @@ 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;
 }
@@ -653,11 +668,18 @@ classes exist in paginate_links() but not seen in list table output. */
 	color: #0074a2;
 }

-.view-switch > a + a:before {
+.view-switch > a + a {
 	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;
@@ -671,6 +693,10 @@ 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;
@@ -1201,10 +1227,214 @@ 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-card .compatibility-untested strong {
+	font-weight: normal;
+}
+
+.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 {
@@ -1223,9 +1453,38 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 /* =Media Queries
 -------------------------------------------------------------- */

-/**
- * HiDPI Displays
- */
+@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;
+	}
+}
+
@media screen and ( max-width: 782px ) {
 	/* WP List Table Options & Filters */
 	.tablenav {
@@ -1233,7 +1492,7 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 	}

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

 	.tablenav.bottom {
@@ -1249,7 +1508,8 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 		display: block;
 	}

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

@@ -1416,7 +1676,7 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {

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

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

 html,
 body {
@@ -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: 80px 80px;
-	background-size: 80px 80px;
+	-webkit-background-size: 84px;
+	background-size: 84px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #999;
-	height: 80px;
+	height: 84px;
 	font-size: 20px;
 	font-weight: normal;
 	line-height: 1.3em;
 	margin: 0 auto 25px;
 	padding: 0;
 	text-decoration: none;
-	width: 80px;
+	width: 84px;
 	text-indent: -9999px;
 	outline: none;
 	overflow: hidden;
@@ -186,7 +186,6 @@ p {
 .login form .input,
 .login input[type="text"] {
 	font-size: 24px;
-	line-height: 1;
 	width: 100%;
 	padding: 3px;
 	margin: 2px 0 16px 6px;
@@ -267,4 +266,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
@@ -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: 80px 80px;
-	background-size: 80px 80px;
+	-webkit-background-size: 84px;
+	background-size: 84px;
 	background-position: center top;
 	background-repeat: no-repeat;
 	color: #999;
-	height: 80px;
+	height: 84px;
 	font-size: 20px;
 	font-weight: normal;
 	line-height: 1.3em;
 	margin: 0 auto 25px;
 	padding: 0;
 	text-decoration: none;
-	width: 80px;
+	width: 84px;
 	text-indent: -9999px;
 	outline: none;
 	overflow: hidden;
@@ -186,7 +186,6 @@ p {
 .login form .input,
 .login input[type="text"] {
 	font-size: 24px;
-	line-height: 1;
 	width: 100%;
 	padding: 3px;
 	margin: 2px 6px 16px 0;
@@ -267,4 +266,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,6 +102,7 @@
 	display: block;
 	line-height: 36px;
 	float: left;
+	margin-left: 10px;
 }

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

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

-#media-items {
-	width: 623px;
-}
-
-.media-new-php #media-items {
-	margin: 1em 0;
+.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:empty {
@@ -135,15 +135,12 @@
 .media-item .filename {
 	line-height: 36px;
 	overflow: hidden;
-}
-
-.media-item .error-div {
-	padding-right: 10px;
+	margin-right: 6px;
 }

 .media-item .pinkynail {
 	float: right;
-	margin: 2px 0 0 10px;
+	margin: 2px 3px 0 10px;
 	max-width: 40px;
 	max-height: 32px;
 }
@@ -161,17 +158,16 @@
 .media-item .progress {
 	float: left;
 	height: 22px;
-	margin: 7px 0 0;
+	margin: 7px 6px;
 	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 0px 1px 2px rgba(0,0,0,0.1);
-	box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
+	-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);
 }

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

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

-.media-upload-form .media-item.error {
-	margin: 0;
-	padding: 0;
+.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 p,
-.media-item .error-div {
-	line-height: 16px;
-	margin: 5px 10px;
-	padding: 0;
+.media-upload-form .media-item .error {
+	padding: 10px 14px 10px 0;
 }

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

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

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

 #find-posts-input,
@@ -433,6 +432,390 @@ 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 > .select-mode-toggle-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
@@ -507,7 +890,7 @@ border color while dragging a file over the uploader drop area */
 }

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

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

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

 /* =Media Queries
@@ -721,4 +1105,92 @@ 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) {
+	.media-frame.mode-grid .attachments-browser .media-toolbar-secondary {
+		float: none;
+	}
+}
+
+@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,6 +102,7 @@
 	display: block;
 	line-height: 36px;
 	float: right;
+	margin-right: 10px;
 }

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

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

-#media-items {
-	width: 623px;
-}
-
-.media-new-php #media-items {
-	margin: 1em 0;
+.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:empty {
@@ -135,15 +135,12 @@
 .media-item .filename {
 	line-height: 36px;
 	overflow: hidden;
-}
-
-.media-item .error-div {
-	padding-left: 10px;
+	margin-left: 6px;
 }

 .media-item .pinkynail {
 	float: left;
-	margin: 2px 10px 0 0;
+	margin: 2px 10px 0 3px;
 	max-width: 40px;
 	max-height: 32px;
 }
@@ -161,17 +158,16 @@
 .media-item .progress {
 	float: right;
 	height: 22px;
-	margin: 7px 0 0;
+	margin: 7px 6px;
 	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 0px 1px 2px rgba(0,0,0,0.1);
-	box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
+	-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);
 }

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

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

-.media-upload-form .media-item.error {
-	margin: 0;
-	padding: 0;
+.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 p,
-.media-item .error-div {
-	line-height: 16px;
-	margin: 5px 10px;
-	padding: 0;
+.media-upload-form .media-item .error {
+	padding: 10px 0 10px 14px;
 }

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

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

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

 #find-posts-input,
@@ -433,6 +432,390 @@ 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 > .select-mode-toggle-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
@@ -507,7 +890,7 @@ border color while dragging a file over the uploader drop area */
 }

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

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

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

 /* =Media Queries
@@ -721,4 +1105,92 @@ 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) {
+	.media-frame.mode-grid .attachments-browser .media-toolbar-secondary {
+		float: none;
+	}
+}
+
+@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
@@ -507,6 +507,10 @@ 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;
--- a/wp-admin/css/nav-menus.css
+++ b/wp-admin/css/nav-menus.css
@@ -507,6 +507,10 @@ 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;
--- a/wp-admin/css/revisions-rtl.css
+++ b/wp-admin/css/revisions-rtl.css
@@ -73,12 +73,15 @@
 }

 .revisions .loading-indicator {
-	position: fixed;
+	position: absolute;
 	vertical-align: middle;
 	opacity: 0;
 	width: 100%;
+	width: -webkit-calc( 100% - 30px );
+	width: calc( 100% - 30px );
 	top: 50%;
-	margin-right: -90px;
+	top: -webkit-calc( 50% - 10px );
+	top: calc( 50% - 10px );
 	-webkit-transition: opacity 0.5s;
 	transition: opacity 0.5s;
 	filter: alpha(opacity=0); /* ie8 and earlier */
@@ -405,7 +408,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);
--- a/wp-admin/css/revisions.css
+++ b/wp-admin/css/revisions.css
@@ -73,12 +73,15 @@
 }

 .revisions .loading-indicator {
-	position: fixed;
+	position: absolute;
 	vertical-align: middle;
 	opacity: 0;
 	width: 100%;
+	width: -webkit-calc( 100% - 30px );
+	width: calc( 100% - 30px );
 	top: 50%;
-	margin-left: -90px;
+	top: -webkit-calc( 50% - 10px );
+	top: calc( 50% - 10px );
 	-webkit-transition: opacity 0.5s;
 	transition: opacity 0.5s;
 	filter: alpha(opacity=0); /* ie8 and earlier */
@@ -405,7 +408,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);
--- a/wp-admin/css/themes-rtl.css
+++ b/wp-admin/css/themes-rtl.css
@@ -25,23 +25,16 @@
 	margin-right: 20px;
 }

-.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;
+/* Search form */
+.themes-php .wp-filter-search {
 	position: relative;
-	top: -3px;
-}
-
-.theme-navigation a {
-	text-decoration:none;
+	top: -2px;
+	right: 20px;
+	margin: 0;
+	width: 280px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.5;
 }

 /* Position admin messages */
@@ -195,13 +188,17 @@
 	-webkit-transition: opacity 0.1s ease-in-out;
 	transition: opacity 0.1s ease-in-out;
 }
+
 .theme-browser .theme:focus {
-	outline: 1px dotted #222;
+	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 );
 }

 .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;
@@ -401,19 +398,6 @@
 	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
@@ -429,10 +413,6 @@
 	z-index: 10;
 }

-body.theme-overlay-open {
-	overflow: hidden;
-}
-
 .theme-overlay .theme-header {
 	position: absolute;
 	top: 0;
@@ -451,15 +431,12 @@ body.theme-overlay-open {
 	border: 0;
 	border-right: 1px solid #ddd;
 	background-color: transparent;
-}
-
-.theme-overlay .theme-header .close:hover:before,
-.theme-overlay .theme-header .close:focus:before {
-	color: #fff;
+	-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:before {
-	font: normal 30px/50px 'dashicons' !important;
+	font: normal 22px/50px 'dashicons' !important;
 	color: #777;
 	display: inline-block;
 	content: '\f335';
@@ -478,16 +455,32 @@ body.theme-overlay-open {
 	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: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 .close:focus,
 .theme-overlay .theme-header .right:focus,
 .theme-overlay .theme-header .left:focus {
-	background: #0074a2;
-	color: #fff;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    outline: none;
 }

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

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

+.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;
@@ -1025,7 +1014,7 @@ body.folded .theme-overlay .theme-wrap {
 		width: 100%;
 	}

-	.themes-php .theme-search {
+	.themes-php .wp-filter-search {
 		float: none;
 		clear: both;
 		right: 0;
@@ -1088,21 +1077,6 @@ 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;
@@ -1114,29 +1088,33 @@ body.folded .theme-overlay .theme-wrap {
 .theme-install-php.show-upload-theme a.browse-themes {
 	display: inline;
 }
-.upload-theme {
+.upload-theme,
+.upload-plugin {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	display: none;
-	margin: 0px 0 0;
+	margin: 0;
 	padding: 0;
 	width: 100%;
 	overflow: hidden;
 	position: relative;
 	top: 10px;
 }
-body.show-upload-theme .upload-theme {
+body.show-upload-theme .upload-theme,
+.upload-plugin {
 	display: block;
 }
-.upload-theme .wp-upload-form {
+.upload-theme .wp-upload-form,
+.upload-plugin .wp-upload-form {
 	background: #fafafa;
 	border: 1px solid #e5e5e5;
 	padding: 30px;
 	margin: 30px auto;
 	max-width: 380px;
 }
-.upload-theme .install-help {
+.upload-theme .install-help,
+.upload-plugin .install-help {
 	color: #999;
 	font-size: 18px;
 	font-style: normal;
@@ -1144,190 +1122,11 @@ body.show-upload-theme .upload-theme {
 	padding: 40px 0 0;
 	text-align: center;
 }
-body.show-upload-theme .upload-theme + .theme-navigation,
-body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser {
+body.show-upload-theme .upload-theme + .wp-filter,
+body.show-upload-theme .upload-theme + .wp-filter + .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;
@@ -1344,20 +1143,11 @@ 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%;
@@ -1367,23 +1157,6 @@ 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 {
@@ -1447,15 +1220,6 @@ body.show-upload-theme p.no-themes {
 	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
@@ -1617,9 +1381,85 @@ body.full-overlay-active {
 	overflow: auto;
 }

-/* Close Link */
-.wp-full-overlay .close-full-overlay {
+/* 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;
 	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 */
@@ -1704,19 +1544,6 @@ 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,
@@ -1845,19 +1672,22 @@ 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;
+	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;
 }

 .theme-install-overlay .wp-full-overlay-main {
--- a/wp-admin/css/themes.css
+++ b/wp-admin/css/themes.css
@@ -25,23 +25,16 @@
 	margin-left: 20px;
 }

-.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;
+/* Search form */
+.themes-php .wp-filter-search {
 	position: relative;
-	top: -3px;
-}
-
-.theme-navigation a {
-	text-decoration:none;
+	top: -2px;
+	left: 20px;
+	margin: 0;
+	width: 280px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.5;
 }

 /* Position admin messages */
@@ -195,13 +188,17 @@
 	-webkit-transition: opacity 0.1s ease-in-out;
 	transition: opacity 0.1s ease-in-out;
 }
+
 .theme-browser .theme:focus {
-	outline: 1px dotted #222;
+	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 );
 }

 .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;
@@ -401,19 +398,6 @@
 	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
@@ -429,10 +413,6 @@
 	z-index: 10;
 }

-body.theme-overlay-open {
-	overflow: hidden;
-}
-
 .theme-overlay .theme-header {
 	position: absolute;
 	top: 0;
@@ -451,15 +431,12 @@ body.theme-overlay-open {
 	border: 0;
 	border-left: 1px solid #ddd;
 	background-color: transparent;
-}
-
-.theme-overlay .theme-header .close:hover:before,
-.theme-overlay .theme-header .close:focus:before {
-	color: #fff;
+	-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:before {
-	font: normal 30px/50px 'dashicons' !important;
+	font: normal 22px/50px 'dashicons' !important;
 	color: #777;
 	display: inline-block;
 	content: '\f335';
@@ -478,16 +455,32 @@ body.theme-overlay-open {
 	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: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 .close:focus,
 .theme-overlay .theme-header .right:focus,
 .theme-overlay .theme-header .left:focus {
-	background: #0074a2;
-	color: #fff;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    outline: none;
 }

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

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

+.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;
@@ -1025,7 +1014,7 @@ body.folded .theme-overlay .theme-wrap {
 		width: 100%;
 	}

-	.themes-php .theme-search {
+	.themes-php .wp-filter-search {
 		float: none;
 		clear: both;
 		left: 0;
@@ -1088,21 +1077,6 @@ 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;
@@ -1114,29 +1088,33 @@ body.folded .theme-overlay .theme-wrap {
 .theme-install-php.show-upload-theme a.browse-themes {
 	display: inline;
 }
-.upload-theme {
+.upload-theme,
+.upload-plugin {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	display: none;
-	margin: 0px 0 0;
+	margin: 0;
 	padding: 0;
 	width: 100%;
 	overflow: hidden;
 	position: relative;
 	top: 10px;
 }
-body.show-upload-theme .upload-theme {
+body.show-upload-theme .upload-theme,
+.upload-plugin {
 	display: block;
 }
-.upload-theme .wp-upload-form {
+.upload-theme .wp-upload-form,
+.upload-plugin .wp-upload-form {
 	background: #fafafa;
 	border: 1px solid #e5e5e5;
 	padding: 30px;
 	margin: 30px auto;
 	max-width: 380px;
 }
-.upload-theme .install-help {
+.upload-theme .install-help,
+.upload-plugin .install-help {
 	color: #999;
 	font-size: 18px;
 	font-style: normal;
@@ -1144,190 +1122,11 @@ body.show-upload-theme .upload-theme {
 	padding: 40px 0 0;
 	text-align: center;
 }
-body.show-upload-theme .upload-theme + .theme-navigation,
-body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser {
+body.show-upload-theme .upload-theme + .wp-filter,
+body.show-upload-theme .upload-theme + .wp-filter + .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;
@@ -1344,20 +1143,11 @@ 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%;
@@ -1367,23 +1157,6 @@ 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 {
@@ -1447,15 +1220,6 @@ body.show-upload-theme p.no-themes {
 	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
@@ -1617,9 +1381,85 @@ body.full-overlay-active {
 	overflow: auto;
 }

-/* Close Link */
-.wp-full-overlay .close-full-overlay {
+/* 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;
 	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 */
@@ -1704,19 +1544,6 @@ 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,
@@ -1845,19 +1672,22 @@ 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;
+	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;
 }

 .theme-install-overlay .wp-full-overlay-main {
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -16,6 +16,9 @@

 .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,6 +16,9 @@

 .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
 	 */
-	var $admin_header_callback;
+	private $admin_header_callback;

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

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

 	/**
 	 * Constructor - Register administration header callback.
@@ -50,7 +50,7 @@ class Custom_Background {
 	 * @param callback $admin_image_div_callback Optional custom image div output callback.
 	 * @return Custom_Background
 	 */
-	function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
+	public 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;

@@ -58,12 +58,64 @@ class Custom_Background {
 		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
 	 */
-	function init() {
+	public function init() {
 		if ( ! current_user_can('edit_theme_options') )
 			return;

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

 		if ( empty($_POST) )
 			return;
@@ -176,7 +228,7 @@ class Custom_Background {
 	 *
 	 * @since 3.0.0
 	 */
-	function admin_page() {
+	public function admin_page() {
 ?>
 <div class="wrap" id="custom-background">
 <h2><?php _e( 'Custom Background' ); ?></h2>
@@ -204,7 +256,8 @@ 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' ) );
@@ -343,7 +396,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	 *
 	 * @since 3.0.0
 	 */
-	function handle_upload() {
+	public function handle_upload() {

 		if ( empty($_FILES) )
 			return;
@@ -397,7 +450,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	 *
 	 * @since 3.4.0
 	 */
-	function attachment_fields_to_edit( $form_fields ) {
+	public function attachment_fields_to_edit( $form_fields ) {
 		return $form_fields;
 	}

@@ -406,7 +459,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	 *
 	 * @since 3.4.0
 	 */
-	function filter_upload_tabs( $tabs ) {
+	public function filter_upload_tabs( $tabs ) {
 		return $tabs;
 	}

--- 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
 	 */
-	var $admin_header_callback;
+	private $admin_header_callback;

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

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

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

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

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

@@ -80,12 +80,64 @@ 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
 	 */
-	function init() {
+	public function init() {
 		if ( ! current_user_can('edit_theme_options') )
 			return;

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

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

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

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

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

 		if ( !empty($this->headers) )
@@ -254,7 +306,7 @@ class Custom_Image_Header {
 		if ( !isset($_wp_default_headers) )
 			return;

-		if ( is_array( $this->default_headers ) ) {
+		if ( ! empty( $this->default_headers ) ) {
 			return;
 		}

@@ -275,7 +327,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 3.0.0
 	 */
-	function show_header_selector( $type = 'default' ) {
+	public function show_header_selector( $type = 'default' ) {
 		if ( 'default' == $type ) {
 			$headers = $this->default_headers;
 		} else {
@@ -312,7 +364,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.1.0
 	 */
-	function js() {
+	public function js() {
 		$step = $this->step();
 		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
 			$this->js_1();
@@ -325,11 +377,20 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.6.0
 	 */
-	function js_1() { ?>
+	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;
+			}
+		}
+		?>
+
 <script type="text/javascript">
 /* <![CDATA[ */
 (function($){
-	var default_color = '#<?php echo get_theme_support( 'custom-header', 'default-text-color' ); ?>',
+	var default_color = '<?php echo $default_color; ?>',
 		header_text_fields;

 	function pickColor(color) {
@@ -380,7 +441,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.6.0
 	 */
-	function js_2() { ?>
+	public function js_2() { ?>
 <script type="text/javascript">
 /* <![CDATA[ */
 	function onEndCrop( coords ) {
@@ -454,7 +515,7 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.1.0
 	 */
-	function step_1() {
+	public function step_1() {
 		$this->process_default_headers();
 ?>

@@ -624,17 +685,27 @@ class Custom_Image_Header {
 <th scope="row"><?php _e( 'Text Color' ); ?></th>
 <td>
 	<p>
-<?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>';
-}
-?>
+	<?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>';
+	}
+	?>
 	</p>
 </td>
 </tr>
@@ -662,7 +733,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 2.1.0
 	 */
-	function step_2() {
+	public 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?' ) );
@@ -670,10 +741,14 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		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 ) ) {
-			extract($this->step_2_manage_upload());
+			$data = $this->step_2_manage_upload();
+			$attachment_id = $data['attachment_id'];
+			$file = $data['file'];
+			$url = $data['url'];
+			$type = $data['type'];
 		}

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

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

 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
@@ -859,7 +934,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 ) ) {
 			/**
@@ -885,7 +960,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 2.1.0
 	 */
-	function finished() {
+	public function finished() {
 		$this->updated = true;
 		$this->step_1();
 	}
@@ -895,7 +970,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 2.1.0
 	 */
-	function admin_page() {
+	public function admin_page() {
 		if ( ! current_user_can('edit_theme_options') )
 			wp_die(__('You do not have permission to customize headers.'));
 		$step = $this->step();
@@ -912,7 +987,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 *
 	 * @since 3.4.0
 	 */
-	function attachment_fields_to_edit( $form_fields ) {
+	public function attachment_fields_to_edit( $form_fields ) {
 		return $form_fields;
 	}

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

@@ -1096,7 +1171,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	}

 	/**
-	 * Insert an attachment & its metadata.
+	 * Insert an attachment and its metadata.
 	 *
 	 * @param array $object Attachment object.
 	 * @param string $cropped Cropped image URL.
@@ -1107,8 +1182,13 @@ 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 );
 		/**
-		 * Allows us to insert custom meta data for an attachment.
+		 * Filter the header image attachment metadata.
 		 *
+		 * @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 );
@@ -1119,7 +1199,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.
 	 */
-	function ajax_header_crop() {
+	public function ajax_header_crop() {
 		check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );

 		if ( ! current_user_can( 'edit_theme_options' ) ) {
@@ -1153,6 +1233,7 @@ 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 );
@@ -1175,7 +1256,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.
 	 */
-	function ajax_header_add() {
+	public function ajax_header_add() {
 		check_ajax_referer( 'header-add', 'nonce' );

 		if ( ! current_user_can( 'edit_theme_options' ) ) {
@@ -1201,7 +1282,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.
 	 */
-	function ajax_header_remove() {
+	public function ajax_header_remove() {
 		check_ajax_referer( 'header-remove', 'nonce' );

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

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

 		if ( ! isset( $data['attachment_id'] ) ) {
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -12,16 +12,26 @@ define( 'IFRAME_REQUEST', true );
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

-if ( ! current_user_can( 'edit_theme_options' ) )
+if ( ! current_user_can( 'customize' ) ) {
 	wp_die( __( 'Cheatin&#8217; uh?' ) );
+}

 wp_reset_vars( array( 'url', 'return' ) );
-$url = urldecode( $url );
+$url = wp_unslash( $url );
 $url = wp_validate_redirect( $url, home_url( '/' ) );
-if ( $return )
-	$return = wp_validate_redirect( urldecode( $return ) );
-if ( ! $return )
-	$return = $url;
+if ( $return ) {
+	$return = wp_unslash( $return );
+	$return = wp_validate_redirect( $return );
+}
+if ( ! $return ) {
+	if ( $url ) {
+		$return = $url;
+	} elseif ( current_user_can( 'edit_theme_options' ) || current_user_can( 'switch_themes' ) ) {
+		$return = admin_url( 'themes.php' );
+	} else {
+		$return = admin_url();
+	}
+}

 global $wp_scripts, $wp_customize;

@@ -63,7 +73,7 @@ $body_class = 'wp-core-ui wp-customizer js';
 if ( wp_is_mobile() ) :
 	$body_class .= ' mobile';

-	?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=0.8, minimum-scale=0.5, maximum-scale=1.2"><?php
+	?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=0.8, minimum-scale=0.5, maximum-scale=1.2" /><?php
 endif;

 $is_ios = wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
@@ -108,14 +118,15 @@ do_action( 'customize_controls_print_scripts' );
 				submit_button( $save_text, 'primary save', 'save', false );
 			?>
 			<span class="spinner"></span>
-			<a class="back button" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">
-				<?php _e( 'Cancel' ); ?>
+			<a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
+				<span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
 			</a>
+			<span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
 		</div>

 		<?php
 			$screenshot = $wp_customize->theme()->get_screenshot();
-			$cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') );
+			$cannot_expand = ! ( $wp_customize->is_theme_active() || $screenshot || $wp_customize->theme()->get('Description') );
 		?>

 		<div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the customizer for compat -->
@@ -123,27 +134,37 @@ do_action( 'customize_controls_print_scripts' );
 			<div id="customize-info" class="accordion-section <?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
 				<div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Theme Customizer Options' ); ?>" tabindex="0">
 					<span class="preview-notice"><?php
-						/* translators: %s is the theme name in the Customize/Live Preview pane */
-						echo sprintf( __( 'You are previewing %s' ), '<strong class="theme-name">' . $wp_customize->theme()->display('Name') . '</strong>' );
+						if ( ! $wp_customize->is_theme_active() ) {
+							/* translators: %s is the theme name in the Customize/Live Preview pane */
+							echo sprintf( __( 'You are previewing %s' ), '<strong class="theme-name">' . $wp_customize->theme()->display('Name') . '</strong>' );
+						} else {
+							/* translators: %s is the site/panel title in the Customize pane */
+							echo sprintf( __( 'You are customizing %s' ), '<strong class="theme-name site-title">' . get_bloginfo( 'name' ) . '</strong>' );
+						}
 					?></span>
 				</div>
 				<?php if ( ! $cannot_expand ) : ?>
 				<div class="accordion-section-content">
-					<?php if ( $screenshot ) : ?>
-						<img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
-					<?php endif; ?>
+					<?php if ( ! $wp_customize->is_theme_active() ) :
+						if ( $screenshot ) : ?>
+							<img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
+						<?php endif; ?>

-					<?php if ( $wp_customize->theme()->get('Description') ): ?>
-						<div class="theme-description"><?php echo $wp_customize->theme()->display('Description'); ?></div>
-					<?php endif; ?>
+						<?php if ( $wp_customize->theme()->get('Description') ): ?>
+							<div class="theme-description"><?php echo $wp_customize->theme()->display('Description'); ?></div>
+						<?php endif;
+					else:
+						echo __( 'The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them.' );
+					endif; ?>
 				</div>
 				<?php endif; ?>
 			</div>

 			<div id="customize-theme-controls"><ul>
 				<?php
-				foreach ( $wp_customize->sections() as $section )
-					$section->maybe_render();
+				foreach ( $wp_customize->containers() as $container ) {
+					$container->maybe_render();
+				}
 				?>
 			</ul></div>
 		</div>
@@ -166,12 +187,14 @@ do_action( 'customize_controls_print_scripts' );
 	 */
 	do_action( 'customize_controls_print_footer_scripts' );

-	// If the frontend and the admin are served from the same domain, load the
-	// preview over ssl if the customizer is being loaded over ssl. This avoids
-	// insecure content warnings. This is not attempted if the admin and frontend
-	// are on different domains to avoid the case where the frontend doesn't have
-	// ssl certs. Domain mapping plugins can allow other urls in these conditions
-	// using the customize_allowed_urls filter.
+	/*
+	 * If the frontend and the admin are served from the same domain, load the
+	 * preview over ssl if the customizer is being loaded over ssl. This avoids
+	 * insecure content warnings. This is not attempted if the admin and frontend
+	 * are on different domains to avoid the case where the frontend doesn't have
+	 * ssl certs. Domain mapping plugins can allow other urls in these conditions
+	 * using the customize_allowed_urls filter.
+	 */

 	$allowed_urls = array( home_url('/') );
 	$admin_origin = parse_url( admin_url() );
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -11,6 +11,22 @@ if ( !defined('ABSPATH') )
 	die('-1');

 wp_enqueue_script('post');
+$_wp_editor_expand = false;
+
+/**
+ * Filter whether to enable the 'expand' functionality in the post editor.
+ *
+ * @since 4.0.0
+ *
+ * @param bool $expand Whether to enable the 'expand' functionality. Default true.
+ */
+if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() &&
+	 ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) &&
+	 apply_filters( 'wp_editor_expand', true ) ) {
+
+	wp_enqueue_script('editor-expand');
+	$_wp_editor_expand = ( get_user_setting( 'editor_expand', 'on' ) === 'on' );
+}

 if ( wp_is_mobile() )
 	wp_enqueue_script( 'jquery-touch-punch' );
@@ -176,7 +192,7 @@ foreach ( get_object_taxonomies( $post ) as $tax_name ) {
 if ( post_type_supports($post_type, 'page-attributes') )
 	add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');

-if ( $thumbnail_support )
+if ( $thumbnail_support && current_user_can( 'upload_files' ) )
 	add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low');

 if ( post_type_supports($post_type, 'excerpt') )
@@ -483,15 +499,16 @@ do_action( 'edit_form_after_title', $post );

 if ( post_type_supports($post_type, 'editor') ) {
 ?>
-<div id="postdivrich" class="postarea edit-form-section">
+<div id="postdivrich" class="postarea<?php if ( $_wp_editor_expand ) { echo ' wp-editor-expand'; } ?>">

 <?php wp_editor( $post->post_content, 'content', array(
 	'dfw' => true,
 	'drag_drop_upload' => true,
 	'tabfocus_elements' => 'insert-media-button,save-post',
-	'editor_height' => 360,
+	'editor_height' => 300,
 	'tinymce' => array(
 		'resize' => false,
+		'wp_autoresize_on' => $_wp_editor_expand,
 		'add_unload_trigger' => false,
 	),
 ) ); ?>
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -71,7 +71,7 @@ if ( !defined('ABSPATH') )

 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >
-<h3><span class='hndle'><?php _e('Status') ?></span></h3>
+<h3><span class="hndle"><?php _e('Status') ?></span></h3>
 <div class="inside">
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -13,12 +13,12 @@ if ( !defined('ABSPATH') )
 if ( ! empty($link_id) ) {
 	$heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
 	$submit_text = __('Update Link');
-	$form = '<form name="editlink" id="editlink" method="post" action="link.php">';
+	$form_name = 'editlink';
 	$nonce_action = 'update-bookmark_' . $link_id;
 } else {
 	$heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
 	$submit_text = __('Add Link');
-	$form = '<form name="addlink" id="addlink" method="post" action="link.php">';
+	$form_name = 'addlink';
 	$nonce_action = 'add-bookmark';
 }

@@ -76,11 +76,11 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 <div id="message" class="updated"><p><?php _e('Link added.'); ?></p></div>
 <?php endif; ?>

+<form name="<?php echo esc_attr( $form_name ); ?>" id="<?php echo esc_attr( $form_name ); ?>" method="post" action="link.php">
 <?php
-if ( !empty($form) )
-	echo $form;
-if ( !empty($link_added) )
+if ( ! empty( $link_added ) ) {
 	echo $link_added;
+}

 wp_nonce_field( $nonce_action );
 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
@@ -118,11 +118,7 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
 <div id="postbox-container-1" class="postbox-container">
 <?php

-/**
- * Fires before the Save meta box in the sidebar.
- *
- * @since 2.5.0
- */
+/** This action is documented in wp-admin/includes/meta-boxes.php */
 do_action( 'submitlink_box' );
 $side_meta_boxes = do_meta_boxes( 'link', 'side', $link );

--- a/Show More
+++ b/Show More