3.0.4

git-svn-id: http://svn.automattic.com/wordpress/tags/3.0.4@17175 1a063a9b-81f0-0310-95a4-ce76da25c4cd
3.0.4
2010-12-29 21:11:09 +00:00 · 2010-12-29 21:07:52 +00:00 · 2010-12-29 21:00:09 +00:00 · 2010-12-29 20:49:02 +00:00 · 2010-12-20 22:24:50 +00:00 · 2010-12-08 17:58:35 +00:00
532 changed files with 46566 additions and 34626 deletions
--- a/readme.html
+++ b/readme.html
@@ -2,90 +2,108 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>WordPress &rsaquo; ReadMe</title>
-	<link rel="stylesheet" href="wp-admin/css/install.css" type="text/css" />
+	<title>WordPress &#8250; ReadMe</title>
+	<link rel="stylesheet" href="wp-admin/css/install.css?ver=20100228" type="text/css" />
 </head>
 <body>
-<h1 id="logo" style="text-align: center">
-	<img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
-	<br /> Version 2.9.1
+<h1 id="logo">
+	<a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
+	<br /> Version 3.0.4
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>

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

 <h1>Installation: Famous 5-minute install</h1>
 <ol>
-	<li>Unzip the package in an empty directory.</li>
-	<li>Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details.</li>
-	<li>Save the file as <code>wp-config.php</code></li>
-	<li>Upload everything.</li>
-	<li>Open <span class="file"><a href="wp-admin/install.php">/wp-admin/install.php</a></span> in your browser. This should setup the tables needed for your blog. If there is an error, double check your <span class="file">wp-config.php</span> file, and try again. If it fails again, please go to the <a href="http://wordpress.org/support/">support forums</a> with as much data as you can gather.</li>
-	<li><strong>Note the password given to you.</strong></li>
-	<li> The install script should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username <code>admin</code> and the password generated during the installation. You can then click on 'Profile' to change the password.</li>
+	<li>Unzip the package in an empty directory and upload everything.</li>
+	<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser. It will take you through the process to set up a <code>wp-config.php</code> file with your database connection details.
+		<ol>
+			<li>If for some reason this doesn't work, don't worry. It doesn't work on all web hosts. Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details.</li>
+			<li>Save the file as <code>wp-config.php</code> and upload it.</li>
+			<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser.</li>
+		</ol>
+	</li>
+	<li>Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="http://wordpress.org/support/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
+	<li><strong>If you did not enter a password, note the password given to you.</strong> If you did not provide a username, it will be <code>admin</code>.</li>
+	<li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on 'Profile' to change the password.</li>
 </ol>

 <h1>Upgrading</h1>
-<p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
-<h2>Upgrading from any previous WordPress to 2.9.1:</h2>
+<h2>Using the Automatic Upgrader</h2>
+<p>If you are upgrading from version 2.7 or higher, you can use the automatic upgrader:</p>
 <ol>
-	<li>Delete your old WP files, saving ones you've modified.</li>
-	<li>Upload the new files.</li>
-	<li>Point your browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a>.</span></li>
+	<li>Open the <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your browser and follow the instructions.</li>
 	<li>You wanted more, perhaps? That's it!</li>
 </ol>
-<h2>Template Changes</h2>
-<p>If you have customized your templates you will probably have to make some changes to them. If you're converting your 1.2 or earlier templates, <a href="http://codex.wordpress.org/Upgrade_1.2_to_1.5">we've created a special guide for you</a>. </p>
+
+<h2>Upgrading Manually</h2>
+<ol>
+	<li>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</li>
+	<li>Delete your old WordPress files, saving ones you've modified.</li>
+	<li>Upload the new files.</li>
+	<li>Point your browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a>.</span></li>
+</ol>
+
+<h2>Theme Template Changes</h2>
+<p>If you have customized your theme templates, you may have to make some changes across major versions.</p>
+
+<h1>Migrating from other systems</h1>
+<p>WordPress can <a href="http://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php" title="Import to WordPress">our import tools</a>.</p>
+
+<h1>System Requirements</h1>
+<ul>
+	<li><a href="http://php.net/">PHP</a> version <strong>4.3</strong> or higher.</li>
+	<li><a href="http://www.mysql.com/">MySQL</a> version <strong>4.1.2</strong> or higher.</li>
+</ul>
+
+<h2>System Recommendations</h2>
+<ul>
+	<li>The <a href="http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
+	<li>A link to <a href="http://wordpress.org/">http://wordpress.org</a> on your site.</li>
+</ul>

 <h1>Online Resources</h1>
 <p>If you have any questions that aren't addressed in this document, please take advantage of WordPress' numerous online resources:</p>
 <dl>
-	<dt><a href="http://codex.wordpress.org/">The WordPress Codex </a></dt>
+	<dt><a href="http://codex.wordpress.org/">The WordPress Codex</a></dt>
 		<dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.</dd>
-	<dt><a href="http://wordpress.org/development/">The Development Blog</a></dt>
-		<dd>This is where you'll find the latest updates and news related to WordPress. Bookmark and check often.</dd>
-	<dt><a href="http://planet.wordpress.org/">WordPress Planet </a></dt>
+	<dt><a href="http://wordpress.org/news/">The WordPress Blog</a></dt>
+		<dd>This is where you'll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.</dd>
+	<dt><a href="http://planet.wordpress.org/">WordPress Planet</a></dt>
 		<dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.</dd>
 	<dt><a href="http://wordpress.org/support/">WordPress Support Forums</a></dt>
 		<dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
-	<dt><a href="http://codex.wordpress.org/IRC">WordPress IRC Channel</a></dt>
-		<dd>Finally, there is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
+	<dt><a href="http://codex.wordpress.org/IRC">WordPress <abbr title="Internet Relay Chat">IRC</abbr> Channel</a></dt>
+		<dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
 </dl>

-<h1>System Recommendations</h1>
-<ul>
-	<li>PHP version <strong>4.3</strong> or higher.</li>
-	<li>MySQL version <strong>4.1.2</strong> or higher.</li>
-	<li>... and a link to <a href="http://wordpress.org/">http://wordpress.org</a> on your site.</li>
-</ul>
-<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&eacute;log</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/">donating</a>.</p>
-
-<h1>Upgrading from another system</h1>
-<p>WordPress can <a href="http://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above.</p>
-
-<h1>XML-RPC and Atom Interface</h1>
-<p>You can now post to your WordPress blog with tools like <a href="http://windowslivewriter.spaces.live.com/">Windows Live Writer</a>, <a href="http://ecto.kung-foo.tv/">Ecto</a>, <a href="http://bloggar.com/">Bloggar</a>, <a href="http://radio.userland.com">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the Blogging APIs! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support">XML-RPC support on the Codex</a>.</p>
+<h1><abbr title="eXtensible Markup Language">XML</abbr>-<abbr title="Remote Procedure Call">RPC</abbr> and Atom Interface</h1>
+<p>You can post to your WordPress blog with tools like <a href="http://download.live.com/writer">Windows Live Writer</a>, <a href="http://illuminex.com/ecto/">Ecto</a>, <a href="http://bloggar.com/">w.bloggar</a>, <a href="http://radio.userland.com/">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the blogging <abbr title="application programming interface">API</abbr>s! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support"><abbr>XML</abbr>-<abbr>RPC</abbr> support on the Codex</a>.</p>

 <h1>Post via Email</h1>
-<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret POP3 account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> URL.</p>
+<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret <abbr title="Post Office Protocol version 3">POP3</abbr> account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with <a href="http://en.wikipedia.org/wiki/Cron">cron</a>-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> <abbr title="Uniform Resource Locator">URL</abbr>.</p>
 <p>Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will <em>delete</em> emails that are successfully posted.</p>

 <h1>User Roles</h1>
-<p>We've eliminated user levels in order to make way for the much more flexible roles system introduced in 2.0. You can <a href="http://codex.wordpress.org/Roles_and_Capabilities">read more about Roles and Capabilities on the Codex</a>.</p>
+<p>We introduced a very flexible roles system in version 2.0. You can <a href="http://codex.wordpress.org/Roles_and_Capabilities" title="WordPress roles and capabilities">read more about Roles and Capabilities on the Codex</a>.</p>

-<h1> Final notes</h1>
+<h1>Final Notes</h1>
 <ul>
-	<li>If you have any suggestions, ideas, comments, or if you (gasp!) found a bug, join us in the <a href="http://wordpress.org/support/">Support Forums</a>.</li>
-	<li>WordPress now has a robust plugin API that makes extending the code easy. If you are a developer interested in utilizing this see the <a href="http://codex.wordpress.org/Plugin_API">plugin documentation in the Codex</a>. In most all cases you shouldn't modify any of the core code.</li>
+	<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="http://wordpress.org/support/">Support Forums</a>.</li>
+	<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="http://codex.wordpress.org/Plugin_API" title="WordPress plugin API">plugin documentation in the Codex</a>. You shouldn't modify any of the core code.</li>
 </ul>

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

+<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>
+
 <h1>Copyright</h1>
 <p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>

+
 </body>
 </html>
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -0,0 +1,104 @@
+<?php
+define( "WP_INSTALLING", true );
+
+/** Sets up the WordPress Environment. */
+require( dirname(__FILE__) . '/wp-load.php' );
+
+require( './wp-blog-header.php' );
+
+if ( !is_multisite() ) {
+	wp_redirect( get_option( 'siteurl' ) . "/wp-login.php?action=register" );
+	die();
+}
+
+require_once( ABSPATH . WPINC . '/registration.php');
+
+if ( is_object( $wp_object_cache ) )
+	$wp_object_cache->cache_enabled = false;
+
+do_action("activate_header");
+
+function do_activate_header() {
+	do_action("activate_wp_head");
+}
+add_action( 'wp_head', 'do_activate_header' );
+
+function wpmu_activate_stylesheet() {
+	?>
+	<style type="text/css">
+		form { margin-top: 2em; }
+		#submit, #key { width: 90%; font-size: 24px; }
+		#language { margin-top: .5em; }
+		.error { background: #f66; }
+		span.h3 { padding:0 8px; font-size:1.3em; font-family:'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; font-weight:700; color:#333333; }
+	</style>
+	<?php
+}
+add_action( 'wp_head', 'wpmu_activate_stylesheet' );
+
+get_header();
+?>
+
+<div id="content" class="widecolumn">
+	<?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
+
+		<h2><?php _e('Activation Key Required') ?></h2>
+		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
+			<p>
+			    <label for="key"><?php _e('Activation Key:') ?></label>
+			    <br /><input type="text" name="key" id="key" value="" size="50" />
+			</p>
+			<p class="submit">
+			    <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
+			</p>
+		</form>
+
+	<?php } else {
+
+		$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
+		$result = wpmu_activate_signup($key);
+		if ( is_wp_error($result) ) {
+			if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+			    $signup = $result->get_error_data();
+				?>
+				<h2><?php _e('Your account is now active!'); ?></h2>
+				<?php
+				echo '<p class="lead-in">';
+				if ( $signup->domain . $signup->path == '' ) {
+					printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;.  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) );
+				} else {
+					printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;.  Please check your email inbox at %4$s for your password and login instructions.  If you do not receive an email, please check your junk or spam folder.  If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) );
+				}
+				echo '</p>';
+			} else {
+				?>
+				<h2><?php _e('An error occurred during the activation'); ?></h2>
+				<?php
+			    echo '<p>'.$result->get_error_message().'</p>';
+			}
+		} else {
+			extract($result);
+			$url = get_blogaddress_by_id( (int) $blog_id);
+			$user = new WP_User( (int) $user_id);
+			?>
+			<h2><?php _e('Your account is now active!'); ?></h2>
+
+			<div id="signup-welcome">
+				<p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
+				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
+			</div>
+
+			<?php if ( $url != network_home_url('', 'http') ) : ?>
+				<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p>
+			<?php else: ?>
+				<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p>
+			<?php endif;
+		}
+	}
+	?>
+</div>
+<script type="text/javascript">
+	var key_input = document.getElementById('key');
+	key_input && key_input.focus();
+</script>
+<?php get_footer(); ?>
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -15,29 +15,34 @@ define('DOING_AJAX', true);
 define('WP_ADMIN', true);

 require_once('../wp-load.php');
-require_once('includes/admin.php');
+
+if ( ! isset( $_REQUEST['action'] ) )
+	die('-1');
+
+require_once('./includes/admin.php');
@header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+send_nosniff_header();

 do_action('admin_init');

 if ( ! is_user_logged_in() ) {

-	if ( $_POST['action'] == 'autosave' ) {
+	if ( isset( $_POST['action'] ) && $_POST['action'] == 'autosave' ) {
 		$id = isset($_POST['post_ID'])? (int) $_POST['post_ID'] : 0;

 		if ( ! $id )
 			die('-1');

-		$message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="blank">Please log in again.</a>'), wp_login_url() );
-			$x = new WP_Ajax_Response( array(
-				'what' => 'autosave',
-				'id' => $id,
-				'data' => $message
-			) );
-			$x->send();
+		$message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="_blank">Please log in again.</a>'), wp_login_url() );
+		$x = new WP_Ajax_Response( array(
+			'what' => 'autosave',
+			'id' => $id,
+			'data' => $message
+		) );
+		$x->send();
 	}

-	if ( !empty( $_REQUEST['action']) )
+	if ( !empty( $_REQUEST['action'] ) )
 		do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );

 	die('-1');
@@ -93,10 +98,10 @@ case 'wp-compression-test' :
 		 } elseif ( 2 == $_GET['test'] ) {
 			if ( !isset($_SERVER['HTTP_ACCEPT_ENCODING']) )
 				die('-1');
-			if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+			if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
 				header('Content-Encoding: deflate');
 				$out = gzdeflate( $test_str, 1 );
-			} elseif ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
+			} elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
 				header('Content-Encoding: gzip');
 				$out = gzencode( $test_str, 1 );
 			} else {
@@ -121,11 +126,21 @@ case 'imgedit-preview' :
 	check_ajax_referer( "image_editor-$post_id" );

 	include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
-	if ( !stream_preview_image($post_id) )
+	if ( ! stream_preview_image($post_id) )
 		die('-1');

 	die();
 	break;
+case 'menu-quick-search':
+	if ( ! current_user_can( 'edit_theme_options' ) )
+		die('-1');
+
+	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+
+	_wp_ajax_menu_quick_search( $_REQUEST );
+
+	exit;
+	break;
 case 'oembed-cache' :
 	$return = ( $wp_embed->cache_oembed( $_GET['post'] ) ) ? '1' : '0';
 	die( $return );
@@ -200,6 +215,84 @@ function _wp_ajax_delete_comment_response( $comment_id ) {
 	$x->send();
 }

+function _wp_ajax_add_hierarchical_term() {
+	$action = $_POST['action'];
+	$taxonomy = get_taxonomy(substr($action, 4));
+	check_ajax_referer( $action, '_ajax_nonce-add-' . $taxonomy->name );
+	if ( !current_user_can( $taxonomy->cap->edit_terms ) )
+		die('-1');
+	$names = explode(',', $_POST['new'.$taxonomy->name]);
+	$parent = isset($_POST['new'.$taxonomy->name.'_parent']) ? (int) $_POST['new'.$taxonomy->name.'_parent'] : 0;
+	if ( 0 > $parent )
+		$parent = 0;
+	if ( $taxonomy->name == 'category' )
+		$post_category = isset($_POST['post_category']) ? (array) $_POST['post_category'] : array();
+	else
+		$post_category = ( isset($_POST['tax_input']) && isset($_POST['tax_input'][$taxonomy->name]) ) ? (array) $_POST['tax_input'][$taxonomy->name] : array();
+	$checked_categories = array_map( 'absint', (array) $post_category );
+	$popular_ids = wp_popular_terms_checklist($taxonomy->name, 0, 10, false);
+
+	foreach ( $names as $cat_name ) {
+		$cat_name = trim($cat_name);
+		$category_nicename = sanitize_title($cat_name);
+		if ( '' === $category_nicename )
+			continue;
+		if ( !($cat_id = term_exists($cat_name, $taxonomy->name, $parent)) ) {
+			$new_term = wp_insert_term($cat_name, $taxonomy->name, array('parent' => $parent));
+			$cat_id = $new_term['term_id'];
+		}
+		$checked_categories[] = $cat_id;
+		if ( $parent ) // Do these all at once in a second
+			continue;
+		$category = get_term( $cat_id, $taxonomy->name );
+		ob_start();
+			wp_terms_checklist( 0, array( 'taxonomy' => $taxonomy->name, 'descendants_and_self' => $cat_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids ));
+		$data = ob_get_contents();
+		ob_end_clean();
+		$add = array(
+			'what' => $taxonomy->name,
+			'id' => $cat_id,
+			'data' => str_replace( array("\n", "\t"), '', $data),
+			'position' => -1
+		);
+	}
+
+	if ( $parent ) { // Foncy - replace the parent and all its children
+		$parent = get_term( $parent, $taxonomy->name );
+		$term_id = $parent->term_id;
+
+		while ( $parent->parent ) { // get the top parent
+			$parent = &get_term( $parent->parent, $taxonomy->name );
+			if ( is_wp_error( $parent ) )
+				break;
+			$term_id = $parent->term_id;
+		}
+
+		ob_start();
+			wp_terms_checklist( 0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $term_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids));
+		$data = ob_get_contents();
+		ob_end_clean();
+		$add = array(
+			'what' => $taxonomy->name,
+			'id' => $term_id,
+			'data' => str_replace( array("\n", "\t"), '', $data),
+			'position' => -1
+		);
+	}
+
+	ob_start();
+		wp_dropdown_categories( array(
+			'taxonomy' => $taxonomy->name, 'hide_empty' => 0, 'name' => 'new'.$taxonomy->name.'_parent', 'orderby' => 'name',
+			'hierarchical' => 1, 'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;'
+		) );
+	$sup = ob_get_contents();
+	ob_end_clean();
+	$add['supplemental'] = array( 'newcat_parent' => $sup );
+
+	$x = new WP_Ajax_Response( $add );
+	$x->send();
+}
+
 $id = isset($_POST['id'])? (int) $_POST['id'] : 0;
 switch ( $action = $_POST['action'] ) :
 case 'delete-comment' : // On success, die with time() instead of 1
@@ -237,27 +330,15 @@ case 'delete-comment' : // On success, die with time() instead of 1
 		_wp_ajax_delete_comment_response( $comment->comment_ID );
 	die( '0' );
 	break;
-case 'delete-cat' :
-	check_ajax_referer( "delete-category_$id" );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	$cat = get_category( $id );
-	if ( !$cat || is_wp_error( $cat ) )
-		die('1');
-
-	if ( wp_delete_category( $id ) )
-		die('1');
-	else
-		die('0');
-	break;
 case 'delete-tag' :
 	$tag_id = (int) $_POST['tag_ID'];
 	check_ajax_referer( "delete-tag_$tag_id" );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');

 	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+	$tax = get_taxonomy($taxonomy);
+
+	if ( !current_user_can( $tax->cap->delete_terms ) )
+		die('-1');

 	$tag = get_term( $tag_id, $taxonomy );
 	if ( !$tag || is_wp_error( $tag ) )
@@ -409,70 +490,6 @@ case 'dim-comment' : // On success, die with time() instead of 1
 	_wp_ajax_delete_comment_response( $comment->comment_ID );
 	die( '0' );
 	break;
-case 'add-category' : // On the Fly
-	check_ajax_referer( $action );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-	$names = explode(',', $_POST['newcat']);
-	if ( 0 > $parent = (int) $_POST['newcat_parent'] )
-		$parent = 0;
-	$post_category = isset($_POST['post_category'])? (array) $_POST['post_category'] : array();
-	$checked_categories = array_map( 'absint', (array) $post_category );
-	$popular_ids = wp_popular_terms_checklist('category', 0, 10, false);
-
-	foreach ( $names as $cat_name ) {
-		$cat_name = trim($cat_name);
-		$category_nicename = sanitize_title($cat_name);
-		if ( '' === $category_nicename )
-			continue;
-		$cat_id = wp_create_category( $cat_name, $parent );
-		$checked_categories[] = $cat_id;
-		if ( $parent ) // Do these all at once in a second
-			continue;
-		$category = get_category( $cat_id );
-		ob_start();
-			wp_category_checklist( 0, $cat_id, $checked_categories, $popular_ids );
-		$data = ob_get_contents();
-		ob_end_clean();
-		$add = array(
-			'what' => 'category',
-			'id' => $cat_id,
-			'data' => str_replace( array("\n", "\t"), '', $data),
-			'position' => -1
-		);
-	}
-	if ( $parent ) { // Foncy - replace the parent and all its children
-		$parent = get_category( $parent );
-		$term_id = $parent->term_id;
-
-		while ( $parent->parent ) { // get the top parent
-			$parent = &get_category( $parent->parent );
-			if ( is_wp_error( $parent ) )
-				break;
-			$term_id = $parent->term_id;
-		}
-
-		ob_start();
-			wp_category_checklist( 0, $term_id, $checked_categories, $popular_ids, null, false );
-		$data = ob_get_contents();
-		ob_end_clean();
-		$add = array(
-			'what' => 'category',
-			'id' => $term_id,
-			'data' => str_replace( array("\n", "\t"), '', $data),
-			'position' => -1
-		);
-	}
-
-	ob_start();
-		wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category') ) );
-	$sup = ob_get_contents();
-	ob_end_clean();
-	$add['supplemental'] = array( 'newcat_parent' => $sup );
-
-	$x = new WP_Ajax_Response( $add );
-	$x->send();
-	break;
 case 'add-link-category' : // On the Fly
 	check_ajax_referer( $action );
 	if ( !current_user_can( 'manage_categories' ) )
@@ -484,7 +501,7 @@ case 'add-link-category' : // On the Fly
 		$slug = sanitize_title($cat_name);
 		if ( '' === $slug )
 			continue;
-		if ( !$cat_id = is_term( $cat_name, 'link_category' ) ) {
+		if ( !$cat_id = term_exists( $cat_name, 'link_category' ) ) {
 			$cat_id = wp_insert_term( $cat_name, 'link_category' );
 		}
 		$cat_id = $cat_id['term_id'];
@@ -498,59 +515,6 @@ case 'add-link-category' : // On the Fly
 	}
 	$x->send();
 	break;
-case 'add-cat' : // From Manage->Categories
-	check_ajax_referer( 'add-category' );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	if ( '' === trim($_POST['cat_name']) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'cat',
-			'id' => new WP_Error( 'cat_name', __('You did not enter a category name.') )
-		) );
-		$x->send();
-	}
-
-	if ( category_exists( trim( $_POST['cat_name'] ), $_POST['category_parent'] ) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'cat',
-			'id' => new WP_Error( 'cat_exists', __('The category you are trying to create already exists.'), array( 'form-field' => 'cat_name' ) ),
-		) );
-		$x->send();
-	}
-
-	$cat = wp_insert_category( $_POST, true );
-
-	if ( is_wp_error($cat) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'cat',
-			'id' => $cat
-		) );
-		$x->send();
-	}
-
-	if ( !$cat || (!$cat = get_category( $cat )) )
-		die('0');
-
-	$level = 0;
-	$cat_full_name = $cat->name;
-	$_cat = $cat;
-	while ( $_cat->parent ) {
-		$_cat = get_category( $_cat->parent );
-		$cat_full_name = $_cat->name . ' &#8212; ' . $cat_full_name;
-		$level++;
-	}
-	$cat_full_name = esc_attr($cat_full_name);
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'cat',
-		'id' => $cat->term_id,
-		'position' => -1,
-		'data' => _cat_row( $cat, $level, $cat_full_name ),
-		'supplemental' => array('name' => $cat_full_name, 'show-link' => sprintf(__( 'Category <a href="#%s">%s</a> added' ), "cat-$cat->term_id", $cat_full_name))
-	) );
-	$x->send();
-	break;
 case 'add-link-cat' : // From Blogroll -> Categories
 	check_ajax_referer( 'add-link-category' );
 	if ( !current_user_can( 'manage_categories' ) )
@@ -588,19 +552,57 @@ case 'add-link-cat' : // From Blogroll -> Categories
 	break;
 case 'add-tag' : // From Manage->Tags
 	check_ajax_referer( 'add-tag' );
-	if ( !current_user_can( 'manage_categories' ) )
+	$post_type = !empty($_POST['post_type']) ? $_POST['post_type'] : 'post';
+	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+	$tax = get_taxonomy($taxonomy);
+
+	$x = new WP_Ajax_Response();
+
+	if ( !current_user_can( $tax->cap->edit_terms ) )
 		die('-1');

-	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 	$tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );

 	if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
-		echo '<div class="error"><p>' . __('An error has occured. Please reload the page and try again.') . '</p></div>';
-		exit;
+		$message = __('An error has occured. Please reload the page and try again.');
+		if ( is_wp_error($tag) && $tag->get_error_message() )
+			$message = $tag->get_error_message();
+
+		$x->add( array(
+			'what' => 'taxonomy',
+			'data' => new WP_Error('error', $message )
+		) );
+		$x->send();
 	}

-	echo _tag_row( $tag, '', $taxonomy );
-	exit;
+	if ( isset($_POST['screen']) )
+		set_current_screen($_POST['screen']);
+
+	$level = 0;
+	$tag_full_name = false;
+	$tag_full_name = $tag->name;
+	if ( is_taxonomy_hierarchical($taxonomy) ) {
+		$_tag = $tag;
+		while ( $_tag->parent  ) {
+			$_tag = get_term( $_tag->parent, $taxonomy );
+			$tag_full_name = $_tag->name . ' &#8212; ' . $tag_full_name;
+			$level++;
+		}
+		$noparents = _tag_row( $tag, $level, $taxonomy );
+	}
+	$tag->name = $tag_full_name;
+	$parents = _tag_row( $tag, 0, $taxonomy);
+
+	$x->add( array(
+		'what' => 'taxonomy',
+		'supplemental' => compact('parents', 'noparents')
+		) );
+	$x->add( array(
+		'what' => 'term',
+		'position' => $level,
+		'supplemental' => get_term( $tag->term_id, $taxonomy, ARRAY_A ) //Refetch as $tag has been contaminated by the full name.
+		) );
+	$x->send();
 	break;
 case 'get-tagcloud' :
 	if ( !current_user_can( 'edit_posts' ) )
@@ -613,8 +615,10 @@ case 'get-tagcloud' :

 	$tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );

-	if ( empty( $tags ) )
-		die( __('No tags found!') );
+	if ( empty( $tags ) ) {
+		$tax = get_taxonomy( $taxonomy );
+		die( isset( $tax->no_tagcloud ) ? $tax->no_tagcloud : __('No tags found!') );
+	}

 	if ( is_wp_error($tags) )
 		die($tags->get_error_message());
@@ -701,7 +705,7 @@ case 'get-comments' :
 	$x->send();
 	break;
 case 'replyto-comment' :
-	check_ajax_referer( $action );
+	check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );

 	$comment_post_ID = (int) $_POST['comment_post_ID'];
 	if ( !current_user_can( 'edit_post', $comment_post_ID ) )
@@ -770,7 +774,7 @@ case 'replyto-comment' :
 	$x->send();
 	break;
 case 'edit-comment' :
-	check_ajax_referer( 'replyto-comment' );
+	check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' );

 	$comment_post_ID = (int) $_POST['comment_post_ID'];
 	if ( ! current_user_can( 'edit_post', $comment_post_ID ) )
@@ -807,20 +811,60 @@ case 'edit-comment' :

 	$x->send();
 	break;
+case 'add-menu-item' :
+	if ( ! current_user_can( 'edit_theme_options' ) )
+		die('-1');
+
+	check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
+
+	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+
+	$item_ids = wp_save_nav_menu_items( 0, $_POST['menu-item'] );
+	if ( is_wp_error( $item_ids ) )
+		die('-1');
+
+	foreach ( (array) $item_ids as $menu_item_id ) {
+		$menu_obj = get_post( $menu_item_id );
+		if ( ! empty( $menu_obj->ID ) ) {
+			$menu_obj = wp_setup_nav_menu_item( $menu_obj );
+			$menu_obj->label = $menu_obj->title; // don't show "(pending)" in ajax-added items
+			$menu_items[] = $menu_obj;
+		}
+	}
+
+	if ( ! empty( $menu_items ) ) {
+		$args = array(
+			'after' => '',
+			'before' => '',
+			'link_after' => '',
+			'link_before' => '',
+			'walker' => new Walker_Nav_Menu_Edit,
+		);
+		echo walk_nav_menu_tree( $menu_items, 0, (object) $args );
+	}
+	break;
 case 'add-meta' :
-	check_ajax_referer( 'add-meta' );
+	check_ajax_referer( 'add-meta', '_ajax_nonce-add-meta' );
 	$c = 0;
 	$pid = (int) $_POST['post_id'];
+	$post = get_post( $pid );
+
 	if ( isset($_POST['metakeyselect']) || isset($_POST['metakeyinput']) ) {
 		if ( !current_user_can( 'edit_post', $pid ) )
 			die('-1');
 		if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
 			die('1');
-		if ( $pid < 0 ) {
+		if ( $post->post_status == 'auto-draft' ) {
+			$save_POST = $_POST; // Backup $_POST
+			$_POST = array(); // Make it empty for edit_post()
+			$_POST['action'] = 'draft'; // Warning fix
+			$_POST['post_ID'] = $pid;
+			$_POST['post_type'] = $post->post_type;
+			$_POST['post_status'] = 'draft';
 			$now = current_time('timestamp', 1);
-			if ( $pid = wp_insert_post( array(
-				'post_title' => sprintf('Draft created on %s at %s', date(get_option('date_format'), $now), date(get_option('time_format'), $now))
-			) ) ) {
+			$_POST['post_title'] = sprintf('Draft created on %s at %s', date(get_option('date_format'), $now), date(get_option('time_format'), $now));
+
+			if ( $pid = edit_post() ) {
 				if ( is_wp_error( $pid ) ) {
 					$x = new WP_Ajax_Response( array(
 						'what' => 'meta',
@@ -828,6 +872,7 @@ case 'add-meta' :
 					) );
 					$x->send();
 				}
+				$_POST = $save_POST; // Now we can restore original $_POST again
 				if ( !$mid = add_meta( $pid ) )
 					die(__('Please provide a custom field value.'));
 			} else {
@@ -847,15 +892,19 @@ case 'add-meta' :
 			'position' => 1,
 			'supplemental' => array('postid' => $pid)
 		) );
-	} else {
-		$mid = (int) array_pop(array_keys($_POST['meta']));
+	} else { // Update?
+		$mid = (int) array_pop( $var_by_ref = array_keys($_POST['meta']) );
 		$key = $_POST['meta'][$mid]['key'];
 		$value = $_POST['meta'][$mid]['value'];
+		if ( '' == trim($key) )
+			die(__('Please provide a custom field name.'));
+		if ( '' == trim($value) )
+			die(__('Please provide a custom field value.'));
 		if ( !$meta = get_post_meta_by_id( $mid ) )
 			die('0'); // if meta doesn't exist
 		if ( !current_user_can( 'edit_post', $meta->post_id ) )
 			die('-1');
-		if ( $meta->meta_value != stripslashes($value) ) {
+		if ( $meta->meta_value != stripslashes($value) || $meta->meta_key != stripslashes($key) ) {
 			if ( !$u = update_meta( $mid, $key, $value ) )
 				die('0'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
 		}
@@ -907,10 +956,9 @@ case 'autosave' : // The name of this action is hardcoded in edit_post()
 	define( 'DOING_AUTOSAVE', true );

 	$nonce_age = check_ajax_referer( 'autosave', 'autosavenonce' );
-	global $current_user;

 	$_POST['post_category'] = explode(",", $_POST['catslist']);
-	if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
+	if ( $_POST['post_type'] == 'page' || empty($_POST['post_category']) )
 		unset($_POST['post_category']);

 	$do_autosave = (bool) $_POST['autosave'];
@@ -919,64 +967,62 @@ case 'autosave' : // The name of this action is hardcoded in edit_post()
 	$data = '';
 	/* translators: draft saved date format, see http://php.net/date */
 	$draft_saved_date_format = __('g:i:s a');
-	$message = sprintf( __('Draft Saved at %s.'), date_i18n( $draft_saved_date_format ) );
+	/* translators: %s: date and time */
+	$message = sprintf( __('Draft saved at %s.'), date_i18n( $draft_saved_date_format ) );

 	$supplemental = array();
 	if ( isset($login_grace_period) )
 		$supplemental['session_expired'] = add_query_arg( 'interim-login', 1, wp_login_url() );

 	$id = $revision_id = 0;
-	if($_POST['post_ID'] < 0) {
+
+	$post_ID = (int) $_POST['post_ID'];
+	$_POST['ID'] = $post_ID;
+	$post = get_post($post_ID);
+	if ( 'auto-draft' == $post->post_status )
 		$_POST['post_status'] = 'draft';
-		$_POST['temp_ID'] = $_POST['post_ID'];
-		if ( $do_autosave ) {
-			$id = wp_write_post();
-			$data = $message;
-		}
-	} else {
-		$post_ID = (int) $_POST['post_ID'];
-		$_POST['ID'] = $post_ID;
-		$post = get_post($post_ID);

-		if ( $last = wp_check_post_lock( $post->ID ) ) {
-			$do_autosave = $do_lock = false;
+	if ( $last = wp_check_post_lock( $post->ID ) ) {
+		$do_autosave = $do_lock = false;

-			$last_user = get_userdata( $last );
-			$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
-			$data = new WP_Error( 'locked', sprintf(
-				$_POST['post_type'] == 'page' ? __( 'Autosave disabled: %s is currently editing this page.' ) : __( 'Autosave disabled: %s is currently editing this post.' ),
-				esc_html( $last_user_name )
-			) );
+		$last_user = get_userdata( $last );
+		$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
+		$data = new WP_Error( 'locked', sprintf(
+			$_POST['post_type'] == 'page' ? __( 'Autosave disabled: %s is currently editing this page.' ) : __( 'Autosave disabled: %s is currently editing this post.' ),
+			esc_html( $last_user_name )
+		) );

-			$supplemental['disable_autosave'] = 'disable';
-		}
-
-		if ( 'page' == $post->post_type ) {
-			if ( !current_user_can('edit_page', $post_ID) )
-				die(__('You are not allowed to edit this page.'));
-		} else {
-			if ( !current_user_can('edit_post', $post_ID) )
-				die(__('You are not allowed to edit this post.'));
-		}
-
-		if ( $do_autosave ) {
-			// Drafts are just overwritten by autosave
-			if ( 'draft' == $post->post_status ) {
-				$id = edit_post();
-			} else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
-				$revision_id = wp_create_post_autosave( $post->ID );
-				if ( is_wp_error($revision_id) )
-					$id = $revision_id;
-				else
-					$id = $post->ID;
-			}
-			$data = $message;
-		} else {
-			$id = $post->ID;
-		}
+		$supplemental['disable_autosave'] = 'disable';
 	}

-	if ( $do_lock && $id && is_numeric($id) )
+	if ( 'page' == $post->post_type ) {
+		if ( !current_user_can('edit_page', $post_ID) )
+			die(__('You are not allowed to edit this page.'));
+	} else {
+		if ( !current_user_can('edit_post', $post_ID) )
+			die(__('You are not allowed to edit this post.'));
+	}
+
+	if ( $do_autosave ) {
+		// Drafts and auto-drafts are just overwritten by autosave
+		if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) {
+			$id = edit_post();
+		} else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
+			$revision_id = wp_create_post_autosave( $post->ID );
+			if ( is_wp_error($revision_id) )
+				$id = $revision_id;
+			else
+				$id = $post->ID;
+		}
+		$data = $message;
+	} else {
+		if ( isset( $_POST['auto_draft'] ) && '1' == $_POST['auto_draft'] )
+			$id = 0; // This tells us it didn't actually save
+		else
+			$id = $post->ID;
+	}
+
+	if ( $do_lock && ( isset( $_POST['auto_draft'] ) && ( $_POST['auto_draft'] != '1' ) ) && $id && is_numeric($id) )
 		wp_set_post_lock( $id );

 	if ( $nonce_age == 2 ) {
@@ -1000,21 +1046,14 @@ case 'autosave' : // The name of this action is hardcoded in edit_post()
 	) );
 	$x->send();
 	break;
-case 'autosave-generate-nonces' :
-	check_ajax_referer( 'autosave', 'autosavenonce' );
-	$ID = (int) $_POST['post_ID'];
-	$post_type = ( 'page' == $_POST['post_type'] ) ? 'page' : 'post';
-	if ( current_user_can( "edit_{$post_type}", $ID ) )
-		die( json_encode( array( 'updateNonce' => wp_create_nonce( "update-{$post_type}_{$ID}" ), 'deleteURL' => str_replace( '&amp;', '&', wp_nonce_url( admin_url( $post_type . '.php?action=trash&post=' . $ID ), "trash-{$post_type}_{$ID}" ) ) ) ) );
-	do_action('autosave_generate_nonces');
-	die('0');
-break;
 case 'closed-postboxes' :
 	check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' );
-	$closed = isset( $_POST['closed'] ) ? $_POST['closed'] : '';
-	$closed = explode( ',', $_POST['closed'] );
-	$hidden = isset( $_POST['hidden'] ) ? $_POST['hidden'] : '';
-	$hidden = explode( ',', $_POST['hidden'] );
+	$closed = isset( $_POST['closed'] ) ? explode( ',', $_POST['closed']) : array();
+	$closed = array_filter($closed);
+
+	$hidden = isset( $_POST['hidden'] ) ? explode( ',', $_POST['hidden']) : array();
+	$hidden = array_filter($hidden);
+
 	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';

 	if ( !preg_match( '/^[a-z_-]+$/', $page ) )
@@ -1024,11 +1063,11 @@ case 'closed-postboxes' :
 		die('-1');

 	if ( is_array($closed) )
-		update_usermeta($user->ID, 'closedpostboxes_'.$page, $closed);
+		update_user_option($user->ID, "closedpostboxes_$page", $closed, true);

 	if ( is_array($hidden) ) {
-		$hidden = array_diff( $hidden, array('submitdiv', 'linksubmitdiv') ); // postboxes that are always shown
-		update_usermeta($user->ID, 'meta-box-hidden_'.$page, $hidden);
+		$hidden = array_diff( $hidden, array('submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu') ); // postboxes that are always shown
+		update_user_option($user->ID, "metaboxhidden_$page", $hidden, true);
 	}

 	die('1');
@@ -1046,8 +1085,66 @@ case 'hidden-columns' :
 		die('-1');

 	if ( is_array($hidden) )
-		update_usermeta($user->ID, "manage-$page-columns-hidden", $hidden);
+		update_user_option($user->ID, "manage{$page}columnshidden", $hidden, true);

+	die('1');
+	break;
+case 'menu-get-metabox' :
+	if ( ! current_user_can( 'edit_theme_options' ) )
+		die('-1');
+
+	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+
+	if ( isset( $_POST['item-type'] ) && 'post_type' == $_POST['item-type'] ) {
+		$type = 'posttype';
+		$callback = 'wp_nav_menu_item_post_type_meta_box';
+		$items = (array) get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+	} elseif ( isset( $_POST['item-type'] ) && 'taxonomy' == $_POST['item-type'] ) {
+		$type = 'taxonomy';
+		$callback = 'wp_nav_menu_item_taxonomy_meta_box';
+		$items = (array) get_taxonomies( array( 'show_ui' => true ), 'object' );
+	}
+
+	if ( ! empty( $_POST['item-object'] ) && isset( $items[$_POST['item-object']] ) ) {
+		$item = apply_filters( 'nav_menu_meta_box_object', $items[ $_POST['item-object'] ] );
+		ob_start();
+		call_user_func_array($callback, array(
+			null,
+			array(
+				'id' => 'add-' . $item->name,
+				'title' => $item->labels->name,
+				'callback' => $callback,
+				'args' => $item,
+			)
+		));
+
+		$markup = ob_get_clean();
+
+		echo json_encode(array(
+			'replace-id' => $type . '-' . $item->name,
+			'markup' => $markup,
+		));
+	}
+
+	exit;
+	break;
+case 'menu-quick-search':
+	if ( ! current_user_can( 'edit_theme_options' ) )
+		die('-1');
+
+	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+
+	_wp_ajax_menu_quick_search( $_REQUEST );
+
+	exit;
+	break;
+case 'menu-locations-save':
+	if ( ! current_user_can( 'edit_theme_options' ) )
+		die('-1');
+	check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
+	if ( ! isset( $_POST['menu-locations'] ) )
+		die('0');
+	set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_POST['menu-locations'] ) );
 	die('1');
 	break;
 case 'meta-box-order':
@@ -1063,10 +1160,10 @@ case 'meta-box-order':
 		die('-1');

 	if ( $order )
-		update_user_option($user->ID, "meta-box-order_$page", $order);
+		update_user_option($user->ID, "meta-box-order_$page", $order, true);

 	if ( $page_columns )
-		update_usermeta($user->ID, "screen_layout_$page", $page_columns);
+		update_user_option($user->ID, "screen_layout_$page", $page_columns, true);

 	die('1');
 	break;
@@ -1079,7 +1176,7 @@ case 'sample-permalink':
 	check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
 	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
 	$title = isset($_POST['new_title'])? $_POST['new_title'] : '';
-	$slug = isset($_POST['new_slug'])? $_POST['new_slug'] : '';
+	$slug = isset($_POST['new_slug'])? $_POST['new_slug'] : null;
 	die(get_sample_permalink_html($post_id, $title, $slug));
 break;
 case 'inline-save':
@@ -1096,6 +1193,9 @@ case 'inline-save':
 			die( __('You are not allowed to edit this post.') );
 	}

+	if ( isset($_POST['screen']) )
+		set_current_screen($_POST['screen']);
+
 	if ( $last = wp_check_post_lock( $post_ID ) ) {
 		$last_user = get_userdata( $last );
 		$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
@@ -1131,14 +1231,15 @@ case 'inline-save':
 	// update the post
 	edit_post();

-	$post = array();
-	if ( 'page' == $_POST['post_type'] ) {
+	if ( in_array( $_POST['post_type'], get_post_types( array( 'show_ui' => true ) ) ) ) {
+		$post = array();
 		$post[] = get_post($_POST['post_ID']);
-		page_rows($post);
-	} elseif ( 'post' == $_POST['post_type'] ) {
-		$mode = $_POST['post_view'];
-		$post[] = get_post($_POST['post_ID']);
-		post_rows($post);
+		if ( is_post_type_hierarchical( $_POST['post_type'] ) ) {
+			page_rows( $post );
+		} else {
+			$mode = $_POST['post_view'];
+			post_rows( $post );
+		}
 	}

 	exit;
@@ -1146,32 +1247,18 @@ case 'inline-save':
 case 'inline-save-tax':
 	check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );

-	if ( ! current_user_can('manage_categories') )
+	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : false;
+	if ( ! $taxonomy )
+		die( __('Cheatin&#8217; uh?') );
+	$tax = get_taxonomy($taxonomy);
+
+	if ( ! current_user_can( $tax->cap->edit_terms ) )
 		die( __('Cheatin&#8217; uh?') );

 	if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) )
 		die(-1);

 	switch ($_POST['tax_type']) {
-		case 'cat' :
-			$data = array();
-			$data['cat_ID'] = $id;
-			$data['cat_name'] = $_POST['name'];
-			$data['category_nicename'] = $_POST['slug'];
-			if ( isset($_POST['parent']) && (int) $_POST['parent'] > 0 )
-				$data['category_parent'] = $_POST['parent'];
-
-			$cat = get_category($id, ARRAY_A);
-			$data['category_description'] = $cat['category_description'];
-
-			$updated = wp_update_category($data);
-
-			if ( $updated && !is_wp_error($updated) )
-				echo _cat_row( $updated, 0 );
-			else
-				die( __('Category not updated.') );
-
-			break;
 		case 'link-cat' :
 			$updated = wp_update_term($id, 'link_category', $_POST);

@@ -1190,12 +1277,19 @@ case 'inline-save-tax':
 			$updated = wp_update_term($id, $taxonomy, $_POST);
 			if ( $updated && !is_wp_error($updated) ) {
 				$tag = get_term( $updated['term_id'], $taxonomy );
-				if ( !$tag || is_wp_error( $tag ) )
-					die( __('Tag not updated.') );
+				if ( !$tag || is_wp_error( $tag ) ) {
+					if ( is_wp_error($tag) && $tag->get_error_message() )
+						die( $tag->get_error_message() );
+					die( __('Item not updated.') );
+				}

-				echo _tag_row($tag, '', $taxonomy);
+				set_current_screen( 'edit-' . $taxonomy );
+
+				echo _tag_row($tag, 0, $taxonomy);
 			} else {
-				die( __('Tag not updated.') );
+				if ( is_wp_error($updated) && $updated->get_error_message() )
+					die( $updated->get_error_message() );
+				die( __('Item not updated.') );
 			}

 			break;
@@ -1209,7 +1303,11 @@ case 'find_posts':
 	if ( empty($_POST['ps']) )
 		exit;

-	$what = isset($_POST['pages']) ? 'page' : 'post';
+	if ( !empty($_POST['post_type']) && in_array( $_POST['post_type'], get_post_types() ) )
+		$what = $_POST['post_type'];
+	else
+		$what = 'post';
+
 	$s = stripslashes($_POST['ps']);
 	preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
 	$search_terms = array_map('_search_terms_tidy', $matches[0]);
@@ -1226,8 +1324,10 @@ case 'find_posts':

 	$posts = $wpdb->get_results( "SELECT ID, post_title, post_status, post_date FROM $wpdb->posts WHERE post_type = '$what' AND post_status IN ('draft', 'publish') AND ($search) ORDER BY post_date_gmt DESC LIMIT 50" );

-	if ( ! $posts )
-		exit( __('No posts found.') );
+	if ( ! $posts ) {
+		$posttype = get_post_type_object($what);
+		exit($posttype->labels->not_found);
+	}

 	$html = '<table class="widefat" cellspacing="0"><thead><tr><th class="found-radio"><br /></th><th>'.__('Title').'</th><th>'.__('Date').'</th><th>'.__('Status').'</th></tr></thead><tbody>';
 	foreach ( $posts as $post ) {
@@ -1284,7 +1384,7 @@ case 'lj-importer' :
 case 'widgets-order' :
 	check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );

-	if ( !current_user_can('switch_themes') )
+	if ( !current_user_can('edit_theme_options') )
 		die('-1');

 	unset( $_POST['savewidgets'], $_POST['action'] );
@@ -1314,7 +1414,7 @@ case 'widgets-order' :
 case 'save-widget' :
 	check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );

-	if ( !current_user_can('switch_themes') || !isset($_POST['id_base']) )
+	if ( !current_user_can('edit_theme_options') || !isset($_POST['id_base']) )
 		die('-1');

 	unset( $_POST['savewidgets'], $_POST['action'] );
@@ -1406,24 +1506,27 @@ case 'image-editor':
 	die();
 	break;
 case 'set-post-thumbnail':
-	$post_id = intval( $_POST['post_id'] );
-	if ( !current_user_can( 'edit_post', $post_id ) )
+	$post_ID = intval( $_POST['post_id'] );
+	if ( !current_user_can( 'edit_post', $post_ID ) )
 		die( '-1' );
 	$thumbnail_id = intval( $_POST['thumbnail_id'] );

+	check_ajax_referer( "set_post_thumbnail-$post_ID" );
+
 	if ( $thumbnail_id == '-1' ) {
-		delete_post_meta( $post_id, '_thumbnail_id' );
+		delete_post_meta( $post_ID, '_thumbnail_id' );
 		die( _wp_post_thumbnail_html() );
 	}

 	if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
 		$thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'thumbnail' );
 		if ( !empty( $thumbnail_html ) ) {
-			update_post_meta( $post_id, '_thumbnail_id', $thumbnail_id );
+			update_post_meta( $post_ID, '_thumbnail_id', $thumbnail_id );
 			die( _wp_post_thumbnail_html( $thumbnail_id ) );
 		}
 	}
 	die( '0' );
+	break;
 default :
 	do_action( 'wp_ajax_' . $_POST['action'] );
 	die('0');
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -22,14 +22,13 @@ do_action( 'in_admin_footer' );
 $upgrade = apply_filters( 'update_footer', '' );
 echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>') ); ?>
 </p>
-<?php // if ( $is_IE ) browse_happy(); ?>
 <p id="footer-upgrade" class="alignright"><?php echo $upgrade; ?></p>
 <div class="clear"></div>
 </div>
 <?php
 do_action('admin_footer', '');
 do_action('admin_print_footer_scripts');
-do_action("admin_footer-$hook_suffix");
+do_action("admin_footer-" . $GLOBALS['hook_suffix']);

 // get_site_option() won't exist when auto upgrading from <= 2.7
 if ( function_exists('get_site_option') ) {
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -7,7 +7,8 @@
 */

@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if (!isset($_GET["page"])) require_once('admin.php');
+if ( ! defined( 'WP_ADMIN' ) )
+	require_once( './admin.php' );

 get_admin_page_title();
 $title = esc_html( strip_tags( $title ) );
@@ -25,28 +26,32 @@ wp_admin_css( 'css/global' );
 wp_admin_css();
 wp_admin_css( 'css/colors' );
 wp_admin_css( 'css/ie' );
+if ( is_multisite() )
+	wp_admin_css( 'css/ms' );
 wp_enqueue_script('utils');

-$hook_suffix = '';
-if ( isset($page_hook) )
-	$hook_suffix = "$page_hook";
-else if ( isset($plugin_page) )
-	$hook_suffix = "$plugin_page";
-else if ( isset($pagenow) )
-	$hook_suffix = "$pagenow";
-
 $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 <script type="text/javascript">
 //<![CDATA[
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time() ?>'};
-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = '<?php echo substr($pagenow, 0, -4); ?>', adminpage = '<?php echo $admin_body_class; ?>',  thousandsSeparator = '<?php echo $wp_locale->number_format['thousands_sep']; ?>', decimalPoint = '<?php echo $wp_locale->number_format['decimal_point']; ?>';
+var userSettings = {
+		'url': '<?php echo SITECOOKIEPATH; ?>',
+		'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
+		'time':'<?php echo time() ?>'
+	},
+	ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
+	pagenow = '<?php echo $current_screen->id; ?>',
+	typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
+	adminpage = '<?php echo $admin_body_class; ?>',
+	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+	isRtl = <?php echo (int) is_rtl(); ?>;
 //]]>
 </script>
 <?php

-if ( in_array( $pagenow, array('post.php', 'post-new.php', 'page.php', 'page-new.php') ) ) {
+if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
 	add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
 	wp_enqueue_script('quicktags');
 }
@@ -59,9 +64,8 @@ do_action('admin_print_scripts');
 do_action("admin_head-$hook_suffix");
 do_action('admin_head');

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

 if ( $is_iphone ) { ?>
 <style type="text/css">.row-actions{visibility:visible;}</style>
@@ -90,6 +94,7 @@ if ( '' == $blog_name ) {
 	if ( $blog_name != $blog_name_excerpt )
 		$blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
 	$blog_name = $blog_name_excerpt;
+	unset($blog_name_excerpt);
 }
 $title_class = '';
 if ( function_exists('mb_strlen') ) {
@@ -101,28 +106,52 @@ if ( function_exists('mb_strlen') ) {
 }
 ?>

-<img id="header-logo" src="../wp-includes/images/blank.gif" alt="" width="32" height="32" /> <h1 id="site-heading" <?php echo $title_class ?>><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit Site') ?>"><span id="site-title"><?php echo $blog_name ?></span> <em id="site-visit-button"><?php _e('Visit Site') ?></em></a></h1>
+<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="32" height="32" />
+<h1 id="site-heading" <?php echo $title_class ?>>
+	<a href="<?php echo trailingslashit( get_bloginfo( 'url' ) ); ?>" title="<?php esc_attr_e('Visit Site') ?>">
+		<span id="site-title"><?php echo $blog_name ?></span>
+	</a>
+<?php if ( current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
+	<a id="privacy-on-link" href="options-privacy.php" title="<?php echo esc_attr( apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') ) ); ?>"><?php echo apply_filters('privacy_on_link_text', __('Search Engines Blocked') ); ?></a>
+<?php endif; ?>
+</h1>
+
+<?php do_action('in_admin_header'); ?>

 <div id="wphead-info">
 <div id="user_info">
-<p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?>
-<?php if ( ! $is_opera ) { ?><span class="turbo-nag hidden"> | <a href="tools.php"><?php _e('Turbo') ?></a></span><?php } ?> |
-<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
+<p><?php
+$links = array();
+$links[5] = sprintf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity);
+$links[15] = '| <a href="' . wp_logout_url() . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a>';
+
+$links = apply_filters('admin_user_info_links', $links, $current_user);
+ksort($links);
+
+echo implode(' ', $links);
+?></p>
 </div>

-<?php favorite_actions($hook_suffix); ?>
+<?php favorite_actions($current_screen); ?>
 </div>
 </div>

 <div id="wpbody">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+<?php
+unset($title_class, $blog_name);
+
+require(ABSPATH . 'wp-admin/menu-header.php');
+
+$current_screen->parent_file = $parent_file;
+$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
+$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);
+?>

 <div id="wpbody-content">
 <?php
-screen_meta($hook_suffix);
+screen_meta($current_screen);

 do_action('admin_notices');

-if ( $parent_file == 'options-general.php' ) {
+if ( $parent_file == 'options-general.php' )
 	require(ABSPATH . 'wp-admin/options-head.php');
-}
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -14,10 +14,10 @@
 if ( !defined('WP_ADMIN') )
 	define('WP_ADMIN', TRUE);

-if ( defined('ABSPATH') )
-	require_once(ABSPATH . 'wp-load.php');
-else
-	require_once('../wp-load.php');
+if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
+	define('WP_LOAD_IMPORTERS', true);
+
+require_once(dirname(dirname(__FILE__)) . '/wp-load.php');

 if ( get_option('db_upgraded') ) {
 	$wp_rewrite->flush_rules();
@@ -30,8 +30,25 @@ if ( get_option('db_upgraded') ) {
 	 */
 	do_action('after_db_upgrade');
 } elseif ( get_option('db_version') != $wp_db_version ) {
-	wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
-	exit;
+	if ( !is_multisite() ) {
+		wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
+		exit;
+	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
+		/**
+		 * On really small MU installs run the upgrader every time,
+		 * else run it less often to reduce load.
+		 *
+		 * @since 2.8.4b
+		 */
+		$c = get_blog_count();
+		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
+			require_once( ABSPATH . WPINC . '/http.php' );
+			$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
+			do_action( 'after_mu_upgrade', $response );
+			unset($response);
+		}
+		unset($c);
+	}
 }

 require_once(ABSPATH . 'wp-admin/includes/admin.php');
@@ -48,32 +65,44 @@ if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )

 set_screen_options();

-$posts_per_page = get_option('posts_per_page');
 $date_format = get_option('date_format');
 $time_format = get_option('time_format');

 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'text', 'trackback', 'pingback'));

-wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));
-wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF'));
-
 wp_enqueue_script( 'common' );
 wp_enqueue_script( 'jquery-color' );

 $editing = false;

-if (isset($_GET['page'])) {
+if ( isset($_GET['page']) ) {
 	$plugin_page = stripslashes($_GET['page']);
 	$plugin_page = plugin_basename($plugin_page);
 }

+if ( isset($_GET['post_type']) )
+	$typenow = sanitize_key($_GET['post_type']);
+else
+	$typenow = '';
+
+if ( isset($_GET['taxonomy']) )
+	$taxnow = sanitize_key($_GET['taxonomy']);
+else
+	$taxnow = '';
+
 require(ABSPATH . 'wp-admin/menu.php');

+if ( current_user_can( 'manage_options' ) )
+	@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', '256M' ) );
+
 do_action('admin_init');

-// Handle plugin admin pages.
-if (isset($plugin_page)) {
-	if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) {
+if ( isset($plugin_page) ) {
+	if ( !empty($typenow) )
+		$the_parent = $pagenow . '?post_type=' . $typenow;
+	else
+		$the_parent = $pagenow;
+	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 		// backwards compatibility for plugins using add_management_page
 		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
@@ -86,7 +115,21 @@ if (isset($plugin_page)) {
 			exit;
 		}
 	}
+	unset($the_parent);
+}

+$hook_suffix = '';
+if ( isset($page_hook) )
+	$hook_suffix = $page_hook;
+else if ( isset($plugin_page) )
+	$hook_suffix = $plugin_page;
+else if ( isset($pagenow) )
+	$hook_suffix = $pagenow;
+
+set_current_screen();
+
+// Handle plugin admin pages.
+if ( isset($plugin_page) ) {
 	if ( $page_hook ) {
 		do_action('load-' . $page_hook);
 		if (! isset($_GET['noheader']))
@@ -94,19 +137,22 @@ if (isset($plugin_page)) {

 		do_action($page_hook);
 	} else {
-		if ( validate_file($plugin_page) ) {
+		if ( validate_file($plugin_page) )
 			wp_die(__('Invalid plugin page'));
-		}

-		if (! ( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) )
+
+		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
 			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));

 		do_action('load-' . $plugin_page);

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

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

 	include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -119,17 +165,13 @@ if (isset($plugin_page)) {
 	if ( ! current_user_can('import') )
 		wp_die(__('You are not allowed to import.'));

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

 	// Allow plugins to define importers as well
-	if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]))
-	{
+	if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
 		if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
-		{
-			wp_die(__('Cannot load importer.'));
-		}
+			wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 		include(ABSPATH . "wp-admin/import/$importer.php");
 	}

@@ -144,6 +186,9 @@ if (isset($plugin_page)) {

 	define('WP_IMPORTING', true);

+	if ( is_multisite() )
+		kses_init_filters();  // Always filter imported data with kses.
+
 	call_user_func($wp_importers[$importer][2]);

 	include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -155,6 +200,16 @@ if (isset($plugin_page)) {
 	exit();
 } else {
 	do_action("load-$pagenow");
+	// Backwards compatibility with old load-page-new.php, load-page.php,   
+	// and load-categories.php actions.  
+	if ( $typenow == 'page' ) {  
+		if ( $pagenow == 'post-new.php' )  
+			do_action( 'load-page-new.php' );  
+		elseif ( $pagenow == 'post.php' )  
+			do_action( 'load-page.php' );  
+	}  elseif ( $taxnow == 'category' && $pagenow == 'edit-tags.php' ) {
+		do_action( 'load-categories.php' );
+	}
 }

 if ( !empty($_REQUEST['action']) )
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -21,7 +21,7 @@ elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
 if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
 	$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
 unset($current_user);
-require_once('admin.php');
+require_once('./admin.php');

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

@@ -43,16 +43,18 @@ if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id
 check_admin_referer('media-form');

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

 if ( $_REQUEST['short'] ) {
 	// short form response - attachment ID only
 	echo $id;
-}
-else {
+} else {
 	// long form response - big chunk o html
 	$type = $_REQUEST['type'];
 	echo apply_filters("async_upload_{$type}", $id);
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -1,311 +0,0 @@
-<?php
-/**
- * Categories Management Panel
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** Load WordPress Bootstrap */
-require_once('admin.php');
-
-$title = __('Categories');
-
-wp_reset_vars( array('action', 'cat') );
-
-if ( isset( $_GET['action'] ) && isset($_GET['delete']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
-	$action = 'bulk-delete';
-
-switch($action) {
-
-case 'addcat':
-
-	check_admin_referer('add-category');
-
-	if ( !current_user_can('manage_categories') )
-		wp_die(__('Cheatin&#8217; uh?'));
-
-	if ( wp_insert_category($_POST ) )
-		wp_safe_redirect( add_query_arg( 'message', 1, wp_get_referer() ) . '#addcat' );
-	else
-		wp_safe_redirect( add_query_arg( 'message', 4, wp_get_referer() ) . '#addcat' );
-
-	exit;
-break;
-
-case 'delete':
-	if ( !isset( $_GET['cat_ID'] ) ) {
-		wp_redirect('categories.php');
-		exit;
-	}
-
-	$cat_ID = (int) $_GET['cat_ID'];
-	check_admin_referer('delete-category_' .  $cat_ID);
-
-	if ( !current_user_can('manage_categories') )
-		wp_die(__('Cheatin&#8217; uh?'));
-
-	// Don't delete the default cats.
-	if ( $cat_ID == get_option('default_category') )
-		wp_die( sprintf( __("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), get_cat_name($cat_ID) ) );
-
-	wp_delete_category($cat_ID);
-
-	wp_safe_redirect( add_query_arg( 'message', 2, wp_get_referer() ) );
-	exit;
-
-break;
-
-case 'bulk-delete':
-	check_admin_referer('bulk-categories');
-
-	if ( !current_user_can('manage_categories') )
-		wp_die( __('You are not allowed to delete categories.') );
-
-	$cats = (array) $_GET['delete'];
-	$default_cat = get_option('default_category');
-	foreach ( $cats as $cat_ID ) {
-		$cat_ID = (int) $cat_ID;
-
-		// Don't delete the default cat.
-		if ( $cat_ID == $default_cat )
-			wp_die( sprintf( __("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), get_cat_name($cat_ID) ) );
-
-		wp_delete_category($cat_ID);
-	}
-
-	wp_safe_redirect( wp_get_referer() );
-	exit;
-
-break;
-case 'edit':
-
-	$title = __('Edit Category');
-
-	require_once ('admin-header.php');
-	$cat_ID = (int) $_GET['cat_ID'];
-	$category = get_category_to_edit($cat_ID);
-	include('edit-category-form.php');
-
-break;
-
-case 'editedcat':
-	$cat_ID = (int) $_POST['cat_ID'];
-	check_admin_referer('update-category_' . $cat_ID);
-
-	if ( !current_user_can('manage_categories') )
-		wp_die(__('Cheatin&#8217; uh?'));
-
-	$location = 'categories.php';
-	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos($referer, 'categories.php') )
-			$location = $referer;
-	}
-
-	if ( wp_update_category($_POST) )
-		$location = add_query_arg('message', 3, $location);
-	else
-		$location = add_query_arg('message', 5, $location);
-
-	wp_redirect($location);
-
-	exit;
-break;
-
-default:
-
-if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
-	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
-	 exit;
-}
-
-wp_enqueue_script('admin-categories');
-if ( current_user_can('manage_categories') )
-	wp_enqueue_script('inline-edit-tax');
-
-require_once ('admin-header.php');
-
-$messages[1] = __('Category added.');
-$messages[2] = __('Category deleted.');
-$messages[3] = __('Category updated.');
-$messages[4] = __('Category not added.');
-$messages[5] = __('Category not updated.');
-?>
-
-<div class="wrap nosubsub">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title );
-if ( isset($_GET['s']) && $_GET['s'] )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
-</h2>
-
-<?php
-if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
-endif; ?>
-
-<form class="search-form topmargin" action="" method="get">
-<p class="search-box">
-	<label class="screen-reader-text" for="category-search-input"><?php _e('Search Categories'); ?>:</label>
-	<input type="text" id="category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-	<input type="submit" value="<?php esc_attr_e( 'Search Categories' ); ?>" class="button" />
-</p>
-</form>
-<br class="clear" />
-
-<div id="col-container">
-
-<div id="col-right">
-<div class="col-wrap">
-<form id="posts-filter" action="" method="get">
-<div class="tablenav">
-
-<?php
-$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
-if ( empty($pagenum) )
-	$pagenum = 1;
-
-$cats_per_page = (int) get_user_option( 'categories_per_page', 0, false );
-if ( empty( $cats_per_page ) || $cats_per_page < 1 )
-	$cats_per_page = 20;
-$cats_per_page = apply_filters( 'edit_categories_per_page', $cats_per_page );
-
-if ( !empty($_GET['s']) )
-	$num_cats = count(get_categories(array('hide_empty' => 0, 'search' => $_GET['s'])));
-else
-	$num_cats = wp_count_terms('category');
-
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'pagenum', '%#%' ),
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => ceil($num_cats / $cats_per_page),
-	'current' => $pagenum
-));
-
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-<?php wp_nonce_field('bulk-categories'); ?>
-</div>
-
-<br class="clear" />
-</div>
-
-<div class="clear"></div>
-
-<table class="widefat fixed" cellspacing="0">
-	<thead>
-	<tr>
-<?php print_column_headers('categories'); ?>
-	</tr>
-	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers('categories', false); ?>
-	</tr>
-	</tfoot>
-
-	<tbody id="the-list" class="list:cat">
-<?php
-cat_rows(0, 0, 0, $pagenum, $cats_per_page);
-?>
-	</tbody>
-</table>
-
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php wp_nonce_field('bulk-categories'); ?>
-</div>
-
-<br class="clear" />
-</div>
-
-</form>
-
-<div class="form-wrap">
-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
-<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
-</div>
-
-</div>
-</div><!-- /col-right -->
-
-<div id="col-left">
-<div class="col-wrap">
-
-<?php if ( current_user_can('manage_categories') ) { ?>
-<?php $category = (object) array(); $category->parent = 0; do_action('add_category_form_pre', $category); ?>
-
-<div class="form-wrap">
-<h3><?php _e('Add Category'); ?></h3>
-<div id="ajax-response"></div>
-<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">
-<input type="hidden" name="action" value="addcat" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-category'); ?>
-
-<div class="form-field form-required">
-	<label for="cat_name"><?php _e('Category Name') ?></label>
-	<input name="cat_name" id="cat_name" type="text" value="" size="40" aria-required="true" />
-    <p><?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></p>
-</div>
-
-<div class="form-field">
-	<label for="category_nicename"><?php _e('Category Slug') ?></label>
-	<input name="category_nicename" id="category_nicename" type="text" value="" size="40" />
-    <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
-</div>
-
-<div class="form-field">
-	<label for="category_parent"><?php _e('Category Parent') ?></label>
-	<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
-    <p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
-</div>
-
-<div class="form-field">
-	<label for="category_description"><?php _e('Description') ?></label>
-	<textarea name="category_description" id="category_description" rows="5" cols="40"></textarea>
-    <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
-</div>
-
-<p class="submit"><input type="submit" class="button" name="submit" value="<?php esc_attr_e('Add Category'); ?>" /></p>
-<?php do_action('edit_category_form', $category); ?>
-</form></div>
-
-<?php } ?>
-
-</div>
-</div><!-- /col-left -->
-
-</div><!-- /col-container -->
-</div><!-- /wrap -->
-
-<?php
-inline_edit_term_row('categories');
-
-break;
-}
-
-include('admin-footer.php');
-
-?>
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -7,7 +7,7 @@
 */

 /** Load WordPress Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');

 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
@@ -36,7 +36,7 @@ if ( isset( $_GET['dt'] ) ) {
 */
 function comment_footer_die( $msg ) {
 	echo "<div class='wrap'><p>$msg</p></div>";
-	include('admin-footer.php');
+	include('./admin-footer.php');
 	die;
 }

@@ -45,8 +45,15 @@ switch( $action ) {
 case 'editcomment' :
 	$title = __('Edit Comment');

+	add_contextual_help( $current_screen, '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
+	'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>' .
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="http://codex.wordpress.org/Administration_Panels#Comments" target="_blank">Comments Documentation</a>' ) . '</p>' .
+	'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank" >Support Forums</a>' ) . '</p>'
+	);
+
 	wp_enqueue_script('comment');
-	require_once('admin-header.php');
+	require_once('./admin-header.php');

 	$comment_id = absint( $_GET['c'] );

@@ -61,7 +68,7 @@ case 'editcomment' :

 	$comment = get_comment_to_edit( $comment_id );

-	include('edit-form-comment.php');
+	include('./edit-form-comment.php');

 	break;

@@ -70,22 +77,38 @@ case 'approve' :
 case 'trash'   :
 case 'spam'    :

-	require_once('admin-header.php');
-
 	$comment_id = absint( $_GET['c'] );
+
+	if ( !$comment = get_comment_to_edit( $comment_id ) ) {
+		wp_redirect( admin_url('edit-comments.php?error=1') );
+		die();
+	}
+
+	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
+		wp_redirect( admin_url('edit-comments.php?error=2') );
+		die();
+	}
+
+	// No need to re-approve/re-trash/re-spam a comment.
+	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
+		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+		die();
+ 	}
+
+	require_once('./admin-header.php');
+
 	$formaction    = $action . 'comment';
 	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
 	$nonce_action .= $comment_id;

-	if ( !$comment = get_comment_to_edit( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
-
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		comment_footer_die( 'approve' != $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
 ?>
 <div class='wrap'>

 <div class="narrow">
+
+<?php screen_icon(); ?>
+<h2><?php esc_html_e( 'Moderate Comment' ); ?></h2>
+
 <?php
 switch ( $action ) {
 	case 'spam' :
@@ -105,8 +128,24 @@ switch ( $action ) {
 		$button      = __('Approve Comment');
 		break;
 }
-?>

+if ( $comment->comment_approved != '0' ) { // if not unapproved
+	$message = '';
+	switch ( $comment->comment_approved ) {
+		case '1' :
+			$message = __('This comment is currently approved.');
+			break;
+		case 'spam' :
+			$message  = __('This comment is currently marked as spam.');
+			break;
+		case 'trash' :
+			$message  = __('This comment is currently in the Trash.');
+			break;
+	}
+	if ( $message )
+		echo '<div class="updated"><p>' . $message . '</p></div>';
+}
+?>
 <p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>

 <table class="form-table comment-ays">
@@ -127,12 +166,12 @@ switch ( $action ) {
 </tr>
 <?php } ?>
 <tr>
-<th scope="row" valign="top"><?php /* translators: field name in comment form */ echo _x('Comment', 'noun'); ?></th>
+<th scope="row" valign="top"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
 <td><?php echo $comment->comment_content; ?></td>
 </tr>
 </table>

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

 <form action='comment.php' method='get'>

@@ -155,13 +194,19 @@ switch ( $action ) {
 <?php
 	break;

-case 'deletecomment' :
-case 'trashcomment' :
-case 'untrashcomment' :
-case 'spamcomment' :
-case 'unspamcomment' :
+case 'deletecomment'    :
+case 'trashcomment'     :
+case 'untrashcomment'   :
+case 'spamcomment'      :
+case 'unspamcomment'    :
+case 'approvecomment'   :
+case 'unapprovecomment' :
 	$comment_id = absint( $_REQUEST['c'] );
-	check_admin_referer( 'delete-comment_' . $comment_id );
+
+	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
+		check_admin_referer( 'approve-comment_' . $comment_id );
+	else
+		check_admin_referer( 'delete-comment_' . $comment_id );

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

@@ -170,14 +215,16 @@ case 'unspamcomment' :
 	if ( !current_user_can('edit_post', $comment->comment_post_ID ) )
 		comment_footer_die( __('You are not allowed to edit comments on this post.') );

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

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

 	switch ( $action ) {
 		case 'deletecomment' :
@@ -200,48 +247,20 @@ case 'unspamcomment' :
 			wp_unspam_comment($comment_id);
 			$redir = add_query_arg( array('unspammed' => '1'), $redir );
 			break;
+		case 'approvecomment' :
+			wp_set_comment_status( $comment_id, 'approve' );
+			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+			break;
+		case 'unapprovecomment' :
+			wp_set_comment_status( $comment_id, 'hold' );
+			$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+			break;
 	}

 	wp_redirect( $redir );
-
 	die;
 	break;

-case 'approvecomment'   :
-case 'unapprovecomment' :
-	$comment_id = absint( $_GET['c'] );
-	check_admin_referer( 'approve-comment_' . $comment_id );
-
-	$noredir = isset( $_GET['noredir'] );
-
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
-
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
-		if ( 'approvecomment' == $action )
-			comment_footer_die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
-		else
-			comment_footer_die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
-	}
-
-	if ( '' != wp_get_referer() && false == $noredir )
-		$redir = remove_query_arg( array('approved', 'unapproved'), wp_get_referer() );
-	else
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-
-	if ( 'approvecomment' == $action ) {
-		wp_set_comment_status( $comment_id, 'approve' );
-		$redir = add_query_arg( array( 'approved' => 1 ), $redir );
-	} else {
-		wp_set_comment_status( $comment_id, 'hold' );
-		$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
-	}
-
-	wp_redirect( $redir );
-
-	exit();
-	break;
-
 case 'editedcomment' :

 	$comment_id = absint( $_POST['comment_ID'] );
@@ -264,6 +283,6 @@ default:

 } // end switch

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

 ?>
--- a/wp-admin/css/colors-classic-rtl.css
+++ b/wp-admin/css/colors-classic-rtl.css
@@ -1,80 +1 @@
-.bar {
-	border-right-color: transparent;
-	border-left-color: #99d;
-}
-
-.plugins .togl {
-	border-right-color: transparent;
-	border-left-color: #ccc;
-}
-
-.post-com-count {
-	background-image: url(../images/bubble_bg-rtl.gif);
-}
-.tablenav .tablenav-pages a {
-	background: #eee url('../images/menu-bits-rtl-vs.gif') repeat-x scroll right -379px;
-}
-#upload-menu li.current {
-	border-right-color: transparent;
-	border-left-color: #448abd;
-}
-
-#adminmenu .wp-submenu .current a.current {
-	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll  right -289px;
-}
-
-#adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
-}
-
-.folded #adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
-}
-
-#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
-#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -207px;
-}
-
-#adminmenu .wp-has-current-submenu ul li a.current {
-	background: url(../images/menu-dark-rtl.gif) top right no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu .menu-top .current {
-	background: url(../images/menu-bits-rtl-vs.gif) top right repeat-x;
-}
-
-#adminmenu li.wp-has-current-submenu ul li a {
-	background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat right -207px;
-}
-
-#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
-#adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -109px;
-}
-
-#adminmenu a.wp-has-submenu {
-	background: #f1f1f1 url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -379px;
-}
-
-#adminmenu .wp-submenu a {
-	background: #FFFFFF url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -310px;
-}
-
-#adminmenu li.current a,
-#adminmenu .wp-submenu a:hover {
-	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll  right -289px;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
-	background: #b5b5b5 url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right top;
-}
-
-.meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;
-}
+.bar{border-right-color:transparent;border-left-color:#99d;}.plugins .togl{border-right-color:transparent;border-left-color:#ccc;}.post-com-count{background-image:url(../images/bubble_bg-rtl.gif);}.tablenav .tablenav-pages a{background:#eee url('../images/menu-bits-rtl-vs.gif') repeat-x scroll right -379px;}#upload-menu li.current{border-right-color:transparent;border-left-color:#448abd;}#adminmenu .wp-submenu .current a.current{background:transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -289px;}#adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;}.folded #adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;}#adminmenu li.wp-has-current-submenu .wp-menu-toggle,#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle{background:transparent url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -207px;}#adminmenu .wp-has-current-submenu ul li a.current{background:url(../images/menu-dark-rtl.gif) top right no-repeat!important;}#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,#adminmenu .menu-top .current{background:url(../images/menu-bits-rtl-vs.gif) top right repeat-x;}#adminmenu li.wp-has-current-submenu ul li a{background:url(../images/menu-dark-rtl.gif) bottom right no-repeat!important;}#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle{background:transparent url(../images/menu-bits-rtl-vs.gif) no-repeat right -207px;}#adminmenu .wp-has-submenu:hover .wp-menu-toggle,#adminmenu .wp-menu-open .wp-menu-toggle{background:transparent url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -109px;}#adminmenu a.wp-has-submenu{background:#f1f1f1 url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -379px;}#adminmenu .wp-submenu a{background:#fff url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -310px;}#adminmenu li.wp-has-current-submenu a.wp-has-submenu{background:#b5b5b5 url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right top;}.meta-box-sortables .postbox:hover .handlediv{background:transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;}#favorite-toggle{background:transparent url(../images/fav-arrow-vs-rtl.gif?ver=20100531) no-repeat right -4px;}
--- a/wp-admin/css/colors-classic-rtl.dev.css
+++ b/wp-admin/css/colors-classic-rtl.dev.css
@@ -0,0 +1,79 @@
+.bar {
+	border-right-color: transparent;
+	border-left-color: #99d;
+}
+
+.plugins .togl {
+	border-right-color: transparent;
+	border-left-color: #ccc;
+}
+
+.post-com-count {
+	background-image: url(../images/bubble_bg-rtl.gif);
+}
+.tablenav .tablenav-pages a {
+	background: #eee url('../images/menu-bits-rtl-vs.gif') repeat-x scroll right -379px;
+}
+#upload-menu li.current {
+	border-right-color: transparent;
+	border-left-color: #448abd;
+}
+
+#adminmenu .wp-submenu .current a.current {
+	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll  right -289px;
+}
+
+#adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
+}
+
+.folded #adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
+}
+
+#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
+#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -207px;
+}
+
+#adminmenu .wp-has-current-submenu ul li a.current {
+	background: url(../images/menu-dark-rtl.gif) top right no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
+#adminmenu .menu-top .current {
+	background: url(../images/menu-bits-rtl-vs.gif) top right repeat-x;
+}
+
+#adminmenu li.wp-has-current-submenu ul li a {
+	background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat right -207px;
+}
+
+#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+#adminmenu .wp-menu-open .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -109px;
+}
+
+#adminmenu a.wp-has-submenu {
+	background: #f1f1f1 url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -379px;
+}
+
+#adminmenu .wp-submenu a {
+	background: #fff url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -310px;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
+	background: #b5b5b5 url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right top;
+}
+
+.meta-box-sortables .postbox:hover .handlediv {
+	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;
+}
+
+#favorite-toggle {
+	background: transparent url(../images/fav-arrow-vs-rtl.gif?ver=20100531) no-repeat right -4px;
+}
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
--- a/wp-admin/css/colors-classic.dev.css
+++ b/wp-admin/css/colors-classic.dev.css
@@ -4,7 +4,7 @@ html {

 * html input,
 * html .widget {
-    border-color: #8cbdd5;
+	border-color: #8cbdd5;
 }

 textarea,
@@ -110,11 +110,13 @@ div.dashboard-widget-submit {
 }

 div.tabs-panel,
-ul#category-tabs li.tabs {
+ul.category-tabs li.tabs,
+ul.add-menu-item-tabs li.tabs {
 	border-color: #dfdfdf;
 }

-ul#category-tabs li.tabs {
+ul.category-tabs li.tabs,
+ul.add-menu-item-tabs li.tabs {
 	background-color: #f1f1f1;
 }

@@ -380,11 +382,8 @@ div.dashboard-widget-submit input:hover,
 	border-color: #dfdfdf;
 }

-#dashboard_right_now .table {
-	background:#faf9f7 !important;
-}
-
-#side-sortables #category-tabs .tabs a {
+#side-sortables .category-tabs .tabs a,
+#side-sortables .add-menu-item-tabs .tabs a {
 	color: #333;
 }

@@ -442,7 +441,7 @@ div.dashboard-widget-submit input:hover,
 }

 .update-message {
-	color: #000000;
+	color: #000;
 }

 a.page-numbers {
@@ -497,7 +496,6 @@ a,
 /* Because we don't want visited on these links */
 body.press-this .tabs a,
 body.press-this .tabs a:hover {
-	background-color: #fff;
 	border-color: #c6d9e9;
 	border-bottom-color: #fff;
 	color: #d54e21;
@@ -697,9 +695,9 @@ table.widefat span.spam a,
 	background: url(../images/xit.gif) no-repeat -10px 0;
 }

-#update-nag {
-	background-color: #fffeeb;
-	border-color: #ccc;
+#update-nag, .update-nag {
+	background-color: #FFFBCC;
+	border-color: #E6DB55;
 	color: #555;
 }

@@ -949,7 +947,7 @@ table.widefat .spam a:hover,

 #quicktags,
 .wp_themeSkin tr.mceFirst td.mceToolbar {
-	background: #e3eef7 url("../images/ed-bg-vs.gif") repeat-x scroll left top;
+	background: #d5e6f2 url("../images/ed-bg-vs.gif") repeat-x scroll left top;
 }
 .wp_themeSkin tr.mceFirst td.mceToolbar {
 	border-color: #dfdfdf;
@@ -1145,105 +1143,114 @@ table.widefat .spam a:hover,
 }

 /* menu icons */
-#adminmenu #menu-dashboard div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -61px -33px;
+#adminmenu .menu-icon-dashboard div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -61px -33px;
 }

-#adminmenu #menu-dashboard:hover div.wp-menu-image,
-#adminmenu  #menu-dashboard.wp-has-current-submenu div.wp-menu-image,
-#adminmenu  #menu-dashboard.current div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -61px -1px;
+#adminmenu .menu-icon-dashboard:hover div.wp-menu-image,
+#adminmenu  .menu-icon-dashboard.wp-has-current-submenu div.wp-menu-image,
+#adminmenu  .menu-icon-dashboard.current div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -61px -1px;
 }

-#adminmenu #menu-posts div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -272px -33px;
+#adminmenu .menu-icon-post div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -272px -33px;
 }

-#adminmenu #menu-posts:hover div.wp-menu-image,
-#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -272px -1px;
+#adminmenu .menu-icon-post:hover div.wp-menu-image,
+#adminmenu .menu-icon-post.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -272px -1px;
 }

-#adminmenu #menu-media div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -121px -33px;
+#adminmenu .menu-icon-media div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -121px -33px;
 }

-#adminmenu #menu-media:hover div.wp-menu-image,
-#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -121px -1px;
+#adminmenu .menu-icon-media:hover div.wp-menu-image,
+#adminmenu .menu-icon-media.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -121px -1px;
 }

-#adminmenu #menu-links div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -91px -33px;
+#adminmenu .menu-icon-links div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -91px -33px;
 }

-#adminmenu #menu-links:hover div.wp-menu-image,
-#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -91px -1px;
+#adminmenu .menu-icon-links:hover div.wp-menu-image,
+#adminmenu .menu-icon-links.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -91px -1px;
 }

-#adminmenu #menu-pages div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -151px -33px;
+#adminmenu .menu-icon-page div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -151px -33px;
 }

-#adminmenu #menu-pages:hover div.wp-menu-image,
-#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -151px -1px;
+#adminmenu .menu-icon-page:hover div.wp-menu-image,
+#adminmenu .menu-icon-page.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -151px -1px;
 }

-#adminmenu #menu-comments div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -31px -33px;
+#adminmenu .menu-icon-comments div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -31px -33px;
 }

-#adminmenu #menu-comments:hover div.wp-menu-image,
-#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image,
-#adminmenu #menu-comments.current div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -31px -1px;
+#adminmenu .menu-icon-comments:hover div.wp-menu-image,
+#adminmenu .menu-icon-comments.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-comments.current div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -31px -1px;
 }

-#adminmenu #menu-appearance div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -1px -33px;
+#adminmenu .menu-icon-appearance div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -1px -33px;
 }

-#adminmenu #menu-appearance:hover div.wp-menu-image,
-#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -1px -1px;
+#adminmenu .menu-icon-appearance:hover div.wp-menu-image,
+#adminmenu .menu-icon-appearance.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -1px -1px;
 }

-#adminmenu #menu-plugins div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -181px -33px;
+#adminmenu .menu-icon-plugins div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -181px -33px;
 }

-#adminmenu #menu-plugins:hover div.wp-menu-image,
-#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -181px -1px;
+#adminmenu .menu-icon-plugins:hover div.wp-menu-image,
+#adminmenu .menu-icon-plugins.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -181px -1px;
 }

-#adminmenu #menu-users div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -301px -33px;
+#adminmenu .menu-icon-users div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -301px -33px;
 }

-#adminmenu #menu-users:hover div.wp-menu-image,
-#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -301px -1px;
+#adminmenu .menu-icon-users:hover div.wp-menu-image,
+#adminmenu .menu-icon-users.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -301px -1px;
 }

-#adminmenu #menu-tools div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -211px -33px;
+#adminmenu .menu-icon-tools div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -211px -33px;
 }

-#adminmenu #menu-tools:hover div.wp-menu-image,
-#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -211px -1px;
+#adminmenu .menu-icon-tools:hover div.wp-menu-image,
+#adminmenu .menu-icon-tools.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -211px -1px;
 }

-#adminmenu #menu-settings div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -241px -33px;
+#adminmenu .menu-icon-settings div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -241px -33px;
 }

-#adminmenu #menu-settings:hover div.wp-menu-image,
-#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.png") no-repeat scroll -241px -1px;
+#adminmenu .menu-icon-settings:hover div.wp-menu-image,
+#adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -241px -1px;
+}
+
+#adminmenu .menu-icon-site div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -361px -33px;
+}
+
+#adminmenu .menu-icon-site:hover div.wp-menu-image,
+#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -361px -1px;
 }
 /* end menu */

@@ -1463,7 +1470,8 @@ fieldset.inline-edit-col-right .inline-edit-col {
 	background-color: #f5f5f5;
 }

-#post-body ul#category-tabs li.tabs a {
+#post-body ul.category-tabs li.tabs a,
+#post-body ul.add-menu-item-tabs li.tabs a {
 	color: #333;
 }

@@ -1527,53 +1535,57 @@ fieldset.inline-edit-col-right .inline-edit-col {

 #icon-edit,
 #icon-post {
-	background: transparent url(../images/icons32-vs.png) no-repeat -552px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -552px -5px;
 }

 #icon-index {
-	background: transparent url(../images/icons32-vs.png) no-repeat -137px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -137px -5px;
 }

 #icon-upload {
-	background: transparent url(../images/icons32-vs.png) no-repeat -251px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -251px -5px;
 }

 #icon-link-manager,
 #icon-link,
 #icon-link-category {
-	background: transparent url(../images/icons32-vs.png) no-repeat -190px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -190px -5px;
 }

 #icon-edit-pages,
 #icon-page {
-	background: transparent url(../images/icons32-vs.png) no-repeat -312px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -312px -5px;
 }

 #icon-edit-comments {
-	background: transparent url(../images/icons32-vs.png) no-repeat -72px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -72px -5px;
 }

 #icon-themes {
-	background: transparent url(../images/icons32-vs.png) no-repeat -11px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -11px -5px;
 }

 #icon-plugins {
-	background: transparent url(../images/icons32-vs.png) no-repeat -370px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -370px -5px;
 }

 #icon-users,
 #icon-profile,
 #icon-user-edit {
-	background: transparent url(../images/icons32-vs.png) no-repeat -600px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -600px -5px;
 }

 #icon-tools,
 #icon-admin {
-	background: transparent url(../images/icons32-vs.png) no-repeat -432px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -432px -5px;
 }

 #icon-options-general {
-	background: transparent url(../images/icons32-vs.png) no-repeat -492px -5px;
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -492px -5px;
+}
+
+#icon-ms-admin {
+	background: transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -659px -5px;
 }

 .view-switch #view-switch-list {
@@ -1593,7 +1605,7 @@ fieldset.inline-edit-col-right .inline-edit-col {
 }

 #header-logo {
-	background: transparent url(../images/wp-logo-vs.gif) no-repeat scroll center center;
+	background: transparent url(../images/wp-logo-vs.png) no-repeat scroll center center;
 }

 #wphead #site-visit-button {
@@ -1629,18 +1641,18 @@ fieldset.inline-edit-col-right .inline-edit-col {
 div.widgets-sortables,
 #widgets-left .inactive {
 	background-color: #f1f1f1;
-    border-color: #ddd;
+	border-color: #ddd;
 }

 #available-widgets .widget-holder {
-    background-color: #fff;
-    border-color: #ddd;
+	background-color: #fff;
+	border-color: #ddd;
 }

 #widgets-left .sidebar-name {
 	background-color: #aaa;
 	background-image: url(../images/ed-bg-vs.gif);
-	text-shadow: #FFFFFF 0 1px 0;
+	text-shadow: #fff 0 1px 0;
 	border-color: #dfdfdf;
 }

@@ -1706,3 +1718,12 @@ div.widgets-sortables,
 .comment-ays th {
 	background-color: #f1f1f1;
 }
+
+#nav-menu-header, .menu-item-handle {
+	background: url("../images/blue-grad.png") repeat-x scroll left top #d5e6f2;
+}
+
+#menu-management .nav-tab-active {
+	background: #eaf3fa;
+	border-bottom-color: #eaf3fa;
+}
--- a/wp-admin/css/colors-fresh-rtl.css
+++ b/wp-admin/css/colors-fresh-rtl.css
@@ -1,83 +1 @@
-.bar {
-	border-right-color: transparent;
-	border-left-color: #99d;
-}
-
-.plugins .togl {
-	border-right-color: transparent;
-	border-left-color: #ccc;
-}
-
-.post-com-count {
-	background-image: url(../images/bubble_bg-rtl.gif);
-}
-.tablenav .tablenav-pages a {
-	background: #eee url('../images/menu-bits-rtl.gif') repeat-x scroll right -379px;
-}
-#upload-menu li.current {
-	border-right-color: transparent;
-	border-left-color: #448abd;
-}
-
-#adminmenu .wp-submenu .current a.current {
-	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll  right -289px;
-}
-
-#adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
-}
-
-.folded #adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
-}
-
-#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
-#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -207px;
-}
-
-#adminmenu .wp-has-current-submenu ul li a.current {
-	background: url(../images/menu-dark-rtl.gif) top right no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu .menu-top .current {
-	background: url(../images/menu-bits-rtl.gif) top right repeat-x;
-}
-
-#adminmenu li.wp-has-current-submenu ul li a {
-	background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.gif) no-repeat right -207px;
-}
-
-#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
-#adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -109px;
-}
-
-#adminmenu a.wp-has-submenu {
-	background: #f1f1f1 url(../images/menu-bits-rtl.gif) repeat-x scroll right -379px;
-}
-
-#adminmenu .wp-submenu a {
-	background: #FFFFFF url(../images/menu-bits-rtl.gif) no-repeat scroll right -310px;
-}
-
-#adminmenu li.current a,
-#adminmenu .wp-submenu a:hover {
-	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll  right -289px;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
-	background: #b5b5b5 url(../images/menu-bits-rtl.gif) repeat-x scroll right top;
-}
-
-.meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -111px;
-}
-#favorite-toggle {
-	background: transparent url(../images/fav-arrow-rtl.gif) no-repeat right -4px;
-}
+.bar{border-right-color:transparent;border-left-color:#99d;}.plugins .togl{border-right-color:transparent;border-left-color:#ccc;}.post-com-count{background-image:url(../images/bubble_bg-rtl.gif);}.tablenav .tablenav-pages a{background:#eee url('../images/menu-bits-rtl.gif?ver=20100531') repeat-x scroll right -379px;}#upload-menu li.current{border-right-color:transparent;border-left-color:#448abd;}#adminmenu .wp-submenu .current a.current{background:transparent url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -289px;}#adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;}.folded #adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;}#adminmenu li.wp-has-current-submenu .wp-menu-toggle,#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle{background:transparent url(../images/menu-bits-rtl.gif?ver=20100531) repeat-x scroll right -207px;}#adminmenu .wp-has-current-submenu ul li a.current{background:url(../images/menu-dark-rtl.gif) top right no-repeat!important;}#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,#adminmenu .menu-top .current{background:url(../images/menu-bits-rtl.gif?ver=20100531) top right repeat-x;}#adminmenu li.wp-has-current-submenu ul li a{background:url(../images/menu-dark-rtl.gif) bottom right no-repeat!important;}#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle{background:transparent url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat right -207px;}#adminmenu .wp-has-submenu:hover .wp-menu-toggle,#adminmenu .wp-menu-open .wp-menu-toggle{background:transparent url(../images/menu-bits-rtl.gif?ver=20100531) repeat-x scroll right -109px;}#adminmenu a.wp-has-submenu{background:#f1f1f1 url(../images/menu-bits-rtl.gif?ver=20100531) repeat-x scroll right -379px;}#adminmenu .wp-submenu a{background:#fff url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -310px;}#adminmenu li.wp-has-current-submenu a.wp-has-submenu{background:#b5b5b5 url(../images/menu-bits-rtl.gif?ver=20100531) repeat-x scroll right top;}.meta-box-sortables .postbox:hover .handlediv{background:transparent url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -111px;}#favorite-toggle{background:transparent url(../images/fav-arrow-rtl.gif?ver=20100531) no-repeat right -4px;}
--- a/wp-admin/css/colors-fresh-rtl.dev.css
+++ b/wp-admin/css/colors-fresh-rtl.dev.css
@@ -0,0 +1,78 @@
+.bar {
+	border-right-color: transparent;
+	border-left-color: #99d;
+}
+
+.plugins .togl {
+	border-right-color: transparent;
+	border-left-color: #ccc;
+}
+
+.post-com-count {
+	background-image: url(../images/bubble_bg-rtl.gif);
+}
+.tablenav .tablenav-pages a {
+	background: #eee url('../images/menu-bits-rtl.gif?ver=20100531') repeat-x scroll right -379px;
+}
+#upload-menu li.current {
+	border-right-color: transparent;
+	border-left-color: #448abd;
+}
+
+#adminmenu .wp-submenu .current a.current {
+	background: transparent url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll  right -289px;
+}
+
+#adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
+}
+
+.folded #adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
+}
+
+#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
+#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif?ver=20100531) repeat-x scroll right -207px;
+}
+
+#adminmenu .wp-has-current-submenu ul li a.current {
+	background: url(../images/menu-dark-rtl.gif) top right no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
+#adminmenu .menu-top .current {
+	background: url(../images/menu-bits-rtl.gif?ver=20100531) top right repeat-x;
+}
+
+#adminmenu li.wp-has-current-submenu ul li a {
+	background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat right -207px;
+}
+
+#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+#adminmenu .wp-menu-open .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif?ver=20100531) repeat-x scroll right -109px;
+}
+
+#adminmenu a.wp-has-submenu {
+	background: #f1f1f1 url(../images/menu-bits-rtl.gif?ver=20100531) repeat-x scroll right -379px;
+}
+
+#adminmenu .wp-submenu a {
+	background: #fff url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -310px;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
+	background: #b5b5b5 url(../images/menu-bits-rtl.gif?ver=20100531) repeat-x scroll right top;
+}
+
+.meta-box-sortables .postbox:hover .handlediv {
+	background: transparent url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -111px;
+}
+#favorite-toggle {
+	background: transparent url(../images/fav-arrow-rtl.gif?ver=20100531) no-repeat right -4px;
+}
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
--- a/wp-admin/css/colors-fresh.dev.css
+++ b/wp-admin/css/colors-fresh.dev.css
@@ -4,7 +4,7 @@ html {

 * html input,
 * html .widget {
-    border-color: #dfdfdf;
+	border-color: #dfdfdf;
 }

 textarea,
@@ -110,11 +110,13 @@ div.dashboard-widget-submit {
 }

 div.tabs-panel,
-ul#category-tabs li.tabs {
+ul.category-tabs li.tabs,
+ul.add-menu-item-tabs li.tabs {
 	border-color: #dfdfdf;
 }

-ul#category-tabs li.tabs {
+ul.category-tabs li.tabs,
+ul.add-menu-item-tabs li.tabs {
 	background-color: #f1f1f1;
 }

@@ -123,7 +125,6 @@ textarea.disabled {
 	background-color: #ccc;
 }
 /* #upload-menu li a.upload-tab-link, */
-.login #backtoblog a:hover,
 #plugin-information .action-button a,
 #plugin-information .action-button a:hover,
 #plugin-information .action-button a:visited {
@@ -380,7 +381,8 @@ div.dashboard-widget-submit input:hover,
 	border-color: #dfdfdf;
 }

-#side-sortables #category-tabs .tabs a {
+#side-sortables .category-tabs .tabs a,
+#side-sortables .add-menu-item-tabs .tabs a {
 	color: #333;
 }

@@ -438,7 +440,7 @@ div.dashboard-widget-submit input:hover,
 }

 .update-message {
-	color: #000000;
+	color: #000;
 }

 a.page-numbers {
@@ -502,38 +504,27 @@ body.press-this .tabs a:hover {
 #adminmenu #awaiting-mod,
 #adminmenu .update-plugins,
 #sidemenu a .update-plugins,
-#rightnow .reallynow,
+#rightnow .reallynow {
+	background-color: #464646;
+	color: #fff;
+	-moz-box-shadow: #fff 0 -1px 0;
+	-khtml-box-shadow: #fff 0 -1px 0;
+	-webkit-box-shadow: #fff 0 -1px 0;
+	box-shadow: #fff 0 -1px 0;
+}
 #plugin-information .action-button {
 	background-color: #d54e21;
 	color: #fff;
 }

-#adminmenu li a:hover #awaiting-mod,
-#adminmenu li a:hover .update-plugins,
-#sidemenu li a:hover .update-plugins {
-	background-color: #264761;
-	color: #fff;
-}
-
 #adminmenu li.current a #awaiting-mod,
-#adminmenu li.current a .update-plugins,
-#adminmenu li.wp-has-current-submenu a .update-plugins,
-#adminmenu li.wp-has-current-submenu a .update-plugins {
-	background-color: #ddd;
-	color: #000;
-	text-shadow: none;
-	-moz-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
-	-khtml-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
-	-webkit-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
-	box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
-}
-
-#adminmenu li.current a:hover #awaiting-mod,
-#adminmenu li.current a:hover .update-plugins,
-#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod,
-#adminmenu li.wp-has-current-submenu a:hover .update-plugins {
-	background-color: #264761;
+#adminmenu  li a.wp-has-current-submenu .update-plugins{
+	background-color: #464646;
 	color: #fff;
+	-moz-box-shadow: #fff 0 -1px 0;
+	-khtml-box-shadow: #fff 0 -1px 0;
+	-webkit-box-shadow: #fff 0 -1px 0;
+	box-shadow: #fff 0 -1px 0;
 }

 div#media-upload-header,
@@ -577,10 +568,12 @@ input.readonly, textarea.readonly {
 	color: #d54e21 !important;
 }

-#footer,
-#footer-upgrade {
-	background: #464646;
-	color: #999;
+#footer {
+	color: #777;
+	border-color: #d1d1d1;
+	background: #d9d9d9; /* fallback color */
+	background:-moz-linear-gradient(bottom,  #d7d7d7,  #e4e4e4);
+	background:-webkit-gradient(linear, left bottom, left top, from(#d7d7d7), to(#e4e4e4));
 }

 #media-items,
@@ -692,43 +685,42 @@ table.widefat span.spam a,
 	background: url(../images/xit.gif) no-repeat -10px 0;
 }

-#update-nag {
-	background-color: #fffeeb;
-	border-color: #ccc;
+#update-nag, .update-nag {
+	background-color: #FFFBCC;
+	border-color: #E6DB55;
 	color: #555;
 }

 .login #backtoblog a {
-	color: #ccc;
+	color: #464646;
 }

 #wphead {
-	background-color: #464646;
-}
-
-body.login {
-	border-top-color: #464646;
+	border-bottom:#c6c6c6 1px solid;
+	background: #d9d9d9; /* fallback color */
+	background:-moz-linear-gradient(bottom,  #d7d7d7,  #e4e4e4);
+	background:-webkit-gradient(linear, left bottom, left top, from(#d7d7d7), to(#e4e4e4));
 }

 #wphead h1 a {
-	color: #fff;
+	color: #464646;
 }

 #user_info {
-	color: #999;
+	color: #777;
 }

 #user_info a:link,
 #user_info a:visited,
 #footer a:link,
 #footer a:visited {
-	color: #ccc;
+	color: #222;
 	text-decoration: none;
 }

 #user_info a:hover,
 #footer a:hover {
-	color: #fff;
+	color: #000;
 	text-decoration: underline !important;
 }

@@ -1048,20 +1040,20 @@ table.widefat .spam a:hover,

 #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
 #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits.gif) no-repeat scroll left -207px;
+	background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -207px;
 }

 #adminmenu .wp-has-submenu:hover .wp-menu-toggle,
 #adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/menu-bits.gif) no-repeat scroll left -109px;
+	background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;
 }

 #adminmenu a.menu-top {
-	background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px;
+	background: #f1f1f1 url(../images/menu-bits.gif?ver=20100610) repeat-x scroll left -379px;
 }

 #adminmenu .wp-submenu a {
-	background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px;
+	background: #fff url(../images/menu-bits.gif?ver=20100610) no-repeat scroll 0 -310px;
 }

 #adminmenu .wp-has-current-submenu ul li a {
@@ -1072,17 +1064,25 @@ table.widefat .spam a:hover,
 	background: url(../images/menu-dark.gif) top left no-repeat !important;
 }

+.wp-has-current-submenu .wp-submenu {
+	border-top: none !important;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu {
+	border-bottom: #aaa 1px solid;
+}
+
 #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu .menu-top .current {
-	background: #6d6d6d url(../images/menu-bits.gif) top left repeat-x;
-	border-color: #6d6d6d;
-	color: #fff;
-	text-shadow: rgba(0,0,0,0.4) 0px -1px 0px;
+#adminmenu li.current a.menu-top {
+	background: #e0e0e0 url(../images/menu-bits.gif?ver=20100610) top left repeat-x;
+	border: #aaa 1px solid;
+	color: #000;
 }

 #adminmenu li.wp-has-current-submenu .wp-submenu,
 #adminmenu li.wp-has-current-submenu ul li a {
-	border-color: #aaa !important;
+	border-right-color: #aaa !important;
+	border-left-color: #aaa !important;
 }

 #adminmenu li.wp-has-current-submenu ul li a {
@@ -1093,12 +1093,8 @@ table.widefat .spam a:hover,
 	border-bottom-color: #aaa;
 }

-#adminmenu li.menu-top .current:hover {
-	border-color: #B5B5B5;
-}
-
 #adminmenu .wp-submenu .current a.current {
-	background: transparent url(../images/menu-bits.gif) no-repeat scroll  0 -289px;
+	background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll  0 -289px;
 }

 #adminmenu .wp-submenu a:hover {
@@ -1113,7 +1109,6 @@ table.widefat .spam a:hover,
 	background-color: #f5f5f5;
 	background-image: none;
 	border-color: #e3e3e3;
-	text-shadow: rgba(255,255,255,1) 0px 1px 0px;
 }

 #adminmenu .wp-submenu ul {
@@ -1140,124 +1135,133 @@ table.widefat .spam a:hover,
 }

 /* menu icons */
-#adminmenu #menu-dashboard div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -61px -33px;
+#adminmenu .menu-icon-dashboard div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -61px -33px;
 }

-#adminmenu #menu-dashboard:hover div.wp-menu-image,
-#adminmenu  #menu-dashboard.wp-has-current-submenu div.wp-menu-image,
-#adminmenu  #menu-dashboard.current div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -61px -1px;
+#adminmenu .menu-icon-dashboard:hover div.wp-menu-image,
+#adminmenu .menu-icon-dashboard.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-dashboard.current div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -61px -1px;
 }

-#adminmenu #menu-posts div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -272px -33px;
+#adminmenu .menu-icon-post div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -272px -33px;
 }

-#adminmenu #menu-posts:hover div.wp-menu-image,
-#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -272px -1px;
+#adminmenu .menu-icon-post:hover div.wp-menu-image,
+#adminmenu .menu-icon-post.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -272px -1px;
 }

-#adminmenu #menu-media div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -121px -33px;
+#adminmenu .menu-icon-media div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -121px -33px;
 }

-#adminmenu #menu-media:hover div.wp-menu-image,
-#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -121px -1px;
+#adminmenu .menu-icon-media:hover div.wp-menu-image,
+#adminmenu .menu-icon-media.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -121px -1px;
 }

-#adminmenu #menu-links div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -91px -33px;
+#adminmenu .menu-icon-links div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -91px -33px;
 }

-#adminmenu #menu-links:hover div.wp-menu-image,
-#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -91px -1px;
+#adminmenu .menu-icon-links:hover div.wp-menu-image,
+#adminmenu .menu-icon-links.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -91px -1px;
 }

-#adminmenu #menu-pages div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -151px -33px;
+#adminmenu .menu-icon-page div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -151px -33px;
 }

-#adminmenu #menu-pages:hover div.wp-menu-image,
-#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -151px -1px;
+#adminmenu .menu-icon-page:hover div.wp-menu-image,
+#adminmenu .menu-icon-page.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -151px -1px;
 }

-#adminmenu #menu-comments div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -31px -33px;
+#adminmenu .menu-icon-comments div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -31px -33px;
 }

-#adminmenu #menu-comments:hover div.wp-menu-image,
-#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image,
-#adminmenu #menu-comments.current div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -31px -1px;
+#adminmenu .menu-icon-comments:hover div.wp-menu-image,
+#adminmenu .menu-icon-comments.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-comments.current div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -31px -1px;
 }

-#adminmenu #menu-appearance div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -1px -33px;
+#adminmenu .menu-icon-appearance div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -1px -33px;
 }

-#adminmenu #menu-appearance:hover div.wp-menu-image,
-#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -1px -1px;
+#adminmenu .menu-icon-appearance:hover div.wp-menu-image,
+#adminmenu .menu-icon-appearance.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -1px -1px;
 }

-#adminmenu #menu-plugins div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -181px -33px;
+#adminmenu .menu-icon-plugins div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -181px -33px;
 }

-#adminmenu #menu-plugins:hover div.wp-menu-image,
-#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -181px -1px;
+#adminmenu .menu-icon-plugins:hover div.wp-menu-image,
+#adminmenu .menu-icon-plugins.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -181px -1px;
 }

-#adminmenu #menu-users div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -301px -33px;
+#adminmenu .menu-icon-users div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -301px -33px;
 }

-#adminmenu #menu-users:hover div.wp-menu-image,
-#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -301px -1px;
+#adminmenu .menu-icon-users:hover div.wp-menu-image,
+#adminmenu .menu-icon-users.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -301px -1px;
 }

-#adminmenu #menu-tools div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -211px -33px;
+#adminmenu .menu-icon-tools div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -211px -33px;
 }

-#adminmenu #menu-tools:hover div.wp-menu-image,
-#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -211px -1px;
+#adminmenu .menu-icon-tools:hover div.wp-menu-image,
+#adminmenu .menu-icon-tools.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -211px -1px;
 }

-#adminmenu #menu-settings div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -241px -33px;
+#adminmenu .menu-icon-settings div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -241px -33px;
 }

-#adminmenu #menu-settings:hover div.wp-menu-image,
-#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.png") no-repeat scroll -241px -1px;
+#adminmenu .menu-icon-settings:hover div.wp-menu-image,
+#adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -241px -1px;
+}
+
+#adminmenu .menu-icon-site div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -361px -33px;
+}
+
+#adminmenu .menu-icon-site:hover div.wp-menu-image,
+#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -361px -1px;
 }
 /* end menu */


 /* Diff */
 table.diff .diff-deletedline {
-	background-color: #ffdddd;
+	background-color: #fdd;
 }

 table.diff .diff-deletedline del {
-	background-color: #ff9999;
+	background-color: #f99;
 }

 table.diff .diff-addedline {
-	background-color: #ddffdd;
+	background-color: #dfd;
 }

 table.diff .diff-addedline ins {
-	background-color: #99ff99;
+	background-color: #9f9;
 }

 #att-info {
@@ -1357,7 +1361,7 @@ div.star.select:hover {
 }

 .inline-editor ul.cat-checklist {
-	background-color: #FFFFFF;
+	background-color: #fff;
 	border-color: #ddd;
 }

@@ -1384,7 +1388,7 @@ fieldset.inline-edit-col-right .inline-edit-col {
 }

 .meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px;
+	background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -111px;
 }

 #major-publishing-actions {
@@ -1397,7 +1401,7 @@ fieldset.inline-edit-col-right .inline-edit-col {

 .tablenav .tablenav-pages a {
 	border-color: #e3e3e3;
-	background: #eee url('../images/menu-bits.gif') repeat-x scroll left -379px;
+	background: #eee url('../images/menu-bits.gif?ver=20100610') repeat-x scroll left -379px;
 }

 .tablenav .tablenav-pages a:hover {
@@ -1458,7 +1462,8 @@ fieldset.inline-edit-col-right .inline-edit-col {
 	background-color: #f5f5f5;
 }

-#post-body ul#category-tabs li.tabs a {
+#post-body ul.category-tabs li.tabs a,
+#post-body ul.add-menu-item-tabs li.tabs a {
 	color: #333;
 }

@@ -1479,36 +1484,33 @@ fieldset.inline-edit-col-right .inline-edit-col {
 }

 #favorite-first {
-	background: #797979 url(../images/fav.png) repeat-x left center;
-	border-color: #777 !important;
-	border-bottom-color: #666 !important;
+	border-color: #c0c0c0;
+	background: #f1f1f1; /* fallback color */
+	background:-moz-linear-gradient(bottom,  #e7e7e7,  #fff);
+	background:-webkit-gradient(linear, left bottom, left top, from(#e7e7e7), to(#fff));
 }

 #favorite-inside {
-	border-color: #797979;
-	background-color: #797979;
+	border-color: #c0c0c0;
+	background-color: #fff;
 }

 #favorite-toggle {
-	background: transparent url(../images/fav-arrow.gif) no-repeat 0 -4px;
+	background: transparent url(../images/fav-arrow.gif?ver=20100531) no-repeat 0 -4px;
 }

 #favorite-actions a {
-	color: #ddd;
+	color: #464646;
 }

 #favorite-actions a:hover {
-	color: #fff;
+	color: #000;
 }

 #favorite-inside a:hover {
 	text-decoration: underline;
 }

-#favorite-actions .slide-down {
-	border-bottom-color: #626262;
-}
-
 #screen-meta a.show-settings {
 	background-color: transparent;
 	text-shadow: rgba(255,255,255,0.7) 0 1px 0;
@@ -1516,53 +1518,57 @@ fieldset.inline-edit-col-right .inline-edit-col {

 #icon-edit,
 #icon-post {
-	background: transparent url(../images/icons32.png) no-repeat -552px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -552px -5px;
 }

 #icon-index {
-	background: transparent url(../images/icons32.png) no-repeat -137px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -137px -5px;
 }

 #icon-upload {
-	background: transparent url(../images/icons32.png) no-repeat -251px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -251px -5px;
 }

 #icon-link-manager,
 #icon-link,
 #icon-link-category {
-	background: transparent url(../images/icons32.png) no-repeat -190px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -190px -5px;
 }

 #icon-edit-pages,
 #icon-page {
-	background: transparent url(../images/icons32.png) no-repeat -312px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -312px -5px;
 }

 #icon-edit-comments {
-	background: transparent url(../images/icons32.png) no-repeat -72px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -72px -5px;
 }

 #icon-themes {
-	background: transparent url(../images/icons32.png) no-repeat -11px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -11px -5px;
 }

 #icon-plugins {
-	background: transparent url(../images/icons32.png) no-repeat -370px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -370px -5px;
 }

 #icon-users,
 #icon-profile,
 #icon-user-edit {
-	background: transparent url(../images/icons32.png) no-repeat -600px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -600px -5px;
 }

 #icon-tools,
 #icon-admin {
-	background: transparent url(../images/icons32.png) no-repeat -432px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -432px -5px;
 }

 #icon-options-general {
-	background: transparent url(../images/icons32.png) no-repeat -492px -5px;
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -492px -5px;
+}
+
+#icon-ms-admin {
+	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -659px -5px;
 }

 .view-switch #view-switch-list {
@@ -1582,28 +1588,12 @@ fieldset.inline-edit-col-right .inline-edit-col {
 }

 #header-logo {
-	background: transparent url(../images/wp-logo.gif) no-repeat scroll center center;
-}
-
-#wphead #site-visit-button {
-	background-color:#585858;
-	background-image: url(../images/visit-site-button-grad.gif);
-	color:#aaa;
-	text-shadow: #3F3F3F 0 -1px 0;
-}
-
-#wphead a:hover #site-visit-button {
-	color:#fff;
-}
-
-#wphead a:focus #site-visit-button,
-#wphead a:active #site-visit-button {
-	background-position:0 -27px;
+	background: transparent url(../images/wp-logo.png?ver=20100531) no-repeat scroll center center;
 }

 .popular-tags,
 .feature-filter {
-	background-color: #FFFFFF;
+	background-color: #fff;
 	border-color: #DFDFDF;
 }

@@ -1618,18 +1608,18 @@ fieldset.inline-edit-col-right .inline-edit-col {
 div.widgets-sortables,
 #widgets-left .inactive {
 	background-color: #f1f1f1;
-    border-color: #ddd;
+	border-color: #ddd;
 }

 #available-widgets .widget-holder {
-    background-color: #fff;
-    border-color: #ddd;
+	background-color: #fff;
+	border-color: #ddd;
 }

 #widgets-left .sidebar-name {
 	background-color: #aaa;
 	background-image: url(../images/ed-bg.gif);
-	text-shadow: #FFFFFF 0 1px 0;
+	text-shadow: #fff 0 1px 0;
 	border-color: #dfdfdf;
 }

@@ -1651,11 +1641,11 @@ div.widgets-sortables,
 }

 #widgets-left .sidebar-name-arrow {
-	background: transparent url(../images/menu-bits.gif) no-repeat scroll left -109px;
+	background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;
 }

 #widgets-right .sidebar-name-arrow {
-	background: transparent url(../images/fav-arrow.gif) no-repeat scroll 0 -1px;
+	background: transparent url(../images/widgets-arrow.gif?ver=20100531) no-repeat scroll 0 -1px;
 }

 .in-widget-title {
@@ -1695,3 +1685,12 @@ div.widgets-sortables,
 .comment-ays th {
 	background-color: #f1f1f1;
 }
+
+#nav-menu-header, .menu-item-handle {
+	background: url("../images/gray-grad.png") repeat-x scroll left top #dfdfdf;
+}
+
+#menu-management .nav-tab-active {
+	background: #ececec;
+	border-bottom-color: #ececec;
+}
--- a/wp-admin/css/dashboard-rtl.css
+++ b/wp-admin/css/dashboard-rtl.css
@@ -1,93 +1 @@
-#dashboard-widgets-wrap .has-sidebar {
-	margin-right: 0;
-	margin-left: -51%;
-}
-#dashboard-widgets-wrap .has-sidebar .has-sidebar-content {
-	margin-right: 0;
-	margin-left: 51%;
-}
-.view-all {
-	right: auto;
-	left: 0;
-}
-#dashboard_right_now p.sub, #dashboard-widgets h4, #dashboard_quick_press h4, a.rsswidget, #dashboard_plugins h4, #dashboard_plugins h5, #dashboard_recent_comments .comment-meta .approve {
-	font-family: Tahoma, Arial;
-}
-#dashboard_right_now td.b {
-	padding-right: 0;
-	padding-left: 6px;
-	text-align: left;
-	font-family: Tahoma, Arial;
-}
-#dashboard_right_now .t {
-	padding-right: 0;
-	padding-left: 12px;
-}
-#dashboard_right_now .versions a {
-	font-family: Tahoma, Arial;
-}
-#dashboard_right_now a.button {
-	float: left;
-	clear: left;
-}
-#dashboard-widgets h3 .postbox-title-action {
-	right: auto;
-	left: 30px;
-}
-#the-comment-list .pingback {
-	padding-left: 0 !important;
-	padding-right: 9px !important;
-}
-/* Recent Comments */
-#the-comment-list .comment-item {
-	padding: 1em 70px 1em 10px;
-}
-#the-comment-list .comment-item .avatar {
-	float: right;
-	margin-left: 0;
-	margin-right: -60px;
-}
-/* Feeds */
-.rss-widget cite {
-	text-align: left;
-}
-.rss-widget span.rss-date {
-	font-family: Tahoma, Arial;
-	margin-left: 0;
-	margin-right: 3px;
-}
-/* QuickPress */
-#dashboard_quick_press h4 {
-	float: right;
-	text-align: left;
-}
-#dashboard_quick_press h4 label {
-	margin-right: 0;
-	margin-left: 10px;
-}
-#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap {
-	margin: 0 5em 1em 0;
-}
-#dashboard_quick_press #media-buttons {
-	margin: 0 5em .5em 0;
-	padding: 0 10px 0 0;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit {
-	margin-left: 0;
-	margin-right: 4.6em;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit input {
-	float: right;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
-	margin: 0 10px 0 1em;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit #publish {
-	float: left;
-}
-/* Recent Drafts */
-#dashboard_recent_drafts h4 abbr {
-	font-family: Tahoma, Arial;
-	margin-left:0;
-	margin-right: 3px;
-}
+#dashboard-widgets-wrap .has-sidebar{margin-right:0;margin-left:-51%;}#dashboard-widgets-wrap .has-sidebar .has-sidebar-content{margin-right:0;margin-left:51%;}.view-all{right:auto;left:0;}#dashboard_right_now p.sub,#dashboard-widgets h4,#dashboard_quick_press h4,a.rsswidget,#dashboard_plugins h4,#dashboard_plugins h5,#dashboard_recent_comments .comment-meta .approve{font-family:Tahoma,Arial;}#dashboard_right_now p.sub{font-style:normal;left:auto;right:15px;}#dashboard_right_now td.b{padding-right:0;padding-left:6px;text-align:left;font-family:Tahoma,Arial;}#dashboard_right_now .t{padding-right:0;padding-left:12px;}#dashboard_right_now .table_content{float:right;}#dashboard_right_now .table_discussion{float:left;}#dashboard_right_now .versions{clear:right;}#dashboard_right_now .versions a{font-family:Tahoma,Arial;}#dashboard_right_now a.button{float:left;clear:left;}#dashboard-widgets h3 .postbox-title-action{right:auto;left:30px;}#the-comment-list .pingback{padding-left:0!important;padding-right:9px!important;}#the-comment-list .comment-item{padding:1em 70px 1em 10px;}#the-comment-list .comment-item .avatar{float:right;margin-left:0;margin-right:-60px;}.rss-widget cite{text-align:left;}.rss-widget span.rss-date{font-family:Tahoma,Arial;margin-left:0;margin-right:3px;}#dashboard_quick_press h4{float:right;text-align:left;}#dashboard_quick_press h4 label{margin-right:0;margin-left:10px;}#dashboard_quick_press .input-text-wrap,#dashboard_quick_press .textarea-wrap{margin:0 5em 1em 0;}#dashboard_quick_press #media-buttons{margin:0 5em .5em 0;padding:0 10px 0 0;}#dashboard-widgets #dashboard_quick_press form p.submit{margin-left:0;margin-right:4.6em;}#dashboard-widgets #dashboard_quick_press form p.submit input{float:right;}#dashboard-widgets #dashboard_quick_press form p.submit #save-post{margin:0 10px 0 1em;}#dashboard-widgets #dashboard_quick_press form p.submit #publish{float:left;}#dashboard-widgets #dashboard_quick_press form p.submit img.waiting{margin:4px 0 0 6px;}#dashboard_recent_drafts h4 abbr{font-family:Tahoma,Arial;margin-left:0;margin-right:3px;}
--- a/wp-admin/css/dashboard-rtl.dev.css
+++ b/wp-admin/css/dashboard-rtl.dev.css
@@ -0,0 +1,110 @@
+#dashboard-widgets-wrap .has-sidebar {
+	margin-right: 0;
+	margin-left: -51%;
+}
+#dashboard-widgets-wrap .has-sidebar .has-sidebar-content {
+	margin-right: 0;
+	margin-left: 51%;
+}
+.view-all {
+	right: auto;
+	left: 0;
+}
+#dashboard_right_now p.sub, #dashboard-widgets h4, #dashboard_quick_press h4, a.rsswidget, #dashboard_plugins h4, #dashboard_plugins h5, #dashboard_recent_comments .comment-meta .approve {
+	font-family: Tahoma, Arial;
+}
+#dashboard_right_now p.sub  {
+	font-style:normal;
+	left:auto;
+	right:15px;
+}
+#dashboard_right_now td.b {
+	padding-right: 0;
+	padding-left: 6px;
+	text-align: left;
+	font-family: Tahoma, Arial;
+}
+#dashboard_right_now .t {
+	padding-right: 0;
+	padding-left: 12px;
+}
+#dashboard_right_now .table_content {
+	float:right;
+}
+#dashboard_right_now .table_discussion {
+	float:left;
+}
+#dashboard_right_now .versions {
+	clear:right;
+}
+#dashboard_right_now .versions a {
+	font-family: Tahoma, Arial;
+}
+#dashboard_right_now a.button {
+	float: left;
+	clear: left;
+}
+#dashboard-widgets h3 .postbox-title-action {
+	right: auto;
+	left: 30px;
+}
+#the-comment-list .pingback {
+	padding-left: 0 !important;
+	padding-right: 9px !important;
+}
+/* Recent Comments */
+#the-comment-list .comment-item {
+	padding: 1em 70px 1em 10px;
+}
+#the-comment-list .comment-item .avatar {
+	float: right;
+	margin-left: 0;
+	margin-right: -60px;
+}
+/* Feeds */
+.rss-widget cite {
+	text-align: left;
+}
+.rss-widget span.rss-date {
+	font-family: Tahoma, Arial;
+	margin-left: 0;
+	margin-right: 3px;
+}
+/* QuickPress */
+#dashboard_quick_press h4 {
+	float: right;
+	text-align: left;
+}
+#dashboard_quick_press h4 label {
+	margin-right: 0;
+	margin-left: 10px;
+}
+#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap {
+	margin: 0 5em 1em 0;
+}
+#dashboard_quick_press #media-buttons {
+	margin: 0 5em .5em 0;
+	padding: 0 10px 0 0;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit {
+	margin-left: 0;
+	margin-right: 4.6em;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit input {
+	float: right;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
+	margin: 0 10px 0 1em;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit #publish {
+	float: left;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit img.waiting {
+	margin: 4px 0 0 6px;
+}
+/* Recent Drafts */
+#dashboard_recent_drafts h4 abbr {
+	font-family: Tahoma, Arial;
+	margin-left:0;
+	margin-right: 3px;
+}
--- a/wp-admin/css/dashboard.css
+++ b/wp-admin/css/dashboard.css
--- a/wp-admin/css/dashboard.dev.css
+++ b/wp-admin/css/dashboard.dev.css
@@ -91,6 +91,7 @@ div.postbox div.inside {

 #dashboard_right_now .inside {
 	font-size: 12px;
+	padding-top: 20px;
 }

 #dashboard_right_now p.sub {
@@ -99,22 +100,30 @@ div.postbox div.inside {
 	padding: 5px 10px 15px;
 	color: #777;
 	font-size: 13px;
+	position: absolute;
+	top: -17px;
+	left: 15px;
 }

 #dashboard_right_now .table {
-	background: #f9f9f9;
-	border-top: #ececec 1px solid;
-	border-bottom: #ececec 1px solid;
-	margin: 0 -9px 10px;
+	margin: 0 -9px;
 	padding: 0 10px;
+	position: relative;
 }

-#dashboard_right_now table {
-	width: 100%;
-}
-
-#dashboard_right_now table  td {
+#dashboard_right_now .table_content {
+	float: left;
 	border-top: #ececec 1px solid;
+	width: 45%;
+}
+
+#dashboard_right_now .table_discussion {
+	float: right;
+	border-top: #ececec 1px solid;
+	width: 45%;
+}
+
+#dashboard_right_now table td {
 	padding: 3px 0;
 	white-space: nowrap;
 }
@@ -128,6 +137,7 @@ div.postbox div.inside {
 	text-align: right;
 	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 	font-size: 14px;
+	width: 1%;
 }

 #dashboard_right_now td.b a {
@@ -149,11 +159,6 @@ div.postbox div.inside {
 	white-space: nowrap;
 }

-#dashboard_right_now td.first,
-#dashboard_right_now td.last {
-	width: 1%;
-}
-
 #dashboard_right_now .spam {
 	color: red;
 }
@@ -168,6 +173,7 @@ div.postbox div.inside {

 #dashboard_right_now .versions {
 	padding: 6px 10px 12px;
+	clear: left;
 }

 #dashboard_right_now .versions .b {
@@ -302,6 +308,12 @@ div.postbox div.inside {
 	float: right;
 }

+#dashboard-widgets #dashboard_quick_press form p.submit img.waiting {
+	vertical-align: middle;
+	visibility: hidden;
+	margin: 4px 6px 0 0;
+}
+
 /* Recent Drafts */
 #dashboard_recent_drafts ul {
 	margin: 0;
@@ -391,4 +403,3 @@ a.rsswidget {
 	overflow: hidden;
 	word-wrap: break-word;
 }
-
--- a/wp-admin/css/global-rtl.css
+++ b/wp-admin/css/global-rtl.css
@@ -1,82 +1 @@
-/* 2 column liquid layout */
-#adminmenu {
-	float: right;
-	clear: right;
-	margin-right:-160px;
-	margin-left: 5px;
-}
-body.folded #adminmenu {
-	margin-left: 0;
-	margin-right: -45px;
-}
-/* inner 2 column liquid layout */
-.inner-sidebar {
-	float: left;
-	clear: left;
-}
-
-.has-right-sidebar #post-body {
-	clear:right;
-	float:right;
-	margin-right:0;
-	margin-left:-340px;
-}
-
-.has-right-sidebar #post-body-content {
-	margin-left: 300px;
-	margin-right:0;
-}
-
-#wpbody {
-	margin-left:0;
-	margin-right: 175px;
-}
-.folded #wpbody {
-	margin-left: 0;
-	margin-right: 60px;
-}
-#wpbody-content {
-	float: right;
-}
-/* 2 columns main area */
-#col-right {
-	float: left;
-	clear: left;
-}
-.wrap {
-	margin: 0 5px 0 15px;
-}
-/* styles for use by people extending the WordPress interface */
-body, td, textarea, input, select {
-	font-family: Tahoma, arial;
-}
-.alignleft {
-	float: right;
-}
-.alignright {
-	float: left;
-}
-.subsubsub {
-	float: right;
-}
-.widefat th {
-	text-align: right;
-}
-.widefat th input {
-	margin: 0 8px 0 0;
-}
-.wrap h2 {
-	font-family: arial;
-	padding: 14px 0 3px 15px;
-}
-.wrap h2.long-header {
-	padding-left: 0;
-}
-.updated, .error {
-	clear: both;
-}
-
-.screen-reader-text, .screen-reader-text span {
-	left:auto;
-	text-indent:-1000em;
-}
+#adminmenu{float:right;clear:right;margin-right:-160px;margin-left:5px;}body.folded #adminmenu{margin-left:0;margin-right:-45px;}.inner-sidebar{float:left;clear:left;}.has-right-sidebar #post-body{clear:right;float:right;margin-right:0;margin-left:-340px;}.has-right-sidebar #post-body-content{margin-left:300px;margin-right:0;}#wpbody{margin-left:0;margin-right:175px;}.folded #wpbody{margin-left:0;margin-right:60px;}#wpbody-content{float:right;}#col-right{float:left;clear:left;}.wrap{margin:0 5px 0 15px;}body,td,textarea,input,select{font-family:Tahoma,arial;}.alignleft{float:right;}.alignright{float:left;}.subsubsub{float:right;}.widefat th{text-align:right;}.widefat th input{margin:0 8px 0 0;}.wrap h2{font-family:arial;padding:14px 0 3px 15px;font-style:normal;}.wrap h2.long-header{padding-left:0;}.updated,.error{clear:both;}.screen-reader-text,.screen-reader-text span{left:auto;text-indent:-1000em;}
--- a/wp-admin/css/global-rtl.dev.css
+++ b/wp-admin/css/global-rtl.dev.css
@@ -0,0 +1,83 @@
+/* 2 column liquid layout */
+#adminmenu {
+	float: right;
+	clear: right;
+	margin-right:-160px;
+	margin-left: 5px;
+}
+body.folded #adminmenu {
+	margin-left: 0;
+	margin-right: -45px;
+}
+/* inner 2 column liquid layout */
+.inner-sidebar {
+	float: left;
+	clear: left;
+}
+
+.has-right-sidebar #post-body {
+	clear:right;
+	float:right;
+	margin-right:0;
+	margin-left:-340px;
+}
+
+.has-right-sidebar #post-body-content {
+	margin-left: 300px;
+	margin-right:0;
+}
+
+#wpbody {
+	margin-left:0;
+	margin-right: 175px;
+}
+.folded #wpbody {
+	margin-left: 0;
+	margin-right: 60px;
+}
+#wpbody-content {
+	float: right;
+}
+/* 2 columns main area */
+#col-right {
+	float: left;
+	clear: left;
+}
+.wrap {
+	margin: 0 5px 0 15px;
+}
+/* styles for use by people extending the WordPress interface */
+body, td, textarea, input, select {
+	font-family: Tahoma, arial;
+}
+.alignleft {
+	float: right;
+}
+.alignright {
+	float: left;
+}
+.subsubsub {
+	float: right;
+}
+.widefat th {
+	text-align: right;
+}
+.widefat th input {
+	margin: 0 8px 0 0;
+}
+.wrap h2 {
+	font-family: arial;
+	padding: 14px 0 3px 15px;
+	font-style: normal;
+}
+.wrap h2.long-header {
+	padding-left: 0;
+}
+.updated, .error {
+	clear: both;
+}
+
+.screen-reader-text, .screen-reader-text span {
+	left:auto;
+	text-indent:-1000em;
+}
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -1 +1 @@
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;background:transparent;}body{line-height:1;}ol,ul{list-style:none;}blockquote,q{quotes:none;}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;}ins{text-decoration:none;}del{text-decoration:line-through;}#wpwrap{height:auto;min-height:100%;width:100%;}#wpcontent{height:100%;padding-bottom:50px;}#wpbody{clear:both;margin-left:175px;}.folded #wpbody{margin-left:60px;}#wpbody-content{float:left;width:100%;}#adminmenu{float:left;clear:left;width:145px;margin-top:15px;margin-right:5px;margin-bottom:15px;margin-left:-160px;position:relative;padding:0;list-style:none;}.folded #adminmenu{margin-left:-45px;}.folded #adminmenu,.folded #adminmenu li.menu-top{width:28px;}#footer{clear:both;position:relative;width:100%;}.inner-sidebar{float:right;clear:right;display:none;width:281px;position:relative;}.inner-sidebar #side-sortables{width:280px;min-height:300px;}.has-right-sidebar .inner-sidebar{display:block;}.has-right-sidebar #post-body{float:left;clear:left;width:100%;margin-right:-340px;}.has-right-sidebar #post-body-content{margin-right:300px;}#col-container{overflow:hidden;padding:0;margin:0;}#col-left{padding:0;margin:0;overflow:hidden;width:39%;}#col-right{float:right;clear:right;overflow:hidden;padding:0;margin:0;width:59%;}.alignleft{float:left;}.alignright{float:right;}.textleft{text-align:left;}.textright{text-align:right;}.clear{clear:both;}.screen-reader-text,.screen-reader-text span{position:absolute;left:-1000em;height:1px;width:1px;overflow:hidden;}.hidden,.js .closed .inside,.js .hide-if-js,.no-js .hide-if-no-js{display:none;}input[type="text"],input[type="password"],textarea{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}input[type="checkbox"],input[type="radio"]{vertical-align:middle;}html,body{height:100%;}body,td,textarea,input,select{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;font-size:13px;}body,textarea{line-height:1.4em;}input,select{line-height:1em;}p{margin:1em 0;}blockquote{margin:1em;}label{cursor:pointer;}li,dd{margin-bottom:6px;}p,li,dl,dd,dt{line-height:140%;}textarea,input,select{margin:1px;padding:3px;}h1{display:block;font-size:2em;font-weight:bold;margin:.67em 0;}h2{display:block;font-size:1.5em;font-weight:bold;margin:.83em 0;}h3{display:block;font-size:1.17em;font-weight:bold;margin:1em 0;}h4{display:block;font-size:1em;font-weight:bold;margin:1.33em 0;}h5{display:block;font-size:.83em;font-weight:bold;margin:1.67em 0;}h6{display:block;font-size:.67em;font-weight:bold;margin:2.33em 0;}ul.ul-disc{list-style:disc outside;}ul.ul-square{list-style:square outside;}ol.ol-decimal{list-style:decimal outside;}ul.ul-disc,ul.ul-square,ol.ol-decimal{margin-left:1.8em;}ul.ul-disc>li,ul.ul-square>li,ol.ol-decimal>li{margin:0 0 .5em;}.subsubsub{list-style:none;margin:8px 0 5px;padding:0;white-space:nowrap;font-size:11px;float:left;}.subsubsub a{line-height:2;padding:.2em;text-decoration:none;}.subsubsub a .count,.subsubsub a.current .count{color:#999;font-weight:normal;}.subsubsub a.current{font-weight:bold;background:none;border:none;}.subsubsub li{display:inline;margin:0;padding:0;}.widefat{border-width:1px;border-style:solid;border-spacing:0;width:100%;clear:both;margin:0;-moz-border-radius:4px;-khtml-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;}.widefat *{word-wrap:break-word;}.widefat a{text-decoration:none;}.widefat td,.widefat th{border-bottom-width:1px;border-bottom-style:solid;font-size:11px;}.widefat td{padding:3px 7px;vertical-align:top;}.widefat td p,.widefat td ol,.widefat td ul{font-size:11px;}.widefat th{padding:7px 7px 8px;text-align:left;line-height:1.3em;}.widefat th input{margin:0 0 0 8px;padding:0;vertical-align:text-top;}.widefat .check-column{width:2.2em;padding:0;}.widefat tbody th.check-column{padding:7px 0 22px;vertical-align:top;}.widefat .num,.column-comments,.column-links,.column-posts{text-align:center;}.widefat th#comments{vertical-align:middle;}.wrap{margin:0 15px 0 5px;}.updated,.error{border-width:1px;border-style:solid;padding:0 .6em;margin:5px 15px 2px;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.updated p,.error p{margin:.5em 0;line-height:1;padding:2px;}.wrap .updated,.wrap .error{margin:5px 0 15px;}.wrap h2{font:italic normal normal 24px/29px Georgia,"Times New Roman","Bitstream Charter",Times,serif;margin:0;padding:14px 15px 3px 0;line-height:35px;text-shadow:rgba(255,255,255,1) 0 1px 0;}.wrap h2.long-header{padding-right:0;}
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;background:transparent;}body{line-height:1;}ol,ul{list-style:none;}blockquote,q{quotes:none;}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;}ins{text-decoration:none;}del{text-decoration:line-through;}#wpwrap{height:auto;min-height:100%;width:100%;}#wpcontent{height:100%;padding-bottom:50px;}#wpbody{clear:both;margin-left:175px;}.folded #wpbody{margin-left:60px;}#wpbody-content{float:left;width:100%;}#adminmenu{float:left;clear:left;width:145px;margin-top:15px;margin-right:5px;margin-bottom:15px;margin-left:-160px;position:relative;padding:0;list-style:none;}.folded #adminmenu{margin-left:-45px;}.folded #adminmenu,.folded #adminmenu li.menu-top{width:28px;}#footer{clear:both;position:relative;width:100%;}.inner-sidebar{float:right;clear:right;display:none;width:281px;position:relative;}.inner-sidebar #side-sortables{width:280px;min-height:300px;}.has-right-sidebar .inner-sidebar{display:block;}.has-right-sidebar #post-body{float:left;clear:left;width:100%;margin-right:-340px;}.has-right-sidebar #post-body-content{margin-right:300px;}#col-container{overflow:hidden;padding:0;margin:0;}#col-left{padding:0;margin:0;overflow:hidden;width:39%;}#col-right{float:right;clear:right;overflow:hidden;padding:0;margin:0;width:59%;}.alignleft{float:left;}.alignright{float:right;}.textleft{text-align:left;}.textright{text-align:right;}.clear{clear:both;}.screen-reader-text,.screen-reader-text span{position:absolute;left:-1000em;height:1px;width:1px;overflow:hidden;}.hidden,.js .closed .inside,.js .hide-if-js,.no-js .hide-if-no-js{display:none;}input[type="text"],input[type="password"],textarea{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}input[type="checkbox"],input[type="radio"]{vertical-align:middle;}html,body{height:100%;}body,td,textarea,input,select{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;font-size:13px;}body,textarea{line-height:1.4em;}input,select{line-height:15px;}p{margin:1em 0;}blockquote{margin:1em;}label{cursor:pointer;}li,dd{margin-bottom:6px;}p,li,dl,dd,dt{line-height:140%;}textarea,input,select{margin:1px;padding:3px;}h1{display:block;font-size:2em;font-weight:bold;margin:.67em 0;}h2{display:block;font-size:1.5em;font-weight:bold;margin:.83em 0;}h3{display:block;font-size:1.17em;font-weight:bold;margin:1em 0;}h4{display:block;font-size:1em;font-weight:bold;margin:1.33em 0;}h5{display:block;font-size:.83em;font-weight:bold;margin:1.67em 0;}h6{display:block;font-size:.67em;font-weight:bold;margin:2.33em 0;}ul.ul-disc{list-style:disc outside;}ul.ul-square{list-style:square outside;}ol.ol-decimal{list-style:decimal outside;}ul.ul-disc,ul.ul-square,ol.ol-decimal{margin-left:1.8em;}ul.ul-disc>li,ul.ul-square>li,ol.ol-decimal>li{margin:0 0 .5em;}.subsubsub{list-style:none;margin:8px 0 5px;padding:0;white-space:nowrap;font-size:11px;float:left;}.subsubsub a{line-height:2;padding:.2em;text-decoration:none;}.subsubsub a .count,.subsubsub a.current .count{color:#999;font-weight:normal;}.subsubsub a.current{font-weight:bold;background:none;border:none;}.subsubsub li{display:inline;margin:0;padding:0;}.widefat{border-width:1px;border-style:solid;border-spacing:0;width:100%;clear:both;margin:0;-moz-border-radius:4px;-khtml-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;}.widefat *{word-wrap:break-word;}.widefat a{text-decoration:none;}.widefat td,.widefat th{border-bottom-width:1px;border-bottom-style:solid;font-size:11px;}.widefat td{padding:3px 7px;vertical-align:top;}.widefat td p,.widefat td ol,.widefat td ul{font-size:11px;}.widefat th{padding:7px 7px 8px;text-align:left;line-height:1.3em;}.widefat th input{margin:0 0 0 8px;padding:0;vertical-align:text-top;}.widefat .check-column{width:2.2em;padding:0;}.widefat tbody th.check-column{padding:7px 0 22px;vertical-align:top;}.widefat .num,.column-comments,.column-links,.column-posts{text-align:center;}.widefat th#comments{vertical-align:middle;}.wrap{margin:0 15px 0 5px;}.updated,.error{border-width:1px;border-style:solid;padding:0 .6em;margin:5px 15px 2px;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.updated p,.error p{margin:.5em 0;line-height:1;padding:2px;}.wrap .updated,.wrap .error{margin:5px 0 15px;}.wrap h2{font:italic normal normal 24px/29px Georgia,"Times New Roman","Bitstream Charter",Times,serif;margin:0;padding:14px 15px 3px 0;line-height:35px;text-shadow:rgba(255,255,255,1) 0 1px 0;}.wrap h2.long-header{padding-right:0;}
--- a/wp-admin/css/global.dev.css
+++ b/wp-admin/css/global.dev.css
@@ -239,7 +239,7 @@ textarea {

 input,
 select {
-	line-height: 1em;
+	line-height: 15px;
 }

 p {
@@ -478,7 +478,7 @@ ol.ol-decimal > li {
 	margin: 0;
 	padding: 14px 15px 3px 0;
 	line-height: 35px;
-	text-shadow: rgba(255,255,255,1) 0px 1px 0px;
+	text-shadow: rgba(255,255,255,1) 0 1px 0;
 }

 .wrap h2.long-header {
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -1,95 +1 @@
-* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
-	background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -109px;
-}
-
-* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
-	background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -206px;
-}
-* html #adminmenu {
-	margin-left:0;
-	margin-right: -80px;
-}
-* html div.folded #adminmenu {
-	margin-left: 0;
-	margin-right: -22px;
-}
-#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
-	padding: 3px 10px 4px 4px;
-}
-.inline-edit-row fieldset label span.title {
-	float: right;
-}
-.inline-edit-row fieldset label span.input-text-wrap {
-	margin-right: 0;
-}
-p.search-box {
-	float: left;
-}
-* html #poststuff h2 {
-	margin-right: 0;
-}
-#bh {
-	margin: 7px 10px 0 0;
-	float: left;
-}
-#user_info + div#favorite-actions {
-	right: auto;
-	left: 15px;
-}
-#wphead-info {
-	float: left;
-}
-/* without this dashboard widgets appear in one column for some screen widths */
-div#dashboard-widgets {
-	padding-right: 0;
-	padding-left: 1px;
-}
-.tagchecklist span a {
-	margin: 4px -9px 0 0;
-}
-.widefat th input {
-	margin: 0 5px 0 0;
-}
-/* ---------- add by navid */
-#TB_window {
-	width: 670px;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin-right: 335px !important;
-}
-#dashboard_plugins {
-	direction: ltr;
-}
-#dashboard_plugins h3.hndle {
-	direction: rtl;
-}
-#dashboard_incoming_links ul li,
-#dashboard_secondary ul li,
-#dashboard_primary ul li,
-p.row-actions {
-	width: 100%;
-}
-#favorite-inside {
-	position: absolute;
-	right:0;
-}
-#post-status-info {
-	height: 25px;
-}
-#screen-meta {
-	position: static;
-}
-p.submit { /* quick edit and reply in edit-comments.php */
-	height:22px;
-}
-.inner-sidebar { /* fix edit single comment */
-	position: static;
-}
-form#widgets-filter { /* fix widget page */
-	position: static;
-}
-
-* html .meta-box-sortables .postbox .handlediv {
-	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;
-}
+html{direction:ltr;}body{direction:rtl;}* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle{background:url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -109px;}* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle{background:url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -206px;}* html #adminmenu{margin-left:0;margin-right:-80px;}* html div.folded #adminmenu{margin-left:0;margin-right:-22px;}#wpcontent #adminmenu .wp-submenu li.wp-submenu-head{padding:3px 10px 4px 4px;}.inline-edit-row fieldset label span.title{float:right;}.inline-edit-row fieldset label span.input-text-wrap{margin-right:0;}p.search-box{float:left;}* html #poststuff h2{margin-right:0;}#bh{margin:7px 10px 0 0;float:left;}#user_info+div#favorite-actions{right:auto;left:15px;}#wphead-info{float:left;}div#dashboard-widgets{padding-right:0;padding-left:1px;}.tagchecklist span a{margin:4px -9px 0 0;}.widefat th input{margin:0 5px 0 0;}#TB_window{width:670px;position:absolute;top:50%;left:50%;margin-right:335px!important;}#dashboard_plugins{direction:ltr;}#dashboard_plugins h3.hndle{direction:rtl;}#dashboard_incoming_links ul li,#dashboard_secondary ul li,#dashboard_primary ul li,p.row-actions{width:100%;}#favorite-inside{position:absolute;right:0;}#post-status-info{height:25px;}#screen-meta{position:static;}p.submit{height:22px;}.inner-sidebar{position:static;}form#widgets-filter{position:static;}* html .meta-box-sortables .postbox .handlediv{background:transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;}.menu-max-depth-0 #menu-management{width:460px;}.menu-max-depth-1 #menu-management{width:490px;}.menu-max-depth-2 #menu-management{width:520px;}.menu-max-depth-3 #menu-management{width:550px;}.menu-max-depth-4 #menu-management{width:580px;}.menu-max-depth-5 #menu-management{width:610px;}.menu-max-depth-6 #menu-management{width:640px;}.menu-max-depth-7 #menu-management{width:670px;}.menu-max-depth-8 #menu-management{width:700px;}.menu-max-depth-9 #menu-management{width:730px;}.menu-max-depth-10 #menu-management{width:760px;}.menu-max-depth-11 #menu-management{width:790px;}.menu-item-depth-0{margin-left:0;}.menu-item-depth-1{margin-left:-30px;}.menu-item-depth-2{margin-left:-60px;}.menu-item-depth-3{margin-left:-90px;}.menu-item-depth-4{margin-left:-120px;}.menu-item-depth-5{margin-left:-150px;}.menu-item-depth-6{margin-left:-180px;}.menu-item-depth-7{margin-left:-210px;}.menu-item-depth-8{margin-left:-240px;}.menu-item-depth-9{margin-left:-270px;}.menu-item-depth-10{margin-left:-300px;}.menu-item-depth-11{margin-left:-330px;}#menu-to-edit li dl{padding:0!important;margin:0!important;}.ui-sortable-helper .menu-item-transport{margin-top:13px;}.ui-sortable-helper .menu-item-transport .menu-item-transport{margin-top:0;}.sortable-placeholder{margin-top:0!important;margin-left:0!important;margin-bottom:13px!important;padding:0!important;}.auto-add-pages{clear:both;float:none;}#nav-menus-frame .open-label span{float:none;display:inline-block;}#nav-menus-frame .delete-action{float:none;}
--- a/wp-admin/css/ie-rtl.dev.css
+++ b/wp-admin/css/ie-rtl.dev.css
@@ -0,0 +1,156 @@
+html {
+	direction: ltr;
+}
+body {
+	direction: rtl;
+}
+* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -109px;
+}
+
+* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -206px;
+}
+* html #adminmenu {
+	margin-left:0;
+	margin-right: -80px;
+}
+* html div.folded #adminmenu {
+	margin-left: 0;
+	margin-right: -22px;
+}
+#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
+	padding: 3px 10px 4px 4px;
+}
+.inline-edit-row fieldset label span.title {
+	float: right;
+}
+.inline-edit-row fieldset label span.input-text-wrap {
+	margin-right: 0;
+}
+p.search-box {
+	float: left;
+}
+* html #poststuff h2 {
+	margin-right: 0;
+}
+#bh {
+	margin: 7px 10px 0 0;
+	float: left;
+}
+#user_info + div#favorite-actions {
+	right: auto;
+	left: 15px;
+}
+#wphead-info {
+	float: left;
+}
+/* without this dashboard widgets appear in one column for some screen widths */
+div#dashboard-widgets {
+	padding-right: 0;
+	padding-left: 1px;
+}
+.tagchecklist span a {
+	margin: 4px -9px 0 0;
+}
+.widefat th input {
+	margin: 0 5px 0 0;
+}
+/* ---------- add by navid */
+#TB_window {
+	width: 670px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-right: 335px !important;
+}
+#dashboard_plugins {
+	direction: ltr;
+}
+#dashboard_plugins h3.hndle {
+	direction: rtl;
+}
+#dashboard_incoming_links ul li,
+#dashboard_secondary ul li,
+#dashboard_primary ul li,
+p.row-actions {
+	width: 100%;
+}
+#favorite-inside {
+	position: absolute;
+	right:0;
+}
+#post-status-info {
+	height: 25px;
+}
+#screen-meta {
+	position: static;
+}
+p.submit { /* quick edit and reply in edit-comments.php */
+	height:22px;
+}
+.inner-sidebar { /* fix edit single comment */
+	position: static;
+}
+form#widgets-filter { /* fix widget page */
+	position: static;
+}
+
+* html .meta-box-sortables .postbox .handlediv {
+	background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;
+}
+
+/* nav menus */
+.menu-max-depth-0 #menu-management { width: 460px; }
+.menu-max-depth-1 #menu-management { width: 490px; }
+.menu-max-depth-2 #menu-management { width: 520px; }
+.menu-max-depth-3 #menu-management { width: 550px; }
+.menu-max-depth-4 #menu-management { width: 580px; }
+.menu-max-depth-5 #menu-management { width: 610px; }
+.menu-max-depth-6 #menu-management { width: 640px; }
+.menu-max-depth-7 #menu-management { width: 670px; }
+.menu-max-depth-8 #menu-management { width: 700px; }
+.menu-max-depth-9 #menu-management { width: 730px; }
+.menu-max-depth-10 #menu-management { width: 760px; }
+.menu-max-depth-11 #menu-management { width: 790px; }
+
+.menu-item-depth-0 { margin-left: 0px; }
+.menu-item-depth-1 { margin-left: -30px; }
+.menu-item-depth-2 { margin-left: -60px; }
+.menu-item-depth-3 { margin-left: -90px; }
+.menu-item-depth-4 { margin-left: -120px; }
+.menu-item-depth-5 { margin-left: -150px; }
+.menu-item-depth-6 { margin-left: -180px; }
+.menu-item-depth-7 { margin-left: -210px; }
+.menu-item-depth-8 { margin-left: -240px; }
+.menu-item-depth-9 { margin-left: -270px; }
+.menu-item-depth-10 { margin-left: -300px; }
+.menu-item-depth-11 { margin-left: -330px; }
+
+#menu-to-edit li dl {
+	padding: 0 !important;
+	margin: 0 !important;
+}
+.ui-sortable-helper .menu-item-transport {
+	margin-top: 13px;
+}
+	.ui-sortable-helper .menu-item-transport .menu-item-transport {
+		margin-top: 0;
+	}
+.sortable-placeholder {
+	margin-top: 0 !important;
+	margin-left: 0 !important;
+	margin-bottom: 13px !important;
+	padding: 0 !important;
+}
+.auto-add-pages {
+	clear: both;
+	float: none;
+}
+#nav-menus-frame .open-label span {
+	float: none;
+	display: inline-block;
+}
+#nav-menus-frame .delete-action {
+	float: none;
+}
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
--- a/wp-admin/css/ie.dev.css
+++ b/wp-admin/css/ie.dev.css
@@ -0,0 +1,464 @@
+/* Fixes for IE bugs */
+
+#wpbody-content input.button,
+#wpbody-content input.button-secondary,
+#wpbody-content input.button-highlighted {
+	padding: 2px 3px;
+}
+
+#minor-publishing-actions input,
+#major-publishing-actions input {
+	min-width: auto;
+	padding-left: 0;
+	padding-right: 0;
+}
+
+#wpbody-content .postbox {
+	border: 1px solid #dfdfdf;
+}
+
+#wpbody-content .postbox h3 {
+	margin-bottom: -1px;
+}
+
+* html .meta-box-sortables .postbox .handlediv {
+	background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
+}
+
+* html .edit-box {
+	display: inline;
+}
+
+* html .inner-sidebar #side-sortables,
+* html .postbox-container .meta-box-sortables {
+	height: 300px;
+}
+
+* html #wpbody-content #screen-options-link-wrap {
+	display: inline-block;
+	width: 150px;
+	text-align: center;
+}
+
+* html #wpbody-content #contextual-help-link-wrap {
+	display: inline-block;
+	width: 100px;
+	text-align: center;
+}
+
+* html #adminmenu {
+	margin-left: -80px;
+}
+
+* html .folded #adminmenu {
+	margin-left: -22px;
+}
+
+* html #wpcontent #adminmenu li.menu-top {
+	display: inline;
+	padding: 0;
+	margin: 0;
+}
+
+* html #footer {
+	margin: 0;
+}
+
+.folded #adminmenu li.menu-top {
+	display: block;
+	zoom: 100%;
+}
+
+ul#adminmenu {
+	z-index: 99;
+}
+
+#adminmenu li.menu-top a.menu-top {
+	min-width: auto;
+	width: auto;
+}
+
+#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu {
+	font-style: normal;
+}
+
+* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle {
+	background: none;
+}
+
+* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;
+}
+
+* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -206px;
+}
+
+* html #adminmenu div.wp-menu-image {
+	height: 29px;
+}
+
+#wpcontent #adminmenu .wp-submenu li {
+	padding: 0;
+}
+
+#adminmenu,
+.major-publishing-actions,
+.wp-submenu,
+.wp-submenu li,
+.wp-menu-toggle {
+	zoom: 100%;
+}
+
+.folded #adminmenu li.wp-menu-separator {
+	width: 28px;
+}
+
+#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
+	padding: 3px 4px 4px 10px;
+	zoom: 100%;
+}
+
+.folded #adminmenu .menu-top {
+	height: 30px;
+}
+
+.folded #adminmenu .wp-submenu {
+	margin: -1px 0 0 0;
+}
+
+#template,
+#template div,
+#editcat,
+#addcat,
+* html .stuffbox h3 {
+	zoom: 100%;
+}
+
+.submitbox {
+	margin-top: 10px;
+}
+
+/* Inline Editor */
+#wpbody-content .quick-edit-row-post .inline-edit-col-left {
+	width: 39%;
+}
+
+#wpbody-content .inline-edit-row-post .inline-edit-col-center {
+	width: 19%;
+}
+
+#wpbody-content .quick-edit-row-page .inline-edit-col-left {
+	width: 49%;
+}
+
+#wpbody-content .bulk-edit-row .inline-edit-col-left {
+	width: 29%;
+}
+
+.inline-edit-row p.submit {
+	zoom: 100%;
+}
+
+.inline-edit-row fieldset label span.title {
+	display: block;
+	float: left;
+	width: 5em;
+}
+
+.inline-edit-row fieldset label span.input-text-wrap {
+	margin-left: 0;
+	zoom: 100%;
+}
+
+#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input {
+	line-height: 130%;
+}
+
+#wpbody-content .inline-edit-row .input-text-wrap input {
+	width: 95%;
+}
+
+#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input {
+	width: 8em;
+}
+/* end Inline Editor */
+
+input {
+	line-height: 1;
+}
+
+* html .row-actions {
+	visibility: visible;
+}
+
+#dashboard-widgets h3 a {
+	height: 20px;
+	line-height: 20px;
+}
+
+#wphead-info {
+	float: right;
+}
+
+#titlediv #title {
+	width: 98%;
+}
+
+a.button {
+	line-height: 1.4em;
+	margin: 1px;
+	padding: 2px 6px;
+}
+
+* html div.widget-liquid-left,
+* html div.widget-liquid-right {
+	display: block;
+	position: relative;
+}
+
+#screen-options-wrap {
+	overflow: hidden;
+}
+
+#favorite-actions {
+	z-index: 12;
+}
+
+#favorite-inside,
+#favorite-inside a,
+.favorite-action {
+	zoom: 100%;
+}
+
+#the-comment-list .comment-item,
+#post-status-info,
+#wpwrap,
+#wpcontent,
+#wrap,
+#postdivrich,
+#postdiv,
+#poststuff,
+.metabox-holder,
+#titlediv,
+#post-body,
+#editorcontainer,
+.tablenav,
+.widget-liquid-left,
+.widget-liquid-right,
+#widgets-left,
+.widgets-sortables,
+#dragHelper,
+.widget .widget-top,
+.widget,
+.widget-control-actions,
+.tagchecklist,
+#col-container,
+#col-left,
+#col-right,
+.fileedit-sub {
+	display: block;
+	zoom: 100%;
+}
+
+p.search-box {
+	position: static;
+	float: right;
+	margin: -3px 0 4px;
+}
+
+* html #editorcontainer {
+	padding: 0;
+}
+
+#editorcontainer #content {
+	overflow: auto;
+	margin: auto;
+	width: 98%;
+}
+
+form#template div {
+	width: 100%;
+}
+
+#ed_toolbar input,
+#ed_reply_toolbar input {
+	overflow: visible;
+	padding: 0 4px;
+}
+
+#poststuff h2 {
+	font-size: 1.6em;
+}
+
+* html #poststuff h2 {
+	margin-left: 0;
+}
+
+#bh {
+	margin: 7px 10px 0 0;
+	float: right;
+}
+
+/* without this dashboard widgets appear in one column for some screen widths */
+div#dashboard-widgets {
+	padding-right: 1px;
+}
+
+.tagchecklist span, .tagchecklist span a {
+	display: inline-block;
+	display: block;
+}
+
+.tagchecklist span a {
+	margin: 4px 0 0 -9px;
+}
+
+.tablenav .button-secondary, .nav .button-secondary {
+	padding: 0 1px;
+	vertical-align: middle;
+}
+
+.tablenav select {
+	font-size: 13px;
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 2px;
+}
+
+.tablenav .actions select {
+	width: 155px;
+}
+
+table.ie-fixed {
+	table-layout: fixed;
+}
+
+.widefat tr, .widefat th {
+	margin-bottom: 0;
+	border-spacing: 0;
+}
+
+.widefat th input {
+	margin: 0 0 0 5px;
+}
+
+.widefat .check-column {
+	padding: 6px 0 2px;
+}
+
+.widefat tbody th.check-column {
+	padding: 4px 0 22px;
+}
+
+.widefat {
+	empty-cells: show;
+	border-collapse: collapse;
+}
+
+.tablenav a.button-secondary {
+	display: inline-block;
+	padding: 2px 5px;
+}
+
+* html .stuffbox,
+* html .stuffbox input,
+* html .stuffbox textarea {
+	border: 1px solid #DFDFDF;
+}
+
+* html .feature-filter .feature-group li {
+	width: 145px;
+}
+
+* html .widget-top .widget-title-action a {
+	background: url("../images/menu-bits.gif?ver=20100610") no-repeat scroll 0 -110px;
+}
+
+* html div.widget-liquid-left {
+	width: 99%;
+}
+
+#wp_inactive_widgets {
+	padding-bottom: 8px;
+}
+
+* html .widgets-sortables {
+	height: 50px;
+}
+
+* html a#content_resize {
+	right: -2px;
+}
+
+* html .widget-title h4 {
+	width: 205px;
+}
+
+* html #removing-widget .in-widget-title {
+	display: none;
+}
+
+#available-widgets .widget-holder {
+	padding-bottom: 65px;
+}
+
+#widgets-left .inactive {
+	padding-bottom: 10px;
+}
+
+.widget-liquid-right .widget,
+#wp_inactive_widgets .widget {
+	position: relative;
+}
+
+* html .media-item .pinkynail {
+	height: 32px;
+	width: 40px;
+}
+
+#wpcontent .button-primary-disabled {
+	color: #9FD0D5;
+	background: #298CBA;
+}
+
+#wpcontent #ajax-loading {
+	vertical-align: baseline;
+}
+
+* html .describe .field input.text,
+* html .describe .field textarea {
+	width: 440px;
+}
+
+#the-comment-list .unapproved tr,
+#the-comment-list .unapproved td {
+	background-color: #ffffe0;
+}
+
+.imgedit-submit {
+	width: 300px;
+}
+
+* html input {
+	border: 1px solid #dfdfdf;
+}
+
+#nav-menu-header,
+#nav-menus-frame,
+#wpbody,
+.menu li {
+	zoom:100%;
+}
+
+#update-nav-menu #post-body {
+	overflow:hidden;
+}
+
+.menu li {
+	min-width:100%;
+}
+
+.menu li.sortable-placeholder {
+	min-width:400px;
+}
--- a/wp-admin/css/install-rtl.css
+++ b/wp-admin/css/install-rtl.css
@@ -1,16 +1 @@
-body {
-	font-family: Tahoma, arial;
-}
-h1 {
-	font-family: arial;
-	margin: 5px -4px 0 0;
-}
-ul, ol { padding: 5px 22px 5px 5px; }
-.step, th { text-align: right; }
-.submit input, .button, .button-secondary {
-	font-family: Tahoma, arial;
-	margin-right:0;
-}
-.form-table th {
-	text-align: right;
-}
+body{font-family:Tahoma,arial;}h1{font-family:arial;margin:5px -4px 0 0;}ul,ol{padding:5px 22px 5px 5px;}.step,th{text-align:right;}.submit input,.button,.button-secondary{font-family:Tahoma,arial;margin-right:0;}.form-table th{text-align:right;}#user_login,#admin_email,#pass1,#pass2{direction:ltr;}
--- a/wp-admin/css/install-rtl.dev.css
+++ b/wp-admin/css/install-rtl.dev.css
@@ -0,0 +1,23 @@
+body {
+	font-family: Tahoma, arial;
+}
+h1 {
+	font-family: arial;
+	margin: 5px -4px 0 0;
+}
+ul, ol {
+	padding: 5px 22px 5px 5px;
+}
+.step, th {
+	text-align: right;
+}
+.submit input, .button, .button-secondary {
+	font-family: Tahoma, arial;
+	margin-right: 0;
+}
+.form-table th {
+	text-align: right;
+}
+#user_login, #admin_email, #pass1, #pass2 {
+	direction: ltr;
+}
--- a/wp-admin/css/install.css
+++ b/wp-admin/css/install.css
@@ -1 +1 @@
-html{background:#f7f7f7;}body{background:#fff;color:#333;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;margin:2em auto 0 auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li{padding-bottom:2px;font-size:12px;line-height:18px;}code{font-size:13px;}ul,ol{padding:5px 5px 5px 22px;}#logo{margin:6px 0 14px 0;border-bottom:none;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:110px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code{font-family:Consolas,Monaco,Courier,monospace;}
+html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;margin:2em auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li,dd,dt{padding-bottom:2px;font-size:12px;line-height:18px;}code,.code{font-size:13px;}ul,ol,dl{padding:5px 5px 5px 22px;}a img{border:0;}abbr{border:0;font-variant:normal;}#logo{margin:6px 0 14px 0;border-bottom:none;text-align:center;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}textarea{border:1px solid #bbb;-moz-border-radius:4px;-khtml-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:130px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}.form-table th p{font-weight:normal;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code,.code{font-family:Consolas,Monaco,Courier,monospace;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 5px 5px 1px;padding:5px;text-align:center;width:200px;}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important;}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important;}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important;}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important;}.message{border:1px solid #e6db55;padding:.3em .6em;margin:5px 0 15px;background-color:#ffffe0;}
--- a/wp-admin/css/install.dev.css
+++ b/wp-admin/css/install.dev.css
@@ -1,10 +1,12 @@
-html { background: #f7f7f7; }
+html {
+	background: #f9f9f9;
+}

 body {
 	background: #fff;
 	color: #333;
 	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-	margin: 2em auto 0 auto;
+	margin: 2em auto;
 	width: 700px;
 	padding: 1em 2em;
 	-moz-border-radius: 11px;
@@ -14,9 +16,14 @@ body {
 	border: 1px solid #dfdfdf;
 }

-a { color: #2583ad; text-decoration: none; }
+a {
+	color: #2583ad;
+	text-decoration: none;
+}

-a:hover { color: #d54e21; }
+a:hover {
+	color: #d54e21;
+}

 h1 {
 	border-bottom: 1px solid #dadada;
@@ -28,25 +35,43 @@ h1 {
 	padding-bottom: 7px;
 }

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

-p, li {
+p, li, dd, dt {
 	padding-bottom: 2px;
 	font-size: 12px;
 	line-height: 18px;
 }

-code { font-size: 13px; }
+code, .code {
+	font-size: 13px;
+}

-ul, ol { padding: 5px 5px 5px 22px; }
-
-#logo { margin: 6px 0 14px 0; border-bottom: none;}
+ul, ol, dl {
+	padding: 5px 5px 5px 22px;
+}

+a img {
+	border:0
+}
+abbr {
+	border: 0;
+	font-variant: normal;
+}
+#logo {
+	margin: 6px 0 14px 0;
+	border-bottom: none;
+	text-align:center
+}
 .step {
 	margin: 20px 0 15px;
 }
-
-.step, th { text-align: left; padding: 0; }
+.step, th {
+	text-align: left;
+	padding: 0;
+}

 .submit input, .button, .button-secondary {
 	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
@@ -80,6 +105,14 @@ ul, ol { padding: 5px 5px 5px 22px; }
 	background: #eee url(../images/white-grad-active.png) repeat-x scroll left top;
 }

+textarea {
+	border: 1px solid #bbb;
+	-moz-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
 .form-table {
 	border-collapse: collapse;
 	margin-top: 1em;
@@ -98,7 +131,7 @@ ul, ol { padding: 5px 5px 5px 22px; }
 	text-align: left;
 	padding: 16px 10px 10px 10px;
 	border-bottom: 8px solid #fff;
-	width: 110px;
+	width: 130px;
 	vertical-align: top;
 }

@@ -122,7 +155,13 @@ ul, ol { padding: 5px 5px 5px 22px; }
 	padding: 2px;
 }

-#error-page { margin-top: 50px; }
+.form-table th p {
+	font-weight: normal;
+}
+
+#error-page {
+	margin-top: 50px;
+}

 #error-page p {
 	font-size: 12px;
@@ -130,4 +169,44 @@ ul, ol { padding: 5px 5px 5px 22px; }
 	margin: 25px 0 20px;
 }

-#error-page code { font-family: Consolas, Monaco, Courier, monospace; }
+#error-page code, .code {
+	font-family: Consolas, Monaco, Courier, monospace;
+}
+
+#pass-strength-result {
+	background-color: #eee;
+	border-color: #ddd !important;
+	border-style: solid;
+	border-width: 1px;
+	margin: 5px 5px 5px 1px;
+	padding: 5px;
+	text-align: center;
+	width: 200px;
+}
+
+#pass-strength-result.bad {
+	background-color: #ffb78c;
+	border-color: #ff853c !important;
+}
+
+#pass-strength-result.good {
+	background-color: #ffec8b;
+	border-color: #ffcc00 !important;
+}
+
+#pass-strength-result.short {
+	background-color: #ffa0a0;
+	border-color: #f04040 !important;
+}
+
+#pass-strength-result.strong {
+	background-color: #c3ff88;
+	border-color: #8dff1c !important;
+}
+
+.message {
+	border: 1px solid #e6db55;
+	padding: 0.3em 0.6em;
+	margin: 5px 0 15px;
+	background-color: #ffffe0;
+}
--- a/wp-admin/css/login-rtl.css
+++ b/wp-admin/css/login-rtl.css
@@ -1,30 +1 @@
-body {
-	font-family: Tahoma, arial;
-}
-form {
-	margin-right: 8px;
-	margin-left: 0;
-}
-form .forgetmenot {
-	float: right;
-}
-#login form .submit input {
-	font-family: Tahoma, arial;
-}
-form .submit { float: left; }
-#backtoblog a {
-	left: auto;
-	right: 15px;
-}
-#login_error, .message {
-	margin: 0 8px 16px 0;
-}
-#nav { margin: 0 8px 0 0; }
-#user_pass, #user_login, #user_email {
-	margin-left: 6px;
-	margin-right: 0;
-	direction:ltr;
-}
-h1 a {
-	text-decoration: none;
-}
+body{font-family:Tahoma,arial;}form{margin-right:8px;margin-left:0;}form .forgetmenot{float:right;}#login form .submit input{font-family:Tahoma,arial;}form .submit{float:left;}#backtoblog a{padding:8px 15px 0 0;}#login_error,.message{margin:0 8px 16px 0;}#nav{margin:0 8px 0 0;}#user_pass,#user_login,#user_email{margin-left:6px;margin-right:0;direction:ltr;}h1 a{text-decoration:none;}
--- a/wp-admin/css/login-rtl.dev.css
+++ b/wp-admin/css/login-rtl.dev.css
@@ -0,0 +1,29 @@
+body {
+	font-family: Tahoma, arial;
+}
+form {
+	margin-right: 8px;
+	margin-left: 0;
+}
+form .forgetmenot {
+	float: right;
+}
+#login form .submit input {
+	font-family: Tahoma, arial;
+}
+form .submit { float: left; }
+#backtoblog a {
+	padding: 8px 15px 0 0;
+}
+#login_error, .message {
+	margin: 0 8px 16px 0;
+}
+#nav { margin: 0 8px 0 0; }
+#user_pass, #user_login, #user_email {
+	margin-left: 6px;
+	margin-right: 0;
+	direction:ltr;
+}
+h1 a {
+	text-decoration: none;
+}
--- a/wp-admin/css/login.css
+++ b/wp-admin/css/login.css
@@ -1 +1 @@
-*{margin:0;padding:0;}body{border-top-width:30px;border-top-style:solid;font:11px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}form{margin-left:8px;padding:16px 16px 40px 16px;font-weight:normal;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:5px;background:#fff;border:1px solid #e5e5e5;-moz-box-shadow:rgba(200,200,200,1) 0 4px 18px;-webkit-box-shadow:rgba(200,200,200,1) 0 4px 18px;-khtml-box-shadow:rgba(200,200,200,1) 0 4px 18px;box-shadow:rgba(200,200,200,1) 0 4px 18px;}form .forgetmenot{font-weight:normal;float:left;margin-bottom:0;}.button-primary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;padding:3px 10px;border:none;font-size:12px;border-width:1px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;cursor:pointer;text-decoration:none;margin-top:-3px;}#login form p{margin-bottom:0;}label{color:#777;font-size:13px;}form .forgetmenot label{font-size:11px;line-height:19px;}form .submit,.alignright{float:right;}form p{margin-bottom:24px;}h1 a{background:url(../images/logo-login.gif) no-repeat top center;width:326px;height:67px;text-indent:-9999px;overflow:hidden;padding-bottom:15px;display:block;}#nav{text-shadow:rgba(255,255,255,1) 0 1px 0;}#backtoblog a{position:absolute;top:7px;left:15px;text-decoration:none;}#login{width:320px;margin:7em auto;}#login_error,.message{margin:0 0 16px 8px;border-width:1px;border-style:solid;padding:12px;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}#nav{margin:0 0 0 8px;padding:16px;}#user_pass,#user_login,#user_email{font-size:24px;width:97%;padding:3px;margin-top:2px;margin-right:6px;margin-bottom:16px;border:1px solid #e5e5e5;background:#fbfbfb;}input{color:#555;}.clear{clear:both;}
+*{margin:0;padding:0;}body{padding-top:30px;font:11px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}form{margin-left:8px;padding:16px 16px 40px 16px;font-weight:normal;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:5px;background:#fff;border:1px solid #e5e5e5;-moz-box-shadow:rgba(200,200,200,1) 0 4px 18px;-webkit-box-shadow:rgba(200,200,200,1) 0 4px 18px;-khtml-box-shadow:rgba(200,200,200,1) 0 4px 18px;box-shadow:rgba(200,200,200,1) 0 4px 18px;}form .forgetmenot{font-weight:normal;float:left;margin-bottom:0;}.button-primary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;padding:3px 10px;border:none;font-size:12px;border-width:1px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;cursor:pointer;text-decoration:none;margin-top:-3px;}#login form p{margin-bottom:0;}label{color:#777;font-size:13px;}form .forgetmenot label{font-size:11px;line-height:19px;}form .submit,.alignright{float:right;}form p{margin-bottom:24px;}h1 a{background:url(../images/logo-login.gif) no-repeat top center;width:326px;height:67px;text-indent:-9999px;overflow:hidden;padding-bottom:15px;display:block;}#nav{text-shadow:rgba(255,255,255,1) 0 1px 0;}#backtoblog{position:absolute;top:0;left:0;border-bottom:#c6c6c6 1px solid;background:#d9d9d9;background:-moz-linear-gradient(bottom,#d7d7d7,#e4e4e4);background:-webkit-gradient(linear,left bottom,left top,from(#d7d7d7),to(#e4e4e4));height:30px;width:100%;}#backtoblog a{text-decoration:none;display:block;padding:8px 0 0 15px;}#login{width:320px;margin:7em auto;}#login_error,.message{margin:0 0 16px 8px;border-width:1px;border-style:solid;padding:12px;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}#nav{margin:0 0 0 8px;padding:16px;}#user_pass,#user_login,#user_email{font-size:24px;width:97%;padding:3px;margin-top:2px;margin-right:6px;margin-bottom:16px;border:1px solid #e5e5e5;background:#fbfbfb;}input{color:#555;}.clear{clear:both;}
--- a/wp-admin/css/login.dev.css
+++ b/wp-admin/css/login.dev.css
@@ -1,8 +1,7 @@
 * { margin: 0; padding: 0; }

 body {
-	border-top-width: 30px;
-	border-top-style: solid;
+	padding-top: 30px;
 	font: 11px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
 }

@@ -81,11 +80,22 @@ h1 a {
 	text-shadow: rgba(255,255,255,1) 0 1px 0;
 }

-#backtoblog a {
+#backtoblog {
 	position: absolute;
-	top: 7px;
-	left: 15px;
+	top: 0;
+	left: 0;
+	border-bottom: #c6c6c6 1px solid;
+	background: #d9d9d9; /* fallback color */
+	background: -moz-linear-gradient(bottom,  #d7d7d7,  #e4e4e4);
+	background: -webkit-gradient(linear, left bottom, left top, from(#d7d7d7), to(#e4e4e4));
+	height: 30px;
+	width: 100%;
+}
+
+#backtoblog a {
 	text-decoration: none;
+	display: block;
+	padding: 8px 0 0 15px;
 }

 #login { width: 320px; margin: 7em auto; }
--- a/wp-admin/css/media-rtl.css
+++ b/wp-admin/css/media-rtl.css
@@ -1,85 +1 @@
-body#media-upload ul#sidemenu {
-	left: auto;
-	right: 0;
-}
-#search-filter {
-	text-align: left;
-}
-/* specific to the image upload form */
-.align .field label {
-	padding: 0 28px 0 0;
-	margin: 0 0 0 1em;
-}
-.image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label {
-	background-position: center right;
-}
-tr.image-size div.image-size-item {
-	float: right;
-}
-tr.image-size label {
-	margin: 0 1em 0 0;
-}
-.filename.original {
-	float: right;
-}
-.crunching {
-	text-align: left;
-	margin-right: 0;
-	margin-left: 5px;
-}
-button.dismiss {
-	right: auto;
-	left: 5px;
-}
-.file-error {
-	margin: 0 50px 5px 0;
-}
-.progress {
-	left: auto;
-	right: 0;
-}
-.describe td {
-	padding: 0 0 0 5px;
-}
-.bar {
-	border-right-width: 0;
-	border-left-width: 3px;
-	border-right-style: none;
-	border-left-style: solid;
-}
-
-/* Specific to Uploader */
-#media-upload .media-upload-form p {
-	margin: 0 0 1em 1em;
-}
-.filename {
-	float: right;
-	margin-left: 0;
-	margin-right: 10px;
-}
-#media-upload .describe th.label {
-	text-align: right;
-}
-.menu_order {
-	float: left;
-}
-.media-upload-form label.form-help, td.help, #media-upload p.help, #media-upload label.help {
-	font-family: Tahoma, Arial;
-}
-#gallery-settings #basic th.label {
-	padding: 5px 0 5px 5px;
-}
-#gallery-settings .title, h3.media-title {
-	font-family: Tahoma, Arial;
-}
-#gallery-settings .describe th.label {
-	text-align: right;
-}
-#gallery-settings label,
-#gallery-settings legend {
-	margin-right: 0;
-	margin-left: 15px;
-}
-#gallery-settings .align .field label {
-	margin: 0 0 0 1.5em;
-}
+body#media-upload ul#sidemenu{left:auto;right:0;}#search-filter{text-align:left;}.align .field label{padding:0 28px 0 0;margin:0 0 0 1em;}.image-align-none-label,.image-align-left-label,.image-align-center-label,.image-align-right-label{background-position:center right;}tr.image-size div.image-size-item{float:right;}tr.image-size label{margin:0 1em 0 0;}.filename.original{float:right;}.crunching{text-align:left;margin-right:0;margin-left:5px;}button.dismiss{right:auto;left:5px;}.file-error{margin:0 50px 5px 0;}.progress{left:auto;right:0;}.describe td{padding:0 0 0 5px;}.bar{border-right-width:0;border-left-width:3px;border-right-style:none;border-left-style:solid;}#media-upload .media-upload-form p{margin:0 0 1em 1em;}.filename{float:right;margin-left:0;margin-right:10px;}#media-upload .describe th.label{text-align:right;}.menu_order{float:left;}.media-upload-form label.form-help,td.help,#media-upload p.help,#media-upload label.help{font-family:Tahoma,Arial;}#gallery-settings #basic th.label{padding:5px 0 5px 5px;}#gallery-settings .title,h3.media-title{font-family:Tahoma,Arial;}#gallery-settings .describe th.label{text-align:right;}#gallery-settings label,#gallery-settings legend{margin-right:0;margin-left:15px;}#gallery-settings .align .field label{margin:0 0 0 1.5em;}
--- a/wp-admin/css/media-rtl.dev.css
+++ b/wp-admin/css/media-rtl.dev.css
@@ -0,0 +1,85 @@
+body#media-upload ul#sidemenu {
+	left: auto;
+	right: 0;
+}
+#search-filter {
+	text-align: left;
+}
+/* specific to the image upload form */
+.align .field label {
+	padding: 0 28px 0 0;
+	margin: 0 0 0 1em;
+}
+.image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label {
+	background-position: center right;
+}
+tr.image-size div.image-size-item {
+	float: right;
+}
+tr.image-size label {
+	margin: 0 1em 0 0;
+}
+.filename.original {
+	float: right;
+}
+.crunching {
+	text-align: left;
+	margin-right: 0;
+	margin-left: 5px;
+}
+button.dismiss {
+	right: auto;
+	left: 5px;
+}
+.file-error {
+	margin: 0 50px 5px 0;
+}
+.progress {
+	left: auto;
+	right: 0;
+}
+.describe td {
+	padding: 0 0 0 5px;
+}
+.bar {
+	border-right-width: 0;
+	border-left-width: 3px;
+	border-right-style: none;
+	border-left-style: solid;
+}
+
+/* Specific to Uploader */
+#media-upload .media-upload-form p {
+	margin: 0 0 1em 1em;
+}
+.filename {
+	float: right;
+	margin-left: 0;
+	margin-right: 10px;
+}
+#media-upload .describe th.label {
+	text-align: right;
+}
+.menu_order {
+	float: left;
+}
+.media-upload-form label.form-help, td.help, #media-upload p.help, #media-upload label.help {
+	font-family: Tahoma, Arial;
+}
+#gallery-settings #basic th.label {
+	padding: 5px 0 5px 5px;
+}
+#gallery-settings .title, h3.media-title {
+	font-family: Tahoma, Arial;
+}
+#gallery-settings .describe th.label {
+	text-align: right;
+}
+#gallery-settings label,
+#gallery-settings legend {
+	margin-right: 0;
+	margin-left: 15px;
+}
+#gallery-settings .align .field label {
+	margin: 0 0 0 1.5em;
+}
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -1 +1 @@
-div#media-upload-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;height:2.5em;}body#media-upload ul#sidemenu{font-weight:normal;margin:0 5px;position:absolute;left:0;bottom:-1px;}div#media-upload-error{margin:1em;font-weight:bold;}form{margin:1em;}#search-filter{text-align:right;}th{position:relative;}.media-upload-form label.form-help,td.help{font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-style:italic;font-weight:normal;}.media-upload-form p.help{margin:0;padding:0;}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em 0;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{float:left;width:25%;margin:0;}#library-form .progress,#gallery-form .progress,#flash-upload-ui,.insert-gallery,.describe.startopen,.describe.startclosed{display:none;}.media-item .thumbnail{max-width:128px;max-height:128px;}thead.media-item-info tr{background-color:transparent;}thead.media-item-info th,thead.media-item-info td{border:none;margin:0;}.form-table thead.media-item-info{border:8px solid #fff;}abbr.required{text-decoration:none;border:none;}.describe label{display:inline;}.describe td{vertical-align:middle;padding:0 5px 8px 0;}.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;}.hidden{height:0;width:0;overflow:hidden;border:none;}#media-upload p.ml-submit{padding:1em 0;}#media-upload p.help,#media-upload label.help{font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-style:italic;font-weight:normal;}#media-upload tr.image-size td.field{text-align:center;}#media-upload #media-items{border-width:1px;border-style:solid;border-bottom:none;width:623px;}#media-upload .media-item{border-bottom-width:1px;border-bottom-style:solid;min-height:36px;width:100%;}#media-upload .ui-sortable .media-item{cursor:move;}.filename{line-height:36px;padding:0 10px;overflow:hidden;}#media-upload .describe{padding:5px;width:100%;clear:both;cursor:default;}#media-upload .slidetoggle{border-top-width:1px;border-top-style:solid;}#media-upload .describe th.label{padding-top:.2em;text-align:left;min-width:120px;}#media-upload tr.align td.field{text-align:center;}#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-items a.delete{display:block;float:right;}#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:normal;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 1.5em 0 0;}#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;}
+div#media-upload-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;}body#media-upload ul#sidemenu{font-weight:normal;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden;}div#media-upload-error{margin:1em;font-weight:bold;}form{margin:1em;}#search-filter{text-align:right;}th{position:relative;}.media-upload-form label.form-help,td.help{font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-style:italic;font-weight:normal;}.media-upload-form p.help{margin:0;padding:0;}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em 0;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{float:left;width:25%;margin:0;}#library-form .progress,#gallery-form .progress,#flash-upload-ui,.insert-gallery,.describe.startopen,.describe.startclosed{display:none;}.media-item .thumbnail{max-width:128px;max-height:128px;}thead.media-item-info tr{background-color:transparent;}thead.media-item-info th,thead.media-item-info td{border:none;margin:0;}.form-table thead.media-item-info{border:8px solid #fff;}abbr.required{text-decoration:none;border:none;}.describe label{display:inline;}.describe td{vertical-align:middle;padding:0 5px 8px 0;}.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;}.hidden{height:0;width:0;overflow:hidden;border:none;}#media-upload p.ml-submit{padding:1em 0;}#media-upload p.help,#media-upload label.help{font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-style:italic;font-weight:normal;}#media-upload tr.image-size td.field{text-align:center;}#media-upload #media-items{border-width:1px;border-style:solid;border-bottom:none;width:623px;}#media-upload .media-item{border-bottom-width:1px;border-bottom-style:solid;min-height:36px;width:100%;}#media-upload .ui-sortable .media-item{cursor:move;}.filename{line-height:36px;padding:0 10px;overflow:hidden;}#media-upload .describe{width:100%;clear:both;cursor:default;}#media-upload .slidetoggle{border-top-width:1px;border-top-style:solid;}#media-upload .describe th.label{padding-top:.2em;text-align:left;min-width:120px;}#media-upload tr.align td.field{text-align:center;}#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-items a.delete{display:block;float:right;}#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:normal;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 1.5em 0 0;}#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;}
--- a/wp-admin/css/media.dev.css
+++ b/wp-admin/css/media.dev.css
@@ -5,15 +5,15 @@ div#media-upload-header {
 	position: relative;
 	border-bottom-width: 1px;
 	border-bottom-style: solid;
-	height: 2.5em;
 }

 body#media-upload ul#sidemenu {
 	font-weight: normal;
 	margin: 0 5px;
-	position: absolute;
-	left: 0px;
+	left: 0;
 	bottom: -1px;
+	float: none;
+	overflow: hidden;
 }

 div#media-upload-error {
@@ -187,7 +187,6 @@ abbr.required {
 }

 #media-upload .describe {
-	padding: 5px;
 	width: 100%;
 	clear: both;
 	cursor: default;
--- a/wp-admin/css/ms.css
+++ b/wp-admin/css/ms.css
@@ -0,0 +1 @@
+#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;padding-left:16px;position:static;}#dashboard_right_now td.b a.musublink{font-size:16px;}#dashboard_right_now div.musubtable{border-top:none;}#dashboard_right_now div.musubtable .t{white-space:normal;}.ms-sites-php .postbox h3{cursor:auto;}.ms-sites-php .postbox .description{margin:10px 0 0;padding:0 10px 10px;border-bottom:1px solid #DFDFDF;}tr.site-deleted{background:#ff8573;}tr.site-spammed{background:#faa;}tr.site-archived{background:#ffebe8;}tr.site-mature{background:#fecac2;}
--- a/wp-admin/css/ms.dev.css
+++ b/wp-admin/css/ms.dev.css
@@ -0,0 +1,44 @@
+/* Dashboard: MS Specific Data */
+#dashboard_right_now p.musub {
+	margin-top: 12px;
+	border-top: 1px solid #ececec;
+	padding-left: 16px;
+	position: static;
+}
+
+#dashboard_right_now td.b a.musublink {
+	font-size: 16px;
+}
+
+#dashboard_right_now div.musubtable {
+	border-top: none;
+}
+
+#dashboard_right_now div.musubtable .t {
+	white-space: normal;
+}
+
+/* No drag and drop on ms-sites.php */
+.ms-sites-php .postbox h3 {
+	cursor: auto;
+}
+
+.ms-sites-php .postbox .description {
+	margin:10px 0 0px;
+	padding:0px 10px 10px;
+	border-bottom:1px solid #DFDFDF;
+}
+
+/* Background Color for Site Status */
+tr.site-deleted {
+	background: #ff8573;
+}
+tr.site-spammed {
+	background: #faa;
+}
+tr.site-archived {
+	background:#ffebe8;
+}
+tr.site-mature {
+	background: #fecac2;
+}
--- a/wp-admin/css/nav-menu-rtl.css
+++ b/wp-admin/css/nav-menu-rtl.css
@@ -0,0 +1 @@
+#nav-menus-frame{margin-right:300px;margin-left:0;}#wpbody-content #menu-settings-column{margin-right:-300px;margin-left:0;float:right;}#menu-management-liquid{float:right;}#menu-management{margin-left:20px;margin-right:0;}#post-body{padding:0 10px 10px 0;}.post-body-plain{padding:10px 0 0 10px;}#menu-management .nav-tabs-arrow-left{right:0;left:auto;}#menu-management .nav-tabs-arrow-right{left:0;right:auto;text-align:left;}#menu-management .nav-tabs{padding-right:20px;padding-left:10px;}.js #menu-management .nav-tabs{float:right;margin-right:0;margin-left:-400px;}#select-nav-menu-container{text-align:left;}#wpbody .open-label{float:right;}#wpbody .open-label span{padding-left:10px;padding-right:0;}.js .input-with-default-title{font-style:normal;font-weight:bold;}.postbox .howto input{float:left;}#nav-menu-theme-locations .button-controls{text-align:left;}.meta-sep,.submitdelete,.submitcancel{float:right;}#cancel-save{margin-right:20px;margin-left:0;}.list-controls{float:right;}.add-to-menu{float:left;}#add-custom-link label span{float:right;padding-left:5px;padding-right:0;}.howto span{float:right;}.list li .menu-item-title input{margin-left:3px;margin-right:0;}.menu-item-handle{padding-right:10px;padding-left:0;}.menu-item-edit-active .menu-item-handle{-moz-border-radius:6px 6px 0 0;-webkit-border-bottom-left-radius:0;-webkit-border-bottom-right-radius:0;-khtml-border-bottom-left-radius:0;-khtml-border-bottom-right-radius:0;border-bottom-left-radius:0;border-bottom-right-radius:0;}.menu-item-handle .item-title{margin-left:13em;margin-right:0;}.menu-item-depth-0{margin-right:0;margin-left:0;}.menu-item-depth-1{margin-right:30px;margin-left:0;}.menu-item-depth-2{margin-right:60px;margin-left:0;}.menu-item-depth-3{margin-right:90px;margin-left:0;}.menu-item-depth-4{margin-right:120px;margin-left:0;}.menu-item-depth-5{margin-right:150px;margin-left:0;}.menu-item-depth-6{margin-right:180px;margin-left:0;}.menu-item-depth-7{margin-right:210px;margin-left:0;}.menu-item-depth-8{margin-right:240px;margin-left:0;}.menu-item-depth-9{margin-right:270px;margin-left:0;}.menu-item-depth-10{margin-right:300px;margin-left:0;}.menu-item-depth-11{margin-right:330px;margin-left:0;}.menu-item-depth-0 .menu-item-transport{margin-right:0;margin-left:0;}.menu-item-depth-1 .menu-item-transport{margin-right:-30px;margin-left:0;}.menu-item-depth-2 .menu-item-transport{margin-right:-60px;margin-left:0;}.menu-item-depth-3 .menu-item-transport{margin-right:-90px;margin-left:0;}.menu-item-depth-4 .menu-item-transport{margin-right:-120px;margin-left:0;}.menu-item-depth-5 .menu-item-transport{margin-right:-150px;margin-left:0;}.menu-item-depth-6 .menu-item-transport{margin-right:-180px;margin-left:0;}.menu-item-depth-7 .menu-item-transport{margin-right:-210px;margin-left:0;}.menu-item-depth-8 .menu-item-transport{margin-right:-240px;margin-left:0;}.menu-item-depth-9 .menu-item-transport{margin-right:-270px;margin-left:0;}.menu-item-depth-10 .menu-item-transport{margin-right:-300px;margin-left:0;}.menu-item-depth-11 .menu-item-transport{margin-right:-330px;margin-left:0;}.item-type{padding-left:10px;padding-right:0;}.item-controls{left:20px;right:auto;}.item-controls .item-order{padding-left:10px;padding-right:0;}.item-edit{background-image:url("../images/menu-bits-rtl.gif?ver=20100531");background-position:100% -105px;left:-20px;right:auto;-moz-border-radius-bottomright:3px;-moz-border-radius-bottomleft:0;-webkit-border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:0;-khtml-border-bottom-right-radius:3px;-khtml-border-bottom-left-radius:0;border-bottom-right-radius:3px;border-bottom-left-radius:0;}.menu-item-settings{padding:10px 10px 10px 0;border-width:0 1px 1px 1px;}.link-to-original{font-style:normal;font-weight:bold;}.link-to-original a{padding-right:4px;padding-left:0;}.menu-item-settings .description-thin,.menu-item-settings .description-wide{margin-left:10px;margin-right:0;float:right;}.major-publishing-actions .publishing-action{text-align:left;float:left;}.major-publishing-actions .delete-action{text-align:right;float:right;padding-left:15px;padding-right:0;}.menu-name-label{margin-left:15px;margin-right:0;}.auto-add-pages{float:right;}
--- a/wp-admin/css/nav-menu-rtl.dev.css
+++ b/wp-admin/css/nav-menu-rtl.dev.css
@@ -0,0 +1,206 @@
+#nav-menus-frame {
+	margin-right: 300px;
+	margin-left: 0;
+}
+
+#wpbody-content #menu-settings-column {
+	margin-right: -300px;
+	margin-left: 0;
+	float: right;
+}
+
+/* Menu Container */
+#menu-management-liquid {
+	float: right;
+}
+#menu-management {
+	margin-left: 20px;
+	margin-right: 0;
+}
+
+
+	#post-body {
+		padding:0 10px 10px 0;
+	}
+
+	.post-body-plain {
+		padding: 10px 0 0 10px;
+	}
+
+/* Menu Tabs */
+
+	#menu-management .nav-tabs-arrow-left {
+		right: 0;
+		left:auto;
+	}
+	#menu-management .nav-tabs-arrow-right {
+		left: 0;
+		right:auto;
+		text-align: left;
+	}
+
+#menu-management .nav-tabs {
+	padding-right: 20px;
+	padding-left: 10px;
+}
+.js #menu-management .nav-tabs {
+	float: right;
+	margin-right: 0px;
+	margin-left: -400px;
+}
+
+#select-nav-menu-container {
+	text-align: left;
+}
+
+#wpbody .open-label {
+	float:right;
+}
+
+#wpbody .open-label span {
+	padding-left: 10px;
+	padding-right:0;
+}
+
+	.js .input-with-default-title {
+		font-style: normal;
+		font-weight:bold;
+	}
+
+/* Add Menu Item Boxes */
+.postbox .howto input {
+	float: left;
+}
+#nav-menu-theme-locations .button-controls {
+	text-align: left;
+}
+
+/* Button Primary Actions */
+
+.meta-sep,
+.submitdelete,
+.submitcancel {
+	float:right;
+}
+
+#cancel-save { margin-right: 20px; margin-left: 0; }
+
+/* Button Secondary Actions */
+.list-controls { float: right;  }
+.add-to-menu {
+	float: left;
+}
+
+/* Custom Links */
+#add-custom-link label span { float: right; padding-left: 5px; padding-right:0;}
+.howto span { float: right; }
+
+.list li .menu-item-title input { margin-left: 3px; margin-right: 0 }
+
+/* Nav Menu */
+.menu-item-handle {
+	padding-right: 10px;
+	padding-left: 0;
+}
+.menu-item-edit-active .menu-item-handle {
+	-moz-border-radius: 6px 6px 0 0;
+	-webkit-border-bottom-left-radius: 0;
+	-webkit-border-bottom-right-radius: 0;
+	-khtml-border-bottom-left-radius: 0;
+	-khtml-border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+.menu-item-handle .item-title {
+	margin-left:13em;
+	margin-right:0;
+}
+
+
+/* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */
+.menu-item-depth-0 { margin-right: 0px; margin-left:0;}
+.menu-item-depth-1 { margin-right: 30px; margin-left:0;}
+.menu-item-depth-2 { margin-right: 60px; margin-left:0;}
+.menu-item-depth-3 { margin-right: 90px; margin-left:0;}
+.menu-item-depth-4 { margin-right: 120px; margin-left:0;}
+.menu-item-depth-5 { margin-right: 150px; margin-left:0;}
+.menu-item-depth-6 { margin-right: 180px; margin-left:0;}
+.menu-item-depth-7 { margin-right: 210px; margin-left:0;}
+.menu-item-depth-8 { margin-right: 240px; margin-left:0;}
+.menu-item-depth-9 { margin-right: 270px; margin-left:0;}
+.menu-item-depth-10 { margin-right: 300px; margin-left:0;}
+.menu-item-depth-11 { margin-right: 330px; margin-left:0;}
+
+.menu-item-depth-0 .menu-item-transport { margin-right: 0px; margin-left:0;}
+.menu-item-depth-1 .menu-item-transport { margin-right: -30px; margin-left:0;}
+.menu-item-depth-2 .menu-item-transport { margin-right: -60px; margin-left:0;}
+.menu-item-depth-3 .menu-item-transport { margin-right: -90px; margin-left:0;}
+.menu-item-depth-4 .menu-item-transport { margin-right: -120px; margin-left:0;}
+.menu-item-depth-5 .menu-item-transport { margin-right: -150px; margin-left:0;}
+.menu-item-depth-6 .menu-item-transport { margin-right: -180px; margin-left:0;}
+.menu-item-depth-7 .menu-item-transport { margin-right: -210px; margin-left:0;}
+.menu-item-depth-8 .menu-item-transport { margin-right: -240px; margin-left:0;}
+.menu-item-depth-9 .menu-item-transport { margin-right: -270px; margin-left:0;}
+.menu-item-depth-10 .menu-item-transport { margin-right: -300px; margin-left:0;}
+.menu-item-depth-11 .menu-item-transport { margin-right: -330px; margin-left:0;}
+
+/* Menu item controls */
+.item-type { padding-left: 10px;  padding-right:0;}
+.item-controls { left: 20px; right: auto;}
+.item-controls .item-order { padding-left: 10px; padding-right: 0;}
+
+.item-edit {
+	background-image: url("../images/menu-bits-rtl.gif?ver=20100531");
+	background-position: 100% -105px;
+	left: -20px;
+	right:auto;
+	-moz-border-radius-bottomright: 3px;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-right-radius: 3px;
+	-webkit-border-bottom-left-radius: 0;
+	-khtml-border-bottom-right-radius: 3px;
+	-khtml-border-bottom-left-radius: 0;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 0;
+}
+
+/* Menu editing */
+.menu-item-settings {
+	padding: 10px 10px 10px 0;
+	border-width: 0 1px 1px 1px;
+}
+
+.link-to-original {
+	font-style: normal;
+	font-weight: bold;
+}
+	.link-to-original a {
+		padding-right: 4px;
+		padding-left:0;
+	}
+
+.menu-item-settings .description-thin,
+.menu-item-settings .description-wide {
+	margin-left: 10px;
+	margin-right:0;
+	float: right;
+}
+
+/* Major/minor publishing actions (classes) */
+.major-publishing-actions .publishing-action {
+	text-align: left;
+	float: left;
+}
+.major-publishing-actions .delete-action {
+	text-align: right;
+	float: right;
+	padding-left: 15px;
+	padding-right:0;
+}
+.menu-name-label {
+	margin-left: 15px;
+	margin-right:0;
+}
+.auto-add-pages {
+	float: right;
+}
--- a/wp-admin/css/nav-menu.css
+++ b/wp-admin/css/nav-menu.css
--- a/wp-admin/css/nav-menu.dev.css
+++ b/wp-admin/css/nav-menu.dev.css
@@ -0,0 +1,570 @@
+/**
+ * WordPress Administration Custom Navigation
+ * Interface CSS
+ *
+ * @version 2.0.0
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+html,
+body {
+	min-width: 950px;
+}
+
+#nav-menus-frame {
+	margin-left: 300px;
+}
+
+#wpbody-content #menu-settings-column {
+	display:inline;
+	width:281px;
+	margin-left: -300px;
+	clear: both;
+	float: left;
+	padding-top: 24px;
+}
+	.no-js #wpbody-content #menu-settings-column {
+		padding-top: 31px;
+	}
+
+#menu-settings-column .inside {
+	clear: both;
+	padding:0 10px;
+}
+
+.metabox-holder-disabled .postbox {
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+}
+
+.metabox-holder-disabled .button-controls .select-all {
+	display: none;
+}
+#wpbody {
+	position: relative;
+}
+
+/* Menu Container */
+#menu-management-liquid {
+	float: left;
+	min-width: 100%;
+}
+#menu-management {
+	position: relative;
+	margin-right: 20px;
+	margin-top: -3px;
+	width: 100%;
+}
+	#menu-management .menu-edit {
+		margin-bottom: 20px;
+	}
+
+	#nav-menu-header, #post-body {
+		border-color: #ccc;
+		border-style: solid;
+	}
+
+	#nav-menu-header {
+		border-width: 1px 1px 0 1px;
+		-moz-border-radius-topleft: 6px;
+		-webkit-border-top-left-radius: 6px;
+		-khtml-border-top-left-radius: 6px;
+		border-top-left-radius: 6px;
+		-moz-border-radius-topright: 6px;
+		-webkit-border-top-right-radius: 6px;
+		-khtml-border-top-right-radius: 6px;
+		border-top-right-radius: 6px;
+	}
+
+	#post-body {
+		background: #fff;
+		padding: 10px;
+		border-width: 0 1px 1px 1px;
+		-moz-border-radius-bottomleft: 6px;
+		-webkit-border-bottom-left-radius: 6px;
+		-khtml-border-bottom-left-radius: 6px;
+		border-bottom-left-radius: 6px;
+		-moz-border-radius-bottomright: 6px;
+		-webkit-border-bottom-right-radius: 6px;
+		-khtml-border-bottom-right-radius: 6px;
+		border-bottom-right-radius: 6px;
+	}
+
+	#post-body div.updated {
+		margin: 0;
+	}
+
+	#post-body-content {
+		position: relative;
+	}
+
+	#menu-management .menu-add-new abbr {
+		font-weight:bold;
+	}
+
+/* Menu Tabs */
+
+#menu-management .nav-tabs-nav {
+	margin: 0 20px;
+}
+
+#menu-management .nav-tabs-arrow {
+	width: 10px;
+	padding: 0 5px 4px;
+	cursor: pointer;
+	position: absolute;
+	top: 0;
+	line-height: 22px;
+	font-size: 18px;
+	text-shadow: 0 1px 0 #fff;
+}
+	#menu-management .nav-tabs-arrow a { color: #C1C1C1; }
+	#menu-management .nav-tabs-arrow a:hover { color: #D54E21; }
+	#menu-management .nav-tabs-arrow a:active { color: #464646; }
+	#menu-management .nav-tabs-arrow-left {
+		left: 0;
+	}
+	#menu-management .nav-tabs-arrow-right {
+		right: 0;
+		text-align: right;
+	}
+
+
+#menu-management .nav-tabs-wrapper {
+	width: 100%;
+	height: 28px;
+	margin-bottom: -1px;
+	overflow: hidden;
+}
+
+#menu-management .nav-tabs {
+	padding-left: 20px;
+	padding-right: 10px;
+}
+.js #menu-management .nav-tabs {
+	float: left;
+	margin-left: 0px;
+	margin-right: -400px;
+}
+
+#menu-management .nav-tab {
+	margin-bottom: 0;
+	background: #f4f4f4;
+	font-weight: bold;
+	border-color: #dfdfdf;
+}
+
+#menu-management .nav-tab-active {
+	border-color:#ccc;
+}
+
+#select-nav-menu-container {
+	text-align: right;
+	padding: 0 10px 3px 10px;
+	margin-bottom: 5px;
+}
+	#select-nav-menu {
+		width: 100px;
+		display: inline;
+	}
+
+#menu-name-label {
+	margin-top: -2px;
+}
+
+#wpbody .open-label {
+	display: block;
+	float:left;
+}
+#wpbody .open-label span {
+	padding-right: 10px;
+}
+
+	.js .input-with-default-title {
+		color: #aaa;
+		font-style: italic;
+	}
+
+#menu-management .inside { padding: 0 10px; }
+
+/* Add Menu Item Boxes */
+.postbox .howto input {
+	width: 180px;
+	float: right;
+}
+.customlinkdiv .howto input {
+	width: 210px;
+}
+#nav-menu-theme-locations .howto select {
+	width: 100%;
+}
+#nav-menu-theme-locations .button-controls {
+	text-align: right;
+}
+.add-menu-item-view-all {
+	height: 400px;
+}
+
+/* Button Primary Actions */
+#menu-container .submit { margin: 0px 0px 10px; padding: 0px; }
+
+.meta-sep,
+.submitdelete,
+.submitcancel {
+	display:block;
+	float:left;
+	font-size: 11px;
+	margin: 4px 0;
+	line-height: 15px;
+}
+.meta-sep {
+	padding: 0 2px;
+}
+
+#cancel-save { color: #ff0000; text-decoration: underline; font-size: 11px; margin-left: 20px; margin-top: 5px; }
+#cancel-save:hover { background-color: #FF0000; color: #fff; }
+
+/* Button Secondary Actions */
+.list-controls { float: left; margin-top: 5px; }
+.add-to-menu {
+	float: right;
+}
+
+.postbox img.waiting {
+	display: none;
+	vertical-align: middle;
+}
+
+.button-controls {
+	clear:both;
+	margin: 10px 0;
+}
+.show-all, .hide-all { cursor: pointer; }
+.hide-all { display: none; }
+
+/* Create Menu */
+#menu-name { width: 270px; }
+#manage-menu .inside { padding: 0px 0px; }
+
+/* Custom Links */
+#available-links dt { display: block; }
+#add-custom-link .howto { font-size: 11px; }
+#add-custom-link label span { display: block; float: left; margin-top: 5px; padding-right: 5px; }
+.menu-item-textbox { width: 180px; }
+.howto span { margin-top: 4px; display: block; float: left; }
+
+/* Menu item types */
+.quick-search { width: 190px; }
+.list-wrap { display: none; clear: both; margin-bottom: 10px; }
+.list-container { max-height: 200px; overflow-y: auto; padding: 10px 10px 5px; border: 1px solid #DFDFDF; -moz-border-radius: 4px; }
+.postbox p.submit { margin-bottom: 0; }
+
+/* Listings */
+.list li { display: none; margin: 0; margin-bottom: 5px; }
+
+.list li .menu-item-title { cursor: pointer; display: block; }
+.list li .menu-item-title input { margin-right: 3px; margin-top: -3px; }
+
+/* Nav Menu */
+#menu-container .inside { padding-bottom: 10px; }
+
+.menu {
+	padding-top:1em;
+}
+
+#menu-to-edit {
+	padding: 1em 0;
+}
+
+.menu ul {
+	width: 100%;
+}
+.menu ul.sub-menu {
+}
+.menu li {
+	margin-bottom: 0;
+	position:relative;
+}
+.menu-item-bar {
+	clear:both;
+	line-height:1.5em;
+	position:relative;
+	margin-top: 13px;
+}
+.menu-item-handle {
+	border: 1px solid #E6E6E6;
+	position: relative;
+	padding-left: 10px;
+	height: auto;
+	width: 400px;
+	line-height: 35px;
+	text-shadow: 0 1px 0 #FFFFFF;
+	font-weight:bold;
+	overflow: hidden;
+	border-radius: 6px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	word-wrap: break-word;
+}
+.menu-item-edit-active .menu-item-handle {
+	-moz-border-radius: 6px 6px 0 0;
+	-webkit-border-bottom-right-radius: 0;
+	-webkit-border-bottom-left-radius: 0;
+	-khtml-border-bottom-right-radius: 0;
+	-khtml-border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+}
+.no-js .menu-item-edit-active .item-edit {
+	display: none;
+}
+.js .menu-item-handle {
+	cursor: move;
+}
+.menu li.deleting .menu-item-handle {
+	background-color: #f66;
+	background-image: none;
+	text-shadow: 0 0 0 #ccc;
+}
+
+.menu-item-handle .item-title {
+	padding: 7px 0;
+	line-height: 20px;
+	display:block;
+	margin-right:13em;
+}
+
+/* Sortables */
+li.menu-item.ui-sortable-helper dl {
+	margin-top: 0;
+}
+	li.menu-item.ui-sortable-helper .menu-item-transport dl {
+		margin-top: 13px;
+	}
+.menu .sortable-placeholder {
+	height: 35px;
+	width: 410px;
+	margin-top: 13px;
+}
+
+/* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */
+.menu-item-depth-0 { margin-left: 0px; }
+.menu-item-depth-1 { margin-left: 30px; }
+.menu-item-depth-2 { margin-left: 60px; }
+.menu-item-depth-3 { margin-left: 90px; }
+.menu-item-depth-4 { margin-left: 120px; }
+.menu-item-depth-5 { margin-left: 150px; }
+.menu-item-depth-6 { margin-left: 180px; }
+.menu-item-depth-7 { margin-left: 210px; }
+.menu-item-depth-8 { margin-left: 240px; }
+.menu-item-depth-9 { margin-left: 270px; }
+.menu-item-depth-10 { margin-left: 300px; }
+.menu-item-depth-11 { margin-left: 330px; }
+
+.menu-item-depth-0 .menu-item-transport { margin-left: 0px; }
+.menu-item-depth-1 .menu-item-transport { margin-left: -30px; }
+.menu-item-depth-2 .menu-item-transport { margin-left: -60px; }
+.menu-item-depth-3 .menu-item-transport { margin-left: -90px; }
+.menu-item-depth-4 .menu-item-transport { margin-left: -120px; }
+.menu-item-depth-5 .menu-item-transport { margin-left: -150px; }
+.menu-item-depth-6 .menu-item-transport { margin-left: -180px; }
+.menu-item-depth-7 .menu-item-transport { margin-left: -210px; }
+.menu-item-depth-8 .menu-item-transport { margin-left: -240px; }
+.menu-item-depth-9 .menu-item-transport { margin-left: -270px; }
+.menu-item-depth-10 .menu-item-transport { margin-left: -300px; }
+.menu-item-depth-11 .menu-item-transport { margin-left: -330px; }
+
+body.menu-max-depth-0 { min-width: 950px !important; }
+body.menu-max-depth-1 { min-width: 980px !important; }
+body.menu-max-depth-2 { min-width: 1010px !important; }
+body.menu-max-depth-3 { min-width: 1040px !important; }
+body.menu-max-depth-4 { min-width: 1070px !important; }
+body.menu-max-depth-5 { min-width: 1100px !important; }
+body.menu-max-depth-6 { min-width: 1130px !important; }
+body.menu-max-depth-7 { min-width: 1160px !important; }
+body.menu-max-depth-8 { min-width: 1190px !important; }
+body.menu-max-depth-9 { min-width: 1220px !important; }
+body.menu-max-depth-10 { min-width: 1250px !important; }
+body.menu-max-depth-11 { min-width: 1280px !important; }
+
+/* Menu item controls */
+.item-type { text-transform: uppercase; font-size: 11px; color: #999999; padding-right: 10px; }
+.item-controls { font-size: 11px; position: absolute; right: 20px; top: -1px; }
+.item-controls a { text-decoration: none; }
+.item-controls a:hover { cursor: pointer; }
+.item-controls .item-order { padding-right: 10px;}
+.item-controls .item-order a {
+	font-weight:bold;
+}
+
+body.js .item-order {
+	display:none;
+}
+
+.item-controls .menu-item-delete:hover { color: #ff0000; }
+
+.item-edit {
+	background: url("../images/menu-bits.gif?ver=20100610") no-repeat scroll 0 -105px;
+	position: absolute;
+	right: -20px;
+	top: 0;
+	display: block;
+	width: 23px;
+	height: 36px;
+	overflow: hidden;
+	text-indent:-999em;
+	border-bottom: 1px solid #eee;
+	-moz-border-radius-bottomleft: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-khtml-border-bottom-left-radius: 3px;
+	border-bottom-left-radius: 3px;
+}
+
+/* Menu editing */
+.menu-instructions-inactive {
+	display: none;
+}
+.menu-item-settings {
+	background: #F9F9F9;
+	display:block;
+	width: 400px;
+	padding: 10px 0 10px 10px;
+	border: solid #E6E6E6;
+	border-width: 0 1px 1px 1px;
+	-moz-border-radius: 0 0 6px 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-khtml-border-bottom-right-radius: 6px;
+	-khtml-border-bottom-left-radius: 6px;
+}
+.menu-item-edit-active .menu-item-settings {
+	display:block;
+}
+
+.menu-item-edit-inactive .menu-item-settings {
+	display:none;
+}
+
+.add-menu-item-pagelinks {
+	margin:.5em auto;
+	text-align:center;
+}
+
+.link-to-original {
+	display: block;
+	margin: 0 0 10px;
+	padding: 3px 5px 5px;
+	font-size: 11px;
+	color: #777;
+	font-style: italic;
+	border: 1px solid #dfdfdf;
+	border-radius: 6px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+}
+	.link-to-original a {
+		padding-left: 4px;
+		font-style: normal;
+	}
+
+.hidden-field {
+	display: none;
+}
+
+.menu-item-settings .description-thin,
+.menu-item-settings .description-wide {
+	margin-right: 10px;
+	float: left;
+}
+.description-thin {
+	width: 190px;
+	height: 40px;
+}
+.description-wide {
+	width: 390px;
+}
+
+.menu-item-actions {
+	padding-top: 15px;
+}
+
+#cancel-save { cursor: pointer; }
+#cancel-save:hover { color: #fff !important; }
+#update-menu-item { color: #fff !important; }
+#update-menu-item:hover,
+#update-menu-item:active,
+#update-menu-item:focus { color: #eaf2fa !important; border-color: #13455b !important; }
+
+/* Major/minor publishing actions (classes) */
+.major-publishing-actions {
+	clear:both;
+	padding: 5px 10px;
+}
+.major-publishing-actions .publishing-action {
+	text-align: right;
+	float: right;
+	line-height: 23px;
+	margin: 5px 0 1px;
+}
+.major-publishing-actions .delete-action {
+	vertical-align: middle;
+	text-align: left;
+	float: left;
+	padding-right: 15px;
+	margin-top: 5px;
+}
+.menu-name-label span, .auto-add-pages label {
+	font-size: 11px;
+	font-style: normal;
+}
+.menu-name-label {
+	margin-right: 15px;
+}
+.auto-add-pages input {
+	margin-top: 0;
+}
+.auto-add-pages {
+	margin-top: 4px;
+	float: left;
+}
+.submitbox .submitcancel {
+	color: #21759B;
+	border-bottom: 1px solid #21759B;
+	padding: 1px 2px;
+	text-decoration: none;
+}
+.submitbox .submitcancel:hover {
+	background: #21759B;
+	color: #fff;
+}
+
+.major-publishing-actions .form-invalid {
+	border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	padding-left: 4px;
+	margin-left: -4px;
+}
+
+/* Clearfix */
+#menu-item-name-wrap:after,
+#menu-item-url-wrap:after,
+#menu-name-label:after,
+#menu-settings-column .inside:after,
+#nav-menus-frame:after,
+#post-body-content:after,
+.button-controls:after,
+.major-publishing-actions:after,
+.menu-item-settings:after {
+	clear: both;
+	content: ".";
+	display: block;
+	height: 0;
+	visibility: hidden;
+}
+#nav-menus-frame, .button-controls, #menu-item-url-wrap, #menu-item-name-wrap { display: block; }
--- a/wp-admin/css/plugin-install-rtl.css
+++ b/wp-admin/css/plugin-install-rtl.css
@@ -1,43 +1 @@
-div.star {
-	left: auto;
-	right: 0;
-	letter-spacing: 0;
-}
-.star img, div.star a, div.star a:hover, div.star a:visited {
-	right: auto;
-	left: 0;
-}
-#plugin-information ul#sidemenu {
-	left: auto;
-	right: 0;
-}
-#plugin-information h2 {
-	margin-right: 0;
-	margin-left: 200px;
-}
-#plugin-information .fyi {
-	margin-left: 5px;
-	margin-right: 20px;
-}
-#plugin-information .fyi h2 {
-	margin-left: 0;
-}
-#plugin-information .fyi ul {
-	padding: 10px 7px 10px 5px;
-}
-#plugin-information #section-screenshots li p {
-	padding-left: 0;
-	padding-right: 20px;
-}
-#plugin-information .updated,
-#plugin-information pre {
-	margin-right: 0;
-	margin-left: 215px;
-}
-#plugin-information .updated, #plugin-information .error {
-	clear: none;
-	direction: rtl;
-}
-#section-description {
-	direction: ltr;
-}
+div.star{left:auto;right:0;letter-spacing:0;}.star img,div.star a,div.star a:hover,div.star a:visited{right:auto;left:0;}#plugin-information ul#sidemenu{left:auto;right:0;}#plugin-information h2{margin-right:0;margin-left:200px;}#plugin-information .fyi{margin-left:5px;margin-right:20px;}#plugin-information .fyi h2{margin-left:0;}#plugin-information .fyi ul{padding:10px 7px 10px 5px;}#plugin-information #section-screenshots li p{padding-left:0;padding-right:20px;}#plugin-information .updated,#plugin-information pre{margin-right:0;margin-left:215px;}#plugin-information .updated,#plugin-information .error{clear:none;direction:rtl;}#section-description{direction:ltr;}
--- a/wp-admin/css/plugin-install-rtl.dev.css
+++ b/wp-admin/css/plugin-install-rtl.dev.css
@@ -0,0 +1,43 @@
+div.star {
+	left: auto;
+	right: 0;
+	letter-spacing: 0;
+}
+.star img, div.star a, div.star a:hover, div.star a:visited {
+	right: auto;
+	left: 0;
+}
+#plugin-information ul#sidemenu {
+	left: auto;
+	right: 0;
+}
+#plugin-information h2 {
+	margin-right: 0;
+	margin-left: 200px;
+}
+#plugin-information .fyi {
+	margin-left: 5px;
+	margin-right: 20px;
+}
+#plugin-information .fyi h2 {
+	margin-left: 0;
+}
+#plugin-information .fyi ul {
+	padding: 10px 7px 10px 5px;
+}
+#plugin-information #section-screenshots li p {
+	padding-left: 0;
+	padding-right: 20px;
+}
+#plugin-information .updated,
+#plugin-information pre {
+	margin-right: 0;
+	margin-left: 215px;
+}
+#plugin-information .updated, #plugin-information .error {
+	clear: none;
+	direction: rtl;
+}
+#section-description {
+	direction: ltr;
+}
--- a/wp-admin/css/plugin-install.css
+++ b/wp-admin/css/plugin-install.css
@@ -1 +1 @@
-div.star-holder{position:relative;height:19px;width:100px;font-size:19px;}div.star{height:100%;position:absolute;top:0;left:0;background-color:transparent;letter-spacing:1ex;border:none;}.star1{width:20%;}.star2{width:40%;}.star3{width:60%;}.star4{width:80%;}.star5{width:100%;}.star img,div.star a,div.star a:hover,div.star a:visited{display:block;position:absolute;right:0;border:none;text-decoration:none;}div.star img{width:19px;height:19px;border-left:1px solid #fff;border-right:1px solid #fff;}#plugin-information-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;height:2.5em;}#plugin-information ul#sidemenu{font-weight:normal;margin:0 5px;position:absolute;left:0;bottom:-1px;}#plugin-information p.action-button{width:100%;padding-bottom:0;margin-bottom:0;margin-top:10px;-moz-border-radius:3px 0 0 3px;-webkit-border-top-left-radius:3px;-khtml-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}#plugin-information .action-button a{text-align:center;font-weight:bold;text-decoration:none;display:block;line-height:2em;}#plugin-information h2{clear:none!important;margin-right:200px;}#plugin-information .fyi{margin:0 10px 50px;width:210px;}#plugin-information .fyi h2{font-size:.9em;margin-bottom:0;margin-right:0;}#plugin-information .fyi h2.mainheader{padding:5px;-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;-khtml-border-top-left-radius:3px;border-top-left-radius:3px;}#plugin-information .fyi ul{padding:10px 5px 10px 7px;margin:0;list-style:none;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}#plugin-information .fyi li{margin-right:0;}#plugin-information #section-holder{padding:10px;}#plugin-information .section ul,#plugin-information .section ol{margin-left:16px;list-style-type:square;list-style-image:none;}#plugin-information #section-screenshots li img{vertical-align:text-top;}#plugin-information #section-screenshots li p{font-style:italic;padding-left:20px;padding-bottom:2em;}#plugin-information .updated,#plugin-information pre{margin-right:215px;}#plugin-information pre{padding:7px;}
+div.star-holder{position:relative;height:19px;width:100px;font-size:19px;}div.action-links{font-weight:normal;margin:6px 0 0;}div.star{height:100%;position:absolute;top:0;left:0;background-color:transparent;letter-spacing:1ex;border:none;}.star1{width:20%;}.star2{width:40%;}.star3{width:60%;}.star4{width:80%;}.star5{width:100%;}.star img,div.star a,div.star a:hover,div.star a:visited{display:block;position:absolute;right:0;border:none;text-decoration:none;}div.star img{width:19px;height:19px;border-left:1px solid #fff;border-right:1px solid #fff;}table#install-plugins th.num{white-space:nowrap;}#plugin-information-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;height:2.5em;}#plugin-information ul#sidemenu{font-weight:normal;margin:0 5px;position:absolute;left:0;bottom:-1px;}#plugin-information p.action-button{width:100%;padding-bottom:0;margin-bottom:0;margin-top:10px;-moz-border-radius:3px 0 0 3px;-webkit-border-top-left-radius:3px;-khtml-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}#plugin-information .action-button a{text-align:center;font-weight:bold;text-decoration:none;display:block;line-height:2em;}#plugin-information h2{clear:none!important;margin-right:200px;}#plugin-information .fyi{margin:0 10px 50px;width:210px;}#plugin-information .fyi h2{font-size:.9em;margin-bottom:0;margin-right:0;}#plugin-information .fyi h2.mainheader{padding:5px;-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;-khtml-border-top-left-radius:3px;border-top-left-radius:3px;}#plugin-information .fyi ul{padding:10px 5px 10px 7px;margin:0;list-style:none;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}#plugin-information .fyi li{margin-right:0;}#plugin-information #section-holder{padding:10px;}#plugin-information .section ul,#plugin-information .section ol{margin-left:16px;list-style-type:square;list-style-image:none;}#plugin-information #section-screenshots li img{vertical-align:text-top;}#plugin-information #section-screenshots li p{font-style:italic;padding-left:20px;padding-bottom:2em;}#plugin-information .updated,#plugin-information pre{margin-right:215px;}#plugin-information pre{padding:7px;}
--- a/wp-admin/css/plugin-install.dev.css
+++ b/wp-admin/css/plugin-install.dev.css
@@ -6,6 +6,11 @@ div.star-holder {
 	font-size: 19px;
 }

+div.action-links {
+	font-weight: normal;
+	margin: 6px 0 0;
+}
+
 div.star {
 	height: 100%;
 	position: absolute;
@@ -37,7 +42,11 @@ div.star img {
 	border-right: 1px solid #fff;
 }

-/* Start custom CSS */
+/* Table layout CSS */
+table#install-plugins th.num {
+	white-space: nowrap; /* Prevents long plugin titles from causing the version column to wrap */
+}
+
 /* Header on thickbox */
 #plugin-information-header {
 	margin: 0;
--- a/wp-admin/css/press-this-rtl.css
+++ b/wp-admin/css/press-this-rtl.css
@@ -1,128 +1 @@
-body {
-	font-family: Tahoma, Arial;
-}
-
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
-	margin: 0 0 0 5px;
-	float: right;
-}
-
-/* Editor/Main Column */
-div#poststuff {
-	padding-left: 0;
-	padding-right: 10px;
-}
-
-.posting {
-	margin-right: 0;
-	margin-left: 228px;
-	left: auto;
-	right: 0;
-}
-
-#side-info-column {
-	float: left;
-	right: auto;
-	left: 0;
-	margin-right: 0;
-	margin-left: 10px;
-}
-
-#side-info-column .sleeve {
-	padding-left: 0;
-	padding-right: 10px;
-}
-
-h3.tb {
-	margin-left: 0;
-	margin-right: 5px;
-}
-
-#actions {
-	float: left;
-}
-
-#extra_fields #actions {
-	right: auto;
-	left: 4px;
-}
-
-#actions li {
-	float: right;
-	margin-right: 0;
-	margin-left: 10px;
-}
-
-#extra_fields .button {
-	margin-right: 0;
-	margin-left: 5px;
-}
-
-/* Photo Styles */
-#img_container a {
-	float: right;
-}
-
-#category-add input, #category-add select {
-	font-family: Tahoma, Arial;
-}
-
-#categorydiv ul.categorychecklist ul {
-	margin-left: 0;
-	margin-right: 18px;
-}
-
-/* Tags */
-#tagsdiv #newtag {
-	margin-right: 0;
-	margin-left: 5px;
-}
-
-#tagadd {
-	margin-left: 0;
-	margin-right: 3px;
-}
-
-#tagchecklist span {
-	margin-left: .5em;
-	margin-right: 10px;
-	float: right;
-}
-#tagchecklist span a {
-	margin: 6px -9px 0 0;
-	float: right;
-}
-
-#content {
-	margin-left: 0;
-	margin-right: 1%;
-}
-
-.submit input,
-.button,
-.button-primary,
-.button-secondary,
-.button-highlighted,
-#postcustomstuff .submit input {
-	font-family: Tahoma, Arial, sans-serif;
-}
-
-.ac_results li {
-	text-align: right;
-}
-
-#TB_ajaxContent #options {
-	right: auto;
-	left: 25px;
-}
-
-#post_status {
-	margin-left: 0;
-	margin-right: 10px;
-}
-
-/* Footer */
-#footer {
-	padding: 10px 60px 0 0;
-}
+body{font-family:Tahoma,Arial;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{margin:0 0 0 5px;float:right;}div#poststuff{padding-left:0;padding-right:10px;}.posting{margin-right:0;margin-left:228px;left:auto;right:0;}#side-info-column{float:left;right:auto;left:0;margin-right:0;margin-left:10px;}#side-info-column .sleeve{padding-left:0;padding-right:10px;}h3.tb{margin-left:0;margin-right:5px;}#actions{float:left;}#extra_fields #actions{right:auto;left:4px;}#actions li{float:right;margin-right:0;margin-left:10px;}#extra_fields .button{margin-right:0;margin-left:5px;}#img_container a{float:right;}#category-add input,#category-add select{font-family:Tahoma,Arial;}.inline-editor ul.cat-checklist ul,.categorydiv ul.categorychecklist ul,#linkcategorydiv ul.categorychecklist ul{margin-left:0;margin-right:18px;}#tagsdiv #newtag{margin-right:0;margin-left:5px;}#tagadd{margin-left:0;margin-right:3px;}#tagchecklist span{margin-left:.5em;margin-right:10px;float:right;}#tagchecklist span a{margin:6px -9px 0 0;float:right;}#content{margin-left:0;margin-right:1%;}.submit input,.button,.button-primary,.button-secondary,.button-highlighted,#postcustomstuff .submit input{font-family:Tahoma,Arial,sans-serif;}.ac_results li{text-align:right;}#TB_ajaxContent #options{right:auto;left:25px;}#post_status{margin-left:0;margin-right:10px;}#footer{padding:10px 60px 0 0;}
--- a/wp-admin/css/press-this-rtl.dev.css
+++ b/wp-admin/css/press-this-rtl.dev.css
@@ -0,0 +1,130 @@
+body {
+	font-family: Tahoma, Arial;
+}
+
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML {
+	margin: 0 0 0 5px;
+	float: right;
+}
+
+/* Editor/Main Column */
+div#poststuff {
+	padding-left: 0;
+	padding-right: 10px;
+}
+
+.posting {
+	margin-right: 0;
+	margin-left: 228px;
+	left: auto;
+	right: 0;
+}
+
+#side-info-column {
+	float: left;
+	right: auto;
+	left: 0;
+	margin-right: 0;
+	margin-left: 10px;
+}
+
+#side-info-column .sleeve {
+	padding-left: 0;
+	padding-right: 10px;
+}
+
+h3.tb {
+	margin-left: 0;
+	margin-right: 5px;
+}
+
+#actions {
+	float: left;
+}
+
+#extra_fields #actions {
+	right: auto;
+	left: 4px;
+}
+
+#actions li {
+	float: right;
+	margin-right: 0;
+	margin-left: 10px;
+}
+
+#extra_fields .button {
+	margin-right: 0;
+	margin-left: 5px;
+}
+
+/* Photo Styles */
+#img_container a {
+	float: right;
+}
+
+#category-add input, #category-add select {
+	font-family: Tahoma, Arial;
+}
+
+.inline-editor ul.cat-checklist ul,
+.categorydiv ul.categorychecklist ul,
+#linkcategorydiv ul.categorychecklist ul {
+	margin-left: 0;
+	margin-right: 18px;
+}
+
+/* Tags */
+#tagsdiv #newtag {
+	margin-right: 0;
+	margin-left: 5px;
+}
+
+#tagadd {
+	margin-left: 0;
+	margin-right: 3px;
+}
+
+#tagchecklist span {
+	margin-left: .5em;
+	margin-right: 10px;
+	float: right;
+}
+#tagchecklist span a {
+	margin: 6px -9px 0 0;
+	float: right;
+}
+
+#content {
+	margin-left: 0;
+	margin-right: 1%;
+}
+
+.submit input,
+.button,
+.button-primary,
+.button-secondary,
+.button-highlighted,
+#postcustomstuff .submit input {
+	font-family: Tahoma, Arial, sans-serif;
+}
+
+.ac_results li {
+	text-align: right;
+}
+
+#TB_ajaxContent #options {
+	right: auto;
+	left: 25px;
+}
+
+#post_status {
+	margin-left: 0;
+	margin-right: 10px;
+}
+
+/* Footer */
+#footer {
+	padding: 10px 60px 0 0;
+}
--- a/wp-admin/css/press-this.css
+++ b/wp-admin/css/press-this.css
--- a/wp-admin/css/press-this.dev.css
+++ b/wp-admin/css/press-this.dev.css
@@ -1,4 +1,3 @@
-
 body {
 	font: 13px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
 	color: #333;
@@ -146,8 +145,9 @@ h3.tb {
 	border-radius: 6px;
 }

+.postbox:hover .handlediv,
 .stuffbox:hover .handlediv {
-    background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
+	background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
 }

 .handlediv {
@@ -308,29 +308,22 @@ h3.tb {
 	display: none;
 }

-#category-adder {
-	padding: 4px 0;
-}
+/* Categories */

-#category-adder h4 {
-	margin: 0 0 8px;
-}
-
-#category-add input {
+.category-add input {
 	width: 94%;
-	font-family: Verdana,Arial,Helvetica,sans-serif;
-	font-size: 13px;
+	font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
+	font-size: 12px;
 	margin: 1px;
-	padding: 3px;
 }

-#category-add select {
-	width: 70%;
+.category-add select {
+	width: 100%;
 	-x-system-font: none;
 	border-style: solid;
 	border-width: 1px;
 	font-family: "Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;
-	font-size: 12px;
+	font-size: 11px;
 	height: 2em;
 	line-height: 20px;
 	padding: 2px;
@@ -338,34 +331,73 @@ h3.tb {
 	vertical-align: top;
 }

-#category-add input,
-#category-add-sumbit {
+.category-add input.category-add-sumbit {
 	width: auto;
 }

-/* Categories */
-#categorydiv ul,
+.categorydiv div.tabs-panel,
+#linkcategorydiv div.tabs-panel {
+	height: 100px;
+	overflow: auto;
+	padding: 0.5em 0.9em;
+	border-style: solid;
+	border-width: 1px;
+}
+
+.category-tabs li {
+	display: inline;
+	padding-right: 8px;
+}
+
+.category-tabs a {
+	text-decoration: none;
+}
+
+.categorydiv ul,
 #linkcategorydiv ul {
 	list-style: none;
 	padding: 0;
 	margin: 0;
 }

-#categorydiv ul.categorychecklist ul {
+.inline-editor ul.cat-checklist ul,
+.categorydiv ul.categorychecklist ul,
+#linkcategorydiv ul.categorychecklist ul {
 	margin-left: 18px;
 }

-#categorydiv div.tabs-panel {
-	height: 140px;
-	overflow: auto;
-}
-
 ul.categorychecklist li {
 	margin: 0;
 	padding: 0;
 	line-height: 19px;
 }

+.categorydiv .tabs-panel {
+	border-width: 3px;
+	border-style: solid;
+}
+
+ul.category-tabs {
+	margin-top: 12px;
+	margin-bottom: 6px;
+}
+
+ul.category-tabs li.tabs {
+	border-style: solid solid none;
+	border-width: 1px 1px 0;
+}
+
+ul.category-tabs li {
+	padding: 5px 8px;
+	-moz-border-radius: 3px 3px 0 0;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-khtml-border-top-left-radius: 3px;
+	-khtml-border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+}
+
 /* Tags */
 .screen-reader-text {
 	display: none;
--- a/wp-admin/css/theme-editor-rtl.css
+++ b/wp-admin/css/theme-editor-rtl.css
@@ -1,3 +1 @@
-#templateside {
-	float: left;
-}
+#templateside{float: left;}
--- a/wp-admin/css/theme-editor-rtl.dev.css
+++ b/wp-admin/css/theme-editor-rtl.dev.css
@@ -0,0 +1,3 @@
+#templateside {
+	float: left;
+}
--- a/wp-admin/css/theme-editor.css
+++ b/wp-admin/css/theme-editor.css
@@ -1 +1 @@
-#template textarea{font-family:Consolas,Monaco,Courier,monospace;font-size:12px;width:97%;}#template p{width:97%;}#templateside{float:right;width:190px;word-wrap:break-word;}#templateside h3,#postcustomstuff p.submit{margin:0;}#templateside h4{margin:1em 0 0;}#templateside ol,#templateside ul{margin:.5em;padding:0;}#templateside li{margin:4px 0;}.nonessential{font-size:small;}.highlight{padding:1px;}div.tablenav{margin-right:210px;}#documentation{margin-top:10px;}#documentation label{line-height:22px;vertical-align:top;font-weight:bold;}.fileedit-sub{padding:10px 0 8px;line-height:180%;}
+#template textarea{font-family:Consolas,Monaco,Courier,monospace;font-size:12px;width:97%;}#template p{width:97%;}#templateside{float:right;width:190px;word-wrap:break-word;}#templateside h3,#postcustomstuff p.submit{margin:0;}#templateside h4{margin:1em 0 0;}#templateside ol,#templateside ul{margin:.5em;padding:0;}#templateside li{margin:4px 0;}#templateside ul li a span.highlight{display:block;}.nonessential{font-size:11px;font-style:italic;padding-left:12px;}.highlight{padding:3px 3px 3px 12px;margin-left:-12px;font-weight:bold;-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;}div.tablenav{margin-right:210px;}#documentation{margin-top:10px;}#documentation label{line-height:22px;vertical-align:top;font-weight:bold;}.fileedit-sub{padding:10px 0 8px;line-height:180%;}
--- a/wp-admin/css/theme-editor.dev.css
+++ b/wp-admin/css/theme-editor.dev.css
@@ -33,12 +33,24 @@
 	margin: 4px 0;
 }

+#templateside ul li a span.highlight {
+	display:block;
+}
+
 .nonessential {
-	font-size: small;
+	font-size: 11px;
+	font-style: italic;
+	padding-left: 12px;
 }

 .highlight {
-	padding: 1px;
+	padding: 3px 3px 3px 12px;
+	margin-left: -12px;
+	font-weight: bold;
+	-moz-border-radius: 8px;
+	-khtml-border-radius: 8px;
+	-webkit-border-radius: 8px;
+	border-radius: 8px;
 }

 div.tablenav {
--- a/wp-admin/css/theme-install.css
+++ b/wp-admin/css/theme-install.css
@@ -1 +1 @@
-div.star-holder{position:relative;height:19px;width:100px;font-size:19px;}div.star{height:100%;position:absolute;top:0;left:0;background-color:transparent;letter-spacing:1ex;border:none;}.star1{width:20%;}.star2{width:40%;}.star3{width:60%;}.star4{width:80%;}.star5{width:100%;}.star img,div.star a,div.star a:hover,div.star a:visited{display:block;position:absolute;right:0;border:none;text-decoration:none;}div.star img{width:19px;height:19px;border-left:1px solid #fff;border-right:1px solid #fff;}.theme-listing .theme-item{display:inline-block;width:200px;border:thin solid #ccc;vertical-align:top;}.theme-listing .theme-item h3{text-align:center;font-size:14px;font-style:italic;margin:0;padding:0;}.theme-listing .theme-item img{max-width:150px;max-height:150px;}.theme-listing .theme-item-info span{display:none;}.theme-listing .theme-item:hover .theme-item-info span{display:inline;}.theme-listing .theme-item:hover .theme-item-info span.dots{display:none;}.theme-listing .theme-item-info span.action-links{font-weight:bold;text-align:center;}.theme-listing br.line{border-bottom-width:1px;border-bottom-style:solid;margin-bottom:3px;}.available-theme{padding:20px 15px;}#theme-information .theme-preview-img{float:left;margin:5px 25px 10px 15px;width:300px;}#theme-information .action-button{border-top-width:1px;border-top-style:solid;margin:10px 5px 20px;}#theme-information .action-button #cancel{float:left;margin:10px 15px;}#theme-information .action-button #install{float:right;margin:10px 15px;}#theme-information .available-theme h3{margin:1em 0;}body#theme-information{height:auto;}.feature-filter{-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;border-width:1px;border-style:solid;padding:8px 12px 0;}.feature-filter .feature-group{float:left;margin-bottom:20px;width:695px;}.feature-filter .feature-name{float:left;text-align:right;width:95px;}.feature-filter .feature-group li{display:inline;float:left;list-style-type:none;padding-right:25px;min-width:145px;}
+div.star-holder{position:relative;height:19px;width:100px;font-size:19px;}div.star{height:100%;position:absolute;top:0;left:0;background-color:transparent;letter-spacing:1ex;border:none;}.star1{width:20%;}.star2{width:40%;}.star3{width:60%;}.star4{width:80%;}.star5{width:100%;}.star img,div.star a,div.star a:hover,div.star a:visited{display:block;position:absolute;right:0;border:none;text-decoration:none;}div.star img{width:19px;height:19px;border-left:1px solid #fff;border-right:1px solid #fff;}.theme-listing .theme-item{display:inline-block;width:200px;border:thin solid #ccc;vertical-align:top;}.theme-listing .theme-item h3{text-align:center;font-size:14px;font-style:italic;margin:0;padding:0;}.theme-listing .theme-item img{max-width:150px;max-height:150px;}.theme-listing .theme-item-info span{display:none;}.theme-listing .theme-item:hover .theme-item-info span{display:inline;}.theme-listing .theme-item:hover .theme-item-info span.dots{display:none;}.theme-listing .theme-item-info span.action-links{font-weight:bold;text-align:center;}.theme-listing br.line{border-bottom-width:1px;border-bottom-style:solid;margin-bottom:3px;}.available-theme{padding:20px 15px;}#theme-information .theme-preview-img{float:left;margin:5px 25px 10px 15px;width:300px;}#theme-information .action-button{border-top-width:1px;border-top-style:solid;margin:10px 5px 0;}#theme-information .action-button #cancel{float:left;margin:10px 15px;}#theme-information .action-button #install{float:right;margin:10px 15px;}#theme-information .available-theme h3{margin:1em 0;}body#theme-information{height:auto;}.feature-filter{-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;border-width:1px;border-style:solid;padding:8px 12px 0;}.feature-filter .feature-group{float:left;margin-bottom:20px;width:695px;}.feature-filter .feature-name{float:left;text-align:right;width:95px;}.feature-filter .feature-group li{display:inline;float:left;list-style-type:none;padding-right:25px;min-width:145px;}
--- a/wp-admin/css/theme-install.dev.css
+++ b/wp-admin/css/theme-install.dev.css
@@ -60,12 +60,15 @@ div.star img {
 .theme-listing .theme-item-info span {
 	display: none;
 }
+
 .theme-listing .theme-item:hover .theme-item-info span {
 	display: inline;
 }
+
 .theme-listing .theme-item:hover .theme-item-info span.dots {
 	display: none;
 }
+
 .theme-listing .theme-item-info span.action-links {
 	font-weight: bold;
 	text-align: center;
@@ -90,7 +93,7 @@ div.star img {
 #theme-information .action-button {
 	border-top-width: 1px;
 	border-top-style: solid;
-	margin: 10px 5px 20px;
+	margin: 10px 5px 0;
 }

 #theme-information .action-button #cancel {
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -1,11 +1 @@
-
-ul#widget-list li.widget-list-item div.widget-description {
-	margin: 0 200px 0 0;
-	padding: 0 4em 0 0;
-}
-.widget-control-save,
-.widget-control-remove {
-	margin-right: 0;
-	margin-left: 8px;
-	float: right;
-}
+ul#widget-list li.widget-list-item div.widget-description{margin:0 200px 0 0;padding:0 4em 0 0;}.widget-control-save,.widget-control-remove{margin-right:0;margin-left:8px;float:right;}
--- a/wp-admin/css/widgets-rtl.dev.css
+++ b/wp-admin/css/widgets-rtl.dev.css
@@ -0,0 +1,10 @@
+ul#widget-list li.widget-list-item div.widget-description {
+	margin: 0 200px 0 0;
+	padding: 0 4em 0 0;
+}
+.widget-control-save,
+.widget-control-remove {
+	margin-right: 0;
+	margin-left: 8px;
+	float: right;
+}
--- a/wp-admin/css/widgets.css
+++ b/wp-admin/css/widgets.css
--- a/wp-admin/css/widgets.dev.css
+++ b/wp-admin/css/widgets.dev.css
@@ -151,8 +151,8 @@ div.widgets-holder-wrap {
 }

 #widgets-left #available-widgets {
-    background-color: transparent;
-    border: 0 none;
+	background-color: transparent;
+	border: 0 none;
 }

 ul#widget-list {
@@ -178,9 +178,9 @@ ul#widget-list {
 }

 a.widget-action {
-    display: block;
-    width: 24px;
-    height: 26px;
+	display: block;
+	width: 24px;
+	height: 26px;
 }

 #available-widgets a.widget-action {
@@ -188,7 +188,7 @@ a.widget-action {
 }

 .widget-top a.widget-action {
-    background: url("../images/menu-bits.gif") no-repeat scroll 0 -110px;
+	background: url("../images/menu-bits.gif?ver=20100610") no-repeat scroll 0 -110px;
 }

 .widget .widget-inside,
@@ -220,11 +220,11 @@ a.widget-action {
 }

 .widgets-sortables {
-    min-height: 90px;
+	min-height: 90px;
 }

 .widget-control-actions {
-    margin-top: 8px;
+	margin-top: 8px;
 }

 .widget-control-actions a {
--- a/wp-admin/css/wp-admin-rtl.css
+++ b/wp-admin/css/wp-admin-rtl.css
--- a/wp-admin/css/wp-admin-rtl.dev.css
+++ b/wp-admin/css/wp-admin-rtl.dev.css
@@ -9,7 +9,7 @@ td.available-theme {
 	margin-left: 1em;
 }
 .quicktags, .search {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 /* 200 - 500
 =================================== */
@@ -25,7 +25,7 @@ td.available-theme {
 }
 #post-body .misc-pub-section {
 	border-right-width: 0;
-	border-left-width: 1;
+	border-left-width: 1px;
 	border-right-style: none;
 	border-left-style: solid;
 	float: right;
@@ -51,10 +51,10 @@ td.available-theme {
 .button-secondary,
 .button-highlighted,
 #postcustomstuff .submit input {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 #wpcontent select {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 #quicktags {
 	background-position: right top;
@@ -69,7 +69,7 @@ td.available-theme {
 	margin-left: 0;
 }
 #your-profile legend {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 #ajax-response.alignleft {
 	margin-left: 0;
@@ -93,7 +93,7 @@ td.available-theme {
 .tablenav .displaying-num {
 	margin-right: 0;
 	margin-left: 10px;
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 #postcustomstuff table input,
 #postcustomstuff table select,
@@ -115,22 +115,22 @@ td.available-theme {
 	margin: 7px 15px 0 0;
 }
 #wphead h1 {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 	float: right;
 }
 #wphead h1.long-title {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 #adminmenu .wp-submenu a {
 	padding-left: 0;
 	padding-right: 12px;
 	border-width: 0 0 0 1px;
 	border-style: none none none solid;
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 #adminmenu a.menu-top,
 #adminmenu .wp-submenu-head {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 #adminmenu img.wp-menu-image {
 	float: right;
@@ -177,17 +177,12 @@ td.available-theme {
 #adminmenu #awaiting-mod,
 #adminmenu span.update-plugins,
 #sidemenu li a span.update-plugins {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 	margin-left: 0;
-	margin-right: 2px;
-}
-#adminmenu li #awaiting-mod span,
-#adminmenu li span.update-plugins span,
-#sidemenu li a span.update-plugins span {
-	float: right;
+	margin-right: 7px;
 }
 .post-com-count-wrapper {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 .column-response .post-com-count {
 	float: right;
@@ -195,8 +190,7 @@ td.available-theme {
 	margin-left: 5px;
 }
 /* Tables used on comment.php and option/setting pages */
-.form-table th,
-#wpbody-content .describe th {
+.form-table th {
 	text-align: right;
 }
 .form-table input.tog {
@@ -249,15 +243,19 @@ td.available-theme {
 	clear: right;
 }
 .description, .form-wrap p {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 /* 1500 - 1800
 =================================== */
+.autosave-info {
+	padding: 2px 2px 2px 15px;
+	text-align: left;
+}
 .meta-box-sortables .postbox .handlediv {
 	float: left;
 }
 .howto {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 .postarea h3 label {
 	float: right;
@@ -294,11 +292,12 @@ td.available-theme {
 	margin-left: 4px;
 }
 /* Categories */
-#category-adder {
+.category-adder {
 	margin-left: 0;
 	margin-right: 120px;
 }
-#post-body ul#category-tabs li.tabs {
+#post-body ul.category-tabs li.tabs,
+#post-body ul.add-menu-item-tabs li.tabs {
 	-moz-border-radius: 0 3px 3px 0;
 	-webkit-border-top-left-radius: 0;
 	-webkit-border-top-right-radius: 3px;
@@ -309,23 +308,27 @@ td.available-theme {
 	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 3px;
 }
-#post-body ul#category-tabs {
+#post-body ul.category-tabs,
+#post-body ul.add-menu-item-tabs {
 	float: right;
 	text-align: left;
 	margin: 0 0 0 -120px;
 }
-#post-body #categorydiv div.tabs-panel,
+#post-body .categorydiv div.tabs-panel,
+#post-body .taxonomy div.tabs-panel,
 #post-body #linkcategorydiv div.tabs-panel {
 	margin: 0 120px 0 5px;
 }
 /* 1800 - 2000
 =================================== */
-#side-sortables #category-tabs li {
-	padding-right: 0;
-	padding-left: 8px;
-}
-#categorydiv ul.categorychecklist ul,
-#linkcategorydiv ul.categorychecklist ul {
+#front-page-warning,
+#front-static-pages ul,
+.inline-editor ul.cat-checklist ul,
+.categorydiv ul.categorychecklist ul,
+.customlinkdiv ul.categorychecklist ul,
+.posttypediv ul.categorychecklist ul,
+.taxonomydiv ul.categorychecklist ul,
+#linkcategorydiv ul.categorychecklist ul{
 	margin-left: 0;
 	margin-right: 18px;
 }
@@ -372,7 +375,7 @@ td.action-links, th.action-links {
 	margin-right: 10px;
 }
 .tool-box .title {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 .settings-toggle {
 	text-align: left;
@@ -408,14 +411,18 @@ td.action-links, th.action-links {
 }
 /* show/hide settings */
 #screen-meta-links {
-	margin: 0 0 0 9px;
+	margin: 0 0 0 18px;
 }
 #screen-options-link-wrap,
 #contextual-help-link-wrap {
 	float: left;
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 	margin: 0 0 0 6px;
 }
+#screen-meta a.show-settings {
+	padding: 0 6px 0 16px;
+	background-position: left bottom;
+}
 .metabox-prefs label {
 	padding-right: 0;
 	padding-left: 15px;
@@ -428,6 +435,10 @@ td.action-links, th.action-links {
 	margin-right: 0;
 	margin-left: 5px;
 }
+#replysubmit img.waiting,
+.inline-edit-save img.waiting {
+	float: left;
+}
 /* 2500 - 2700
 =================================== */
 #bulk-titles div a {
@@ -476,7 +487,7 @@ td.action-links, th.action-links {
 .inline-edit-row .catshow,
 .inline-edit-row .cathide,
 .inline-edit-row #bulk-titles div {
-	font-family: Tahoma, Arial, sans-serif; 
+	font-family: Tahoma, Arial, sans-serif;
 }
 .quick-edit-row-post fieldset label.inline-edit-status {
 	float: right;
@@ -520,7 +531,7 @@ td.action-links, th.action-links {
 #favorite-toggle {
 	right: auto;
 	left: 0;
-	background:transparent url(images/fav-arrow-rtl.gif) no-repeat 10px -4px;
+	background:transparent url(../images/fav-arrow-rtl.gif?ver=20100531) no-repeat 10px -4px;
 }
 #utc-time, #local-time {
 	padding-left: 0;
@@ -548,13 +559,114 @@ ol {
 	padding-right: 0;
 }

+/* Media library */
+#wpbody-content .describe th {
+	text-align: right;
+}
+
+.describe .media-item-info .A1B1 {
+	padding: 0 10px 0 0;
+}
+
+.media-upload-form td label {
+	margin-left: 6px;
+	margin-right: 2px;
+}
+
+.media-upload-form .align .field label {
+	padding: 0 22px 0 0;
+	margin: 0 0 0 1em;
+}
+
+.media-upload-form tr.image-size label {
+	margin: 0 3px 0 0 ;
+}
+
+#wpbody-content .describe p.help {
+	padding: 0 5px 0 0 ;
+}
+
+.describe-toggle-on,
+.describe-toggle-off {
+	float: left;
+	margin-left: 20px;
+	margin-right: 0;
+}
+
+.media-item .pinkynail {
+	float: right;
+}
+
+.crunching {
+	text-align: left;
+	margin-left: 5px;
+	margin-right: 0;
+}
+
+button.dismiss {
+	right: auto;
+	left: 5px;
+}
+
+.file-error {
+	float: right;
+}
+
+.bar {
+	border-left-width: 3px;
+	border-left-style: solid;
+	border-right: none;
+}
+
+
 /* TinyMCE
 =================================== */
 .clearlooks2 .mceTop .mceLeft {
 	width:100% !important;
 }
+
+/* tag hints */
+.taghint {
+	margin: 15px 12px -24px 0;
+}
+
+#poststuff .tagsdiv .howto {
+	margin: 0 8px 6px 0;
+}
+
+#broken-themes {
+	text-align: right;
+}
+
+.describe .del-link {
+	padding-right: 5px;
+	padding-left: 0;
+}
+
+.comment-ays th {
+	border-left-style: solid;
+	border-left-width: 1px;
+}
+
+/* Custom Header */
+table#available-headers td {
+	padding: 0 0 10px 20px;
+}
+table#available-headers label input {
+	margin-right: 0;
+	margin-left: 8px;
+}
+
 /* ltr
 =================================== */
 #author-email, #author-url, #rss-url-1, #edit-slug-box, #post_name, #trackback_url, #metakeyinput, #post_password, #slug, #category_nicename, #link_url, #link_image, #rss_uri, #menu_order, #email, #newcomment_author_url, #pages-exclude, #template textarea, #user_login, #url, #pass1, #pass2, #aim, #yim, #jabber, #siteurl, #home, #admin_email, #gmt_offset, #default_post_edit_rows, #mailserver_url, #mailserver_login, #mailserver_pass, #mailserver_port, #ping_sites, #posts_per_page, #posts_per_rss, #blog_charset, #close_comments_days_old, #comments_per_page, #comment_max_links, #moderation_keys, #blacklist_keys, #thumbnail_size_w, #thumbnail_size_h, #medium_size_w, #medium_size_h, #large_size_w, #large_size_h, #permalink_structure, #category_base, #tag_base, #upload_path, #upload_url_path, #rules {
 	direction: ltr;
 }
+
+/* no italic
+=================================== */
+
+#quicktags #ed_em, #ed_reply_toolbar #ed_reply_em, .tablenav .displaying-num, #footer, #footer a, p.help, p.description, span.description, .form-wrap p, #side-sortables .comments-box thead th,
+#normal-sortables .comments-box thead th, .howto, .inline-edit-row fieldset span.title, .inline-edit-row fieldset span.checkbox-title, #utc-time, #local-time, form.upgrade .hint, p.install-help, .imgedit-help  {
+	font-style: normal;
+}
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -389,8 +389,8 @@ input.button-highlighted,
 #postcustomstuff .submit input {
 	text-decoration: none;
 	font-size: 11px !important;
-	line-height: 14px;
-	padding: 2px 8px;
+	line-height: 13px;
+	padding: 3px 8px;
 	cursor: pointer;
 	border-width: 1px;
 	border-style: solid;
@@ -504,6 +504,7 @@ textarea.all-options, input.all-options {
 	line-height: 150%;
 	border: 0 none;
 	outline: none;
+	resize: vertical;
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-khtml-box-sizing: border-box;
@@ -528,7 +529,7 @@ textarea.all-options, input.all-options {
 	padding: 0;
 	margin-bottom: -3px;
 	border-bottom-width: 3px;
-	background-image: url("images/ed-bg.gif");
+	background-image: url("../images/ed-bg.gif");
 	background-position: left top;
 	background-repeat: repeat-x;
 }
@@ -795,6 +796,7 @@ td.media-icon {
 	text-align: center;
 	width: 80px;
 	padding-top: 8px;
+	padding-bottom: 8px;
 }

 td.media-icon img {
@@ -802,15 +804,23 @@ td.media-icon img {
 	max-height: 60px;
 }

-#update-nag {
-	line-height: 29px;
+#update-nag, .update-nag {
+	line-height: 19px;
+	padding: 5px 0;
 	font-size: 12px;
 	text-align: center;
-}
-
-#update-nag {
-	border-width: 1px 0;
-	border-style: solid none;
+	margin: 0 15px;
+	border-width: 1px;
+	border-style: solid;
+	border-top-width: 0;
+	border-top-style: none;
+	-moz-border-radius: 0 0 6px 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-khtml-border-bottom-right-radius: 6px;
+	-khtml-border-bottom-left-radius: 6px;
+	border-bottom-right-radius: 6px;
+	border-bottom-left-radius: 6px;
 }

 .plugins .plugin-update {
@@ -844,7 +854,6 @@ div.comment-item:hover .row-actions {

 .row-actions-visible {
 	padding: 2px 0 0;
-	cursor: pointer;
 }

 /* Admin Header */
@@ -896,28 +905,19 @@ div.comment-item:hover .row-actions {
 	padding: 12px 10px 5px;
 }

-#wphead #site-visit-button {
-	background-repeat:repeat-x;
-	background-position:0 0;
-	-moz-border-radius:3px;
-	-webkit-border-radius:3px;
-	-khtml-border-radius:3px;
-	border-radius:3px;
-	cursor:pointer; /* to keep IE happy */
-	display:-moz-inline-stack; /* to keep FF2 happy */
-	display:inline-block;
+#wphead #privacy-on-link {
 	font-size: 50%;
-	font-style:normal;
-	line-height:17px;
-	margin-left:5px;
-	padding:0 6px;
-	vertical-align:middle;
+	font-style: normal;
+	line-height: 17px;
+	padding: 0 6px;
+	vertical-align: middle;
 }

 #wphead h1 a:hover {
 	text-decoration:none;
 }
-#wphead h1 a:hover #site-title {
+#wphead h1 a:hover #site-title,
+#wphead h1 a#privacy-on-link:hover {
 	text-decoration:underline;
 }

@@ -1175,23 +1175,21 @@ div.comment-item:hover .row-actions {
 #sidemenu li a span.update-plugins {
 	position: absolute;
 	font-family: Helvetica, Arial, sans-serif;
-	font-size: 7pt;
+	font-size: 9px;
+	line-height: 17px;
 	font-weight: bold;
-	margin-top: 2px;
-	margin-left: 2px;
-	-moz-border-radius: 7px;
-	-khtml-border-radius: 7px;
-	-webkit-border-radius: 7px;
-	border-radius: 7px;
+	margin-top: 1px;
+	margin-left: 7px;
+	-moz-border-radius: 10px;
+	-khtml-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
 }

 #adminmenu li #awaiting-mod span,
 #adminmenu li span.update-plugins span,
 #sidemenu li a span.update-plugins span {
-	float: left;
 	display: block;
-	height: 1.6em;
-	line-height: 1.6em;
 	padding: 0 6px;
 }

@@ -1257,7 +1255,9 @@ strong .post-com-count {

 /* Admin Footer */
 #footer {
-	margin-top: -45px;
+	margin-top: -46px;
+	border-top: 1px;
+	border-style: solid;
 }

 #footer,
@@ -1341,6 +1341,7 @@ strong .post-com-count {
 	width: 10px;
 }

+input.large-text,
 textarea.large-text {
 	width: 99%;
 }
@@ -1546,7 +1547,7 @@ span.description,

 #post-body .wp_themeSkin .mceStatusbar a.mceResize {
 	display: block;
-	background: transparent url(images/resize.gif) no-repeat scroll right bottom;
+	background: transparent url(../images/resize.gif) no-repeat scroll right bottom;
 	width: 12px;
 	cursor: se-resize;
 	margin: 0 2px;
@@ -1719,11 +1720,11 @@ div.inside {
 }

 .postbox.closed h3 {
-	-moz-border-radius-bottomleft:4px;
+	-moz-border-radius-bottomleft: 4px;
 	-webkit-border-bottom-left-radius: 4px;
 	-khtml-border-bottom-left-radius: 4px;
 	border-bottom-left-radius: 4px;
-	-moz-border-radius-bottomright:4px;
+	-moz-border-radius-bottomright: 4px;
 	-webkit-border-bottom-right-radius: 4px;
 	-khtml-border-bottom-right-radius: 4px;
 	border-bottom-right-radius: 4px;
@@ -1765,6 +1766,7 @@ div.inside {
 }

 #titlediv {
+	position: relative;
 	margin-bottom: 20px;
 }
 #titlediv label { cursor: text; }
@@ -1788,10 +1790,18 @@ div.inside {
 	-webkit-border-radius: 6px;
 	border-radius: 6px;
 	font-size: 1.7em;
+	line-height: 100%;
 	width: 100%;
 	outline: none;
 }

+#titlediv #title-prompt-text {
+	color: #bbb;
+	position: absolute;
+	font-size: 1.7em;
+	padding: 8px;
+}
+
 #poststuff .inside-submitbox,
 #side-sortables .inside-submitbox {
 	margin: 0 3px;
@@ -1921,36 +1931,37 @@ input#link_url {

 /* Categories */

-#category-adder {
+.category-adder {
 	margin-left: 120px;
 	padding: 4px 0;
 }

-#category-adder h4 {
+.category-adder h4 {
 	margin: 0 0 8px;
 }

-#side-sortables #category-adder {
+#side-sortables .category-adder {
 	margin: 0;
 }

-#post-body #category-add input, #category-add select {
+#post-body .category-add input, .category-add select {
 	width: 30%;
 }

-#side-sortables #category-add input {
+#side-sortables .category-add input {
 	width: 94%;
 }

-#side-sortables #category-add select {
+#side-sortables .category-add select {
 	width: 100%;
 }

-#category-add input#category-add-sumbit {
+#side-sortables .category-add input.category-add-sumbit, #post-body .category-add input.category-add input.category-add-sumbit {
 	width: auto;
 }

-#post-body ul#category-tabs {
+#post-body ul.category-tabs,
+#post-body ul.add-menu-item-tabs {
 	float: left;
 	width: 120px;
 	text-align: right;
@@ -1959,11 +1970,13 @@ input#link_url {
 	padding: 0;
 }

-#post-body ul#category-tabs li {
+#post-body ul.category-tabs li,
+#post-body ul.add-menu-item-tabs li {
 	padding: 8px;
 }

-#post-body ul#category-tabs li.tabs {
+#post-body ul.category-tabs li.tabs,
+#post-body ul.add-menu-item-tabs li.tabs {
 	-moz-border-radius: 3px 0 0 3px;
 	-webkit-border-top-left-radius: 3px;
 	-webkit-border-bottom-left-radius: 3px;
@@ -1973,12 +1986,16 @@ input#link_url {
 	border-bottom-left-radius: 3px;
 }

-#post-body ul#category-tabs li.tabs a {
+#post-body ul.category-tabs li.tabs a,
+#post-body ul.add-menu-item-tabs li.tabs a {
 	font-weight: bold;
 	text-decoration: none;
 }

-#categorydiv div.tabs-panel,
+.categorydiv div.tabs-panel,
+.customlinkdiv div.tabs-panel,
+.posttypediv div.tabs-panel,
+.taxonomydiv div.tabs-panel,
 #linkcategorydiv div.tabs-panel {
 	height: 200px;
 	overflow: auto;
@@ -1987,32 +2004,59 @@ input#link_url {
 	border-width: 1px;
 }

-#post-body #categorydiv div.tabs-panel,
+.nav-menus-php .customlinkdiv div.tabs-panel,
+.nav-menus-php .posttypediv div.tabs-panel,
+.nav-menus-php .taxonomydiv div.tabs-panel {
+	height: auto;
+	max-height: 205px;
+}
+
+div.tabs-panel-active {
+	display:block;
+}
+
+div.tabs-panel-inactive {
+	display:none;
+}
+
+#post-body .categorydiv div.tabs-panel,
+.taxonomy div.tabs-panel,
 #post-body #linkcategorydiv div.tabs-panel {
 	margin: 0 5px 0 125px;
 }

-#side-sortables #category-tabs li {
+#side-sortables .category-tabs li,
+#side-sortables .add-menu-item-tabs li {
 	display: inline;
-	padding-right: 8px;
 }

-#side-sortables #category-tabs a {
+#side-sortables .category-tabs a,
+#side-sortables .add-menu-item-tabs a {
 	text-decoration: none;
 }

-#side-sortables #category-tabs {
+#side-sortables .category-tabs,
+#side-sortables .add-menu-item-tabs {
 	margin-bottom: 3px;
 }

-#categorydiv ul,
+.categorydiv ul,
+.customlinkdiv ul,
+.posttypediv ul,
+.taxonomydiv ul,
 #linkcategorydiv ul {
 	list-style: none;
 	padding: 0;
 	margin: 0;
 }

-#categorydiv ul.categorychecklist ul,
+#front-page-warning,
+#front-static-pages ul,
+.inline-editor ul.cat-checklist ul,
+.categorydiv ul.categorychecklist ul,
+.customlinkdiv ul.categorychecklist ul,
+.posttypediv ul.categorychecklist ul,
+.taxonomydiv ul.categorychecklist ul,
 #linkcategorydiv ul.categorychecklist ul {
 	margin-left: 18px;
 }
@@ -2021,35 +2065,43 @@ ul.categorychecklist li {
 	margin: 0;
 	padding: 0;
 	line-height: 19px;
+	word-wrap: break-word;
 }

-#category-adder h4 {
+.category-adder h4 {
 	margin-top: 4px;
 	margin-bottom: 0px;
 }

-#categorydiv .tabs-panel {
+.categorydiv .tabs-panel,
+.customlinkdiv .tabs-panel,
+.posttypediv .tabs-panel,
+.taxonomydiv .tabs-panel {
 	border-width: 3px;
 	border-style: solid;
 }

-ul#category-tabs {
+ul.category-tabs,
+ul.add-menu-item-tabs {
 	margin-top: 12px;
 }

-ul#category-tabs li.tabs {
+ul.category-tabs li.tabs,
+ul.add-menu-item-tabs li.tabs {
 	border-style: solid solid none;
 	border-width: 1px 1px 0;
 }

-#post-body #category-tabs li.tabs {
+#post-body .category-tabs li.tabs,
+#post-body .add-menu-item-tabs li.tabs {
 	border-style: solid none solid solid;
 	border-width: 1px 0 1px 1px;
 	margin-right: -1px;
 }

-ul#category-tabs li {
-	padding: 5px 8px;
+ul.category-tabs li,
+ul.add-menu-item-tabs li {
+	padding: 5px;
 	-moz-border-radius: 3px 3px 0 0;
 	-webkit-border-top-left-radius: 3px;
 	-webkit-border-top-right-radius: 3px;
@@ -2102,8 +2154,7 @@ td.plugin-title {
 /* Global classes */

 .wp-hidden-children .wp-hidden-child,
-.ui-tabs-hide,
-#codepress-off {
+.ui-tabs-hide {
 	display: none;
 }

@@ -2404,8 +2455,9 @@ fieldset {

 #replysubmit img.waiting,
 .inline-edit-save img.waiting {
-	padding: 2px 10px 0;
+	padding: 4px 10px 0;
 	vertical-align: top;
+	float: right;
 }

 #replysubmit .button {
@@ -2471,7 +2523,7 @@ fieldset {
 }

 #screen-meta-links {
-	margin: 0 9px 0 0;
+	margin: 0 18px 0 0;
 }

 #screen-meta .screen-reader-text {
@@ -2481,11 +2533,20 @@ fieldset {
 #screen-options-link-wrap,
 #contextual-help-link-wrap {
 	float: right;
-	background: transparent url( images/screen-options-left.gif ) no-repeat 0 0;
-	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
 	height: 22px;
 	padding: 0;
 	margin: 0 6px 0 0;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	background: #e3e3e3;
+	-moz-border-radius-bottomleft: 3px;
+	-moz-border-radius-bottomright: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+}
+
+#contextual-help-wrap li {
+	list-style-type: disc;
+	margin-left: 18px;
 }

 #screen-meta a.show-settings {
@@ -2501,7 +2562,7 @@ fieldset {
 }

 #screen-meta a.show-settings {
-	background-image: url( images/screen-options-right.gif );
+	background-image: url( ../images/screen-options-right.gif?ver=20100531 );
 }

 #screen-meta a.show-settings:hover {
@@ -2837,7 +2898,7 @@ table .inline-edit-row fieldset ul.cat-hover {
 }

 .describe .media-item-info .A1B1 {
-	padding: 0 15px 8px 0;
+	padding: 0 0 0 10px;
 }

 #wpbody-content .filename {
@@ -2895,6 +2956,7 @@ abbr.required {
 	padding: 0 0 0 5px;
 }

+.media-item .error-div a.dismiss,
 .describe-toggle-on,
 .describe-toggle-off {
 	display: block;
@@ -2931,6 +2993,10 @@ abbr.required {
 	overflow: hidden;
 }

+.media-item .error-div {
+	padding-left: 10px;
+}
+
 .media-item .pinkynail {
 	float: left;
 	margin: 2px;
@@ -2946,7 +3012,7 @@ abbr.required {
 .media-item .original {
 	position: relative;
 	height: 34px;
-	text-align: center;
+	width: 503px;
 }

 .media-item .percent {
@@ -2960,20 +3026,6 @@ abbr.required {
 	margin-right: 5px;
 }

-button.dismiss {
-	position: absolute;
-	top: 7px;
-	right: 5px;
-	z-index: 4;
-	width: 8em;
-}
-
-.file-error {
-	float: left;
-	font-weight: bold;
-	padding: 10px;
-}
-
 .progress {
 	position: relative;
 	margin-bottom: -36px;
@@ -3074,7 +3126,7 @@ button.dismiss {

 #favorite-inside {
 	margin: 0 0 0 0px;
-	padding: 0 1px 6px 1px;
+	padding: 2px 1px;
 	border-width: 1px;
 	border-style: solid;
 	position: absolute;
@@ -3115,8 +3167,7 @@ button.dismiss {
 	-khtml-border-bottom-left-radius: 0;
 	border-bottom-right-radius: 0;
 	border-bottom-left-radius: 0;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
+	border-bottom: none;
 }

 #utc-time, #local-time {
@@ -3374,7 +3425,7 @@ td.imgedit-settings input {
 .imgedit-wait {
 	position: absolute;
 	top: 0;
-	background: #FFFFFF url(images/wpspin_light.gif) no-repeat scroll 22px 10px;
+	background: #FFFFFF url(../images/wpspin_light.gif) no-repeat scroll 22px 10px;
 	opacity: 0.7;
 	filter: alpha(opacity=70);
 	width: 100%;
@@ -3415,7 +3466,7 @@ td.imgedit-settings input {
 }

 .imgedit-crop {
-	background: transparent url(images/imgedit-icons.png) no-repeat scroll -9px -31px;
+	background: transparent url(../images/imgedit-icons.png) no-repeat scroll -9px -31px;
 	margin: 0 8px 0 0;
 }

@@ -3428,7 +3479,7 @@ td.imgedit-settings input {
 }

 .imgedit-rleft {
-	background: transparent url(images/imgedit-icons.png) no-repeat scroll -46px -31px;
+	background: transparent url(../images/imgedit-icons.png) no-repeat scroll -46px -31px;
 	margin: 0 3px;
 }

@@ -3441,7 +3492,7 @@ td.imgedit-settings input {
 }

 .imgedit-rright {
-	background: transparent url(images/imgedit-icons.png) no-repeat scroll -77px -31px;
+	background: transparent url(../images/imgedit-icons.png) no-repeat scroll -77px -31px;
 	margin: 0 8px 0 3px;
 }

@@ -3454,7 +3505,7 @@ td.imgedit-settings input {
 }

 .imgedit-flipv {
-	background: transparent url(images/imgedit-icons.png) no-repeat scroll -115px -31px;
+	background: transparent url(../images/imgedit-icons.png) no-repeat scroll -115px -31px;
 	margin: 0 3px;
 }

@@ -3467,7 +3518,7 @@ td.imgedit-settings input {
 }

 .imgedit-fliph {
-	background: transparent url(images/imgedit-icons.png) no-repeat scroll -147px -31px;
+	background: transparent url(../images/imgedit-icons.png) no-repeat scroll -147px -31px;
 	margin: 0 8px 0 3px;
 }

@@ -3480,7 +3531,7 @@ td.imgedit-settings input {
 }

 .imgedit-undo {
-	background: transparent url(images/imgedit-icons.png) no-repeat scroll -184px -31px;
+	background: transparent url(../images/imgedit-icons.png) no-repeat scroll -184px -31px;
 	margin: 0 3px;
 }

@@ -3493,7 +3544,7 @@ td.imgedit-settings input {
 }

 .imgedit-redo {
-	background: transparent url(images/imgedit-icons.png) no-repeat scroll -215px -31px;
+	background: transparent url(../images/imgedit-icons.png) no-repeat scroll -215px -31px;
 	margin: 0 8px 0 3px;
 }

@@ -3597,7 +3648,7 @@ span.imgedit-scale-warn {
 /* tag hints */
 .taghint {
 	color: #aaa;
-	margin: 14px 0 -17px 8px;
+	margin: 15px 0 -24px 12px;
 }

 #poststuff .tagsdiv .howto {
@@ -3630,3 +3681,86 @@ span.imgedit-scale-warn {
 	border-right-style: solid;
 	border-right-width: 1px;
 }
+
+/* Custom Background  */
+
+div#custom-background-image {
+	min-height: 100px;
+	border: 1px solid #dfdfdf;
+}
+
+div#custom-background-image img {
+	max-width: 400px;
+	max-height: 300px;
+}
+
+#custom-background label {
+	padding-right: 15px;
+}
+
+/* Custom Header */
+.appearance_page_custom-header #headimg {
+	border: 1px solid #DFDFDF;
+	min-height: 100px;
+	width: 100%;
+}
+
+.appearance_page_custom-header #upload-form p label {
+	font-size: 11px;
+}
+
+.appearance_page_custom-header  #available-headers .default-header {
+	float: left;
+	margin: 0 20px 20px 0;
+}
+
+.appearance_page_custom-header #available-headers label input {
+	margin-right: 10px;
+}
+
+.appearance_page_custom-header #available-headers label img {
+	vertical-align: middle;
+}
+
+/* Tab Interface */
+
+.nav-tab {
+	border-style: solid;
+	border-color: #ccc #ccc #f9f9f9;
+	border-width: 1px 1px 0;
+	color: #c1c1c1;
+	text-shadow: rgba(255,255,255,1) 0 1px 0;
+	font-size: 12px;
+	line-height: 16px;
+	display: inline-block;
+	padding: 4px 14px 6px;
+	text-decoration: none;
+	margin: 0 6px -1px 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+	-khtml-border-top-left-radius: 5px;
+	-khtml-border-top-right-radius: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+
+.nav-tab-active {
+	border-width: 1px;
+	color: #464646;
+}
+
+.themes-php .wrap h2, .theme-install-php .wrap h2 {
+	border-bottom: 1px solid #ccc;
+	padding-bottom: 0;
+}
+
+h2 .nav-tab {
+	padding: 4px 20px 6px;
+	font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+}
+
+/* Scrollbar fix for bulk upgrade iframe */
+body.update-php {
+	height: 98%;
+}
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -0,0 +1,359 @@
+<?php
+/**
+ * The custom background script.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * The custom background class.
+ *
+ * @since 3.0.0
+ * @package WordPress
+ * @subpackage Administration
+ */
+class Custom_Background {
+
+	/**
+	 * Callback for administration header.
+	 *
+	 * @var callback
+	 * @since unknown
+	 * @access private
+	 */
+	var $admin_header_callback;
+
+	/**
+	 * Callback for header div.
+	 *
+	 * @var callback
+	 * @since 3.0.0
+	 * @access private
+	 */
+	var $admin_image_div_callback;
+
+	/**
+	 * Holds the page menu hook.
+	 *
+	 * @var string
+	 * @since 3.0.0
+	 * @access private
+	 */
+	var $page = '';
+
+	/**
+	 * PHP4 Constructor - Register administration header callback.
+	 *
+	 * @since 3.0.0
+	 * @param callback $admin_header_callback
+	 * @param callback $admin_image_div_callback Optional custom image div output callback.
+	 * @return Custom_Background
+	 */
+	function Custom_Background($admin_header_callback = '', $admin_image_div_callback = '') {
+		$this->admin_header_callback = $admin_header_callback;
+		$this->admin_image_div_callback = $admin_image_div_callback;
+	}
+
+	/**
+	 * Set up the hooks for the Custom Background admin page.
+	 *
+	 * @since 3.0.0
+	 */
+	function init() {
+		if ( ! current_user_can('edit_theme_options') )
+			return;
+
+		$this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array(&$this, 'admin_page'));
+
+		add_action("load-$page", array(&$this, 'admin_load'));
+		add_action("load-$page", array(&$this, 'take_action'), 49);
+		add_action("load-$page", array(&$this, 'handle_upload'), 49);
+
+		if ( $this->admin_header_callback )
+			add_action("admin_head-$page", $this->admin_header_callback, 51);
+	}
+
+	/**
+	 * Set up the enqueue for the CSS & JavaScript files.
+	 *
+	 * @since 3.0.0
+	 */
+	function admin_load() {
+		add_contextual_help( $this->page, '<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
+		'<p>' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
+		'<p>' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '</p>' .
+		'<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>' .
+		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+		'<p>' . __( '<a href="http://codex.wordpress.org/Appearance_Background_SubPanel" target="_blank">Documentation on Custom Background</a>' ) . '</p>' .
+		'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>' );
+		wp_enqueue_script('custom-background');
+		wp_enqueue_style('farbtastic');
+	}
+
+	/**
+	 * Execute custom background modification.
+	 *
+	 * @since 3.0.0
+	 */
+	function take_action() {
+
+		if ( empty($_POST) )
+			return;
+
+		if ( isset($_POST['reset-background']) ) {
+			check_admin_referer('custom-background-reset', '_wpnonce-custom-background-reset');
+			remove_theme_mod('background_image');
+			remove_theme_mod('background_image_thumb');
+			$this->updated = true;
+			return;
+		}
+
+		if ( isset($_POST['remove-background']) ) {
+			// @TODO: Uploaded files are not removed here.
+			check_admin_referer('custom-background-remove', '_wpnonce-custom-background-remove');
+			set_theme_mod('background_image', '');
+			set_theme_mod('background_image_thumb', '');
+			$this->updated = true;
+			return;
+		}
+
+		if ( isset($_POST['background-repeat']) ) {
+			check_admin_referer('custom-background');
+			if ( in_array($_POST['background-repeat'], array('repeat', 'no-repeat', 'repeat-x', 'repeat-y')) )
+				$repeat = $_POST['background-repeat'];
+			else
+				$repeat = 'repeat';
+			set_theme_mod('background_repeat', $repeat);
+		}
+
+		if ( isset($_POST['background-position-x']) ) {
+			check_admin_referer('custom-background');
+			if ( in_array($_POST['background-position-x'], array('center', 'right', 'left')) )
+				$position = $_POST['background-position-x'];
+			else
+				$position = 'left';
+			set_theme_mod('background_position_x', $position);
+		}
+
+		if ( isset($_POST['background-attachment']) ) {
+			check_admin_referer('custom-background');
+			if ( in_array($_POST['background-attachment'], array('fixed', 'scroll')) )
+				$attachment = $_POST['background-attachment'];
+			else
+				$attachment = 'fixed';
+			set_theme_mod('background_attachment', $attachment);
+		}
+
+		if ( isset($_POST['background-color']) ) {
+			check_admin_referer('custom-background');
+			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['background-color']);
+			if ( strlen($color) == 6 || strlen($color) == 3 )
+				set_theme_mod('background_color', $color);
+			else
+				set_theme_mod('background_color', '');
+		}
+
+		$this->updated = true;
+	}
+
+	/**
+	 * Display the custom background page.
+	 *
+	 * @since 3.0.0
+	 */
+	function admin_page() {
+?>
+<div class="wrap" id="custom-background">
+<?php screen_icon(); ?>
+<h2><?php _e('Custom Background'); ?></h2>
+<?php if ( !empty($this->updated) ) { ?>
+<div id="message" class="updated">
+<p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
+</div>
+<?php }
+
+	if ( $this->admin_image_div_callback ) {
+		call_user_func($this->admin_image_div_callback);
+	} else {
+?>
+<h3><?php _e('Background Image'); ?></h3>
+<table class="form-table">
+<tbody>
+<tr valign="top">
+<th scope="row"><?php _e('Preview'); ?></th>
+<td>
+<?php
+$background_styles = '';
+if ( $bgcolor = get_background_color() )
+	$background_styles .= 'background-color: #' . $bgcolor . ';';
+
+if ( get_background_image() ) {
+	// background-image URL must be single quote, see below
+	$background_styles .= ' background-image: url(\'' . get_theme_mod('background_image_thumb', '') . '\');'
+		. ' background-repeat: ' . get_theme_mod('background_repeat', 'repeat') . ';'
+		. ' background-position: top ' . get_theme_mod('background_position_x', 'left');
+}
+?>
+<div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
+<?php if ( get_background_image() ) { ?>
+<img class="custom-background-image" src="<?php echo get_theme_mod('background_image_thumb', ''); ?>" style="visibility:hidden;" alt="" /><br />
+<img class="custom-background-image" src="<?php echo get_theme_mod('background_image_thumb', ''); ?>" style="visibility:hidden;" alt="" />
+<?php } ?>
+</div>
+<?php } ?>
+</td>
+</tr>
+<?php if ( get_background_image() ) : ?>
+<tr valign="top">
+<th scope="row"><?php _e('Remove Image'); ?></th>
+<td>
+<form method="post" action="">
+<?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
+<input type="submit" class="button" name="remove-background" value="<?php esc_attr_e('Remove Background Image'); ?>" /><br/>
+<?php _e('This will remove the background image. You will not be able to restore any customizations.') ?>
+</form>
+</td>
+</tr>
+<?php endif; ?>
+
+<?php if ( defined( 'BACKGROUND_IMAGE' ) ) : // Show only if a default background image exists ?>
+<tr valign="top">
+<th scope="row"><?php _e('Restore Original Image'); ?></th>
+<td>
+<form method="post" action="">
+<?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?>
+<input type="submit" class="button" name="reset-background" value="<?php esc_attr_e('Restore Original Image'); ?>" /><br/>
+<?php _e('This will restore the original background image. You will not be able to restore any customizations.') ?>
+</form>
+</td>
+</tr>
+
+<?php endif; ?>
+<tr valign="top">
+<th scope="row"><?php _e('Upload Image'); ?></th>
+<td><form enctype="multipart/form-data" id="upload-form" method="post" action="">
+<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
+<input type="hidden" name="action" value="save" />
+<?php wp_nonce_field('custom-background-upload', '_wpnonce-custom-background-upload') ?>
+<input type="submit" class="button" value="<?php esc_attr_e('Upload'); ?>" />
+</p>
+</form>
+</td>
+</tr>
+</tbody>
+</table>
+
+<h3><?php _e('Display Options') ?></h3>
+<form method="post" action="">
+<table class="form-table">
+<tbody>
+<?php if ( get_background_image() ) : ?>
+<tr valign="top">
+<th scope="row"><?php _e( 'Position' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Position' ); ?></span></legend>
+<label>
+<input name="background-position-x" type="radio" value="left"<?php checked('left', get_theme_mod('background_position_x', 'left')); ?> />
+<?php _e('Left') ?>
+</label>
+<label>
+<input name="background-position-x" type="radio" value="center"<?php checked('center', get_theme_mod('background_position_x', 'left')); ?> />
+<?php _e('Center') ?>
+</label>
+<label>
+<input name="background-position-x" type="radio" value="right"<?php checked('right', get_theme_mod('background_position_x', 'left')); ?> />
+<?php _e('Right') ?>
+</label>
+</fieldset></td>
+</tr>
+
+<tr valign="top">
+<th scope="row"><?php _e( 'Repeat' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Repeat' ); ?></span></legend>
+<label><input type="radio" name="background-repeat" value="no-repeat"<?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('No Repeat'); ?></option></label>
+	<label><input type="radio" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile'); ?></option></label>
+	<label><input type="radio" name="background-repeat" value="repeat-x"<?php checked('repeat-x', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile Horizontally'); ?></option></label>
+	<label><input type="radio" name="background-repeat" value="repeat-y"<?php checked('repeat-y', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile Vertically'); ?></option></label>
+</fieldset></td>
+</tr>
+
+<tr valign="top">
+<th scope="row"><?php _e( 'Attachment' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Attachment' ); ?></span></legend>
+<label>
+<input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', 'scroll')); ?> />
+<?php _e('Scroll') ?>
+</label>
+<label>
+<input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment', 'scroll')); ?> />
+<?php _e('Fixed') ?>
+</label>
+</fieldset></td>
+</tr>
+<?php endif; // get_background_image() ?>
+<tr valign="top">
+<th scope="row"><?php _e( 'Color' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
+<input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr(get_background_color()) ?>" />
+<a class="hide-if-no-js" href="#" id="pickcolor"><?php _e('Select a Color'); ?></a>
+<div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
+</fieldset></td>
+</tr>
+</tbody>
+</table>
+
+<?php wp_nonce_field('custom-background'); ?>
+<p class="submit"><input type="submit" class="button-primary" name="save-background-options" value="<?php esc_attr_e('Save Changes'); ?>" /></p>
+</form>
+
+</div>
+<?php
+	}
+
+	/**
+	 * Handle a Image upload for the background image.
+	 *
+	 * @since 3.0.0
+	 */
+	function handle_upload() {
+
+		if ( empty($_FILES) )
+			return;
+
+		check_admin_referer('custom-background-upload', '_wpnonce-custom-background-upload');
+		$overrides = array('test_form' => false);
+		$file = wp_handle_upload($_FILES['import'], $overrides);
+
+		if ( isset($file['error']) )
+			wp_die( $file['error'] );
+
+		$url = $file['url'];
+		$type = $file['type'];
+		$file = $file['file'];
+		$filename = basename($file);
+
+		// Construct the object array
+		$object = array(
+			'post_title' => $filename,
+			'post_content' => $url,
+			'post_mime_type' => $type,
+			'guid' => $url
+		);
+
+		// Save the data
+		$id = wp_insert_attachment($object, $file);
+
+		// Add the meta-data
+		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+
+		set_theme_mod('background_image', esc_url($url));
+
+		$thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
+		set_theme_mod('background_image_thumb', esc_url( $thumbnail[0] ) );
+
+		do_action('wp_create_file_in_uploads', $file, $id); // For replication
+		$this->updated = true;
+	}
+
+}
+?>
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -9,7 +9,7 @@
 /**
 * The custom header image class.
 *
- * @since unknown
+ * @since 2.1.0
 * @package WordPress
 * @subpackage Administration
 */
@@ -19,41 +19,88 @@ class Custom_Image_Header {
 	 * Callback for administration header.
 	 *
 	 * @var callback
-	 * @since unknown
+	 * @since 2.1.0
 	 * @access private
 	 */
 	var $admin_header_callback;

+	/**
+	 * Callback for header div.
+	 *
+	 * @var callback
+	 * @since 3.0.0
+	 * @access private
+	 */
+	var $admin_image_div_callback;
+
+	/**
+	 * Holds default headers.
+	 *
+	 * @var array
+	 * @since 3.0.0
+	 * @access private
+	 */
+	var $default_headers = array();
+
+	/**
+	 * Holds the page menu hook.
+	 *
+	 * @var string
+	 * @since 3.0.0
+	 * @access private
+	 */
+	var $page = '';
+
 	/**
 	 * PHP4 Constructor - Register administration header callback.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 * @param callback $admin_header_callback
+	 * @param callback $admin_image_div_callback Optional custom image div output callback.
 	 * @return Custom_Image_Header
 	 */
-	function Custom_Image_Header($admin_header_callback) {
+	function Custom_Image_Header($admin_header_callback, $admin_image_div_callback = '') {
 		$this->admin_header_callback = $admin_header_callback;
+		$this->admin_image_div_callback = $admin_image_div_callback;
 	}

 	/**
-	 * Setup the hooks for the Custom Header admin page.
+	 * Set up the hooks for the Custom Header admin page.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 */
 	function init() {
-		$page = add_theme_page(__('Custom Header'), __('Custom Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page'));
+		if ( ! current_user_can('edit_theme_options') )
+			return;
+
+		$this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array(&$this, 'admin_page'));

 		add_action("admin_print_scripts-$page", array(&$this, 'js_includes'));
 		add_action("admin_print_styles-$page", array(&$this, 'css_includes'));
+		add_action("admin_head-$page", array(&$this, 'help') );
 		add_action("admin_head-$page", array(&$this, 'take_action'), 50);
 		add_action("admin_head-$page", array(&$this, 'js'), 50);
 		add_action("admin_head-$page", $this->admin_header_callback, 51);
 	}

+	/**
+	 * Adds contextual help.
+	 *
+	 * @since 3.0.0
+	 */
+	function help() {
+		add_contextual_help( $this->page, '<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately.' ) . '</p>' .
+		'<p>' . __( 'If you want to discard your custom header and go back to the default included in your theme, click on the buttons to remove the custom image and restore the original header image.' ) . '</p>' .
+		'<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the Save Changes button.' ) . '</p>' .
+		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+		'<p>' . __( '<a href="http://codex.wordpress.org/Appearance_Header_SubPanel" target="_blank">Documentation on Custom Header</a>' ) . '</p>' .
+		'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>' );
+	}
+
 	/**
 	 * Get the current step.
 	 *
-	 * @since unknown
+	 * @since 2.6.0
 	 *
 	 * @return int Current step
 	 */
@@ -69,142 +116,238 @@ class Custom_Image_Header {
 	}

 	/**
-	 * Setup the enqueue for the JavaScript files.
+	 * Set up the enqueue for the JavaScript files.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 */
 	function js_includes() {
 		$step = $this->step();

-		if ( 1 == $step )
+		if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
 			wp_enqueue_script('farbtastic');
 		elseif ( 2 == $step )
-			wp_enqueue_script('jcrop');
+			wp_enqueue_script('imgareaselect');
 	}

 	/**
-	 * Setup the enqueue for the CSS files
+	 * Set up the enqueue for the CSS files
 	 *
 	 * @since 2.7
 	 */
 	function css_includes() {
 		$step = $this->step();

-		if ( 1 == $step )
+		if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
 			wp_enqueue_style('farbtastic');
 		elseif ( 2 == $step )
-			wp_enqueue_style('jcrop');
+			wp_enqueue_style('imgareaselect');
+	}
+
+	/**
+	 * Check if header text is allowed
+	 *
+	 * @since 3.0.0
+	 */
+	function header_text() {
+		if ( defined( 'NO_HEADER_TEXT' ) && NO_HEADER_TEXT )
+			return false;
+
+		return true;
 	}

 	/**
 	 * Execute custom header modification.
 	 *
-	 * @since unknown
+	 * @since 2.6.0
 	 */
 	function take_action() {
-		if ( isset( $_POST['textcolor'] ) ) {
-			check_admin_referer('custom-header');
-			if ( 'blank' == $_POST['textcolor'] ) {
-				set_theme_mod('header_textcolor', 'blank');
+		if ( ! current_user_can('edit_theme_options') )
+			return;
+
+		if ( empty( $_POST ) )
+			return;
+
+		$this->updated = true;
+
+		if ( isset( $_POST['resetheader'] ) ) {
+			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+			remove_theme_mod( 'header_image' );
+			return;
+		}
+
+		if ( isset( $_POST['resettext'] ) ) {
+			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+			remove_theme_mod('header_textcolor');
+			return;
+		}
+
+		if ( isset( $_POST['removeheader'] ) ) {
+			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+			set_theme_mod( 'header_image', '' );
+			return;
+		}
+
+		if ( isset( $_POST['text-color'] ) ) {
+			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
+			if ( 'blank' == $_POST['text-color'] ) {
+				set_theme_mod( 'header_textcolor', 'blank' );
 			} else {
-				$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['textcolor']);
+				$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
 				if ( strlen($color) == 6 || strlen($color) == 3 )
 					set_theme_mod('header_textcolor', $color);
 			}
 		}
-		if ( isset($_POST['resetheader']) ) {
-			check_admin_referer('custom-header');
-			remove_theme_mods();
+
+		if ( isset($_POST['default-header']) ) {
+			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+			$this->process_default_headers();
+			if ( isset($this->default_headers[$_POST['default-header']]) )
+				set_theme_mod('header_image', esc_url($this->default_headers[$_POST['default-header']]['url']));
 		}
 	}

+	/**
+	 * Process the default headers
+	 *
+	 * @since 3.0.0
+	 */
+	function process_default_headers() {
+		global $_wp_default_headers;
+
+		if ( !empty($this->headers) )
+			return;
+
+		if ( !isset($_wp_default_headers) )
+			return;
+
+		$this->default_headers = $_wp_default_headers;
+		foreach ( array_keys($this->default_headers) as $header ) {
+			$this->default_headers[$header]['url'] =  sprintf( $this->default_headers[$header]['url'], get_template_directory_uri(), get_stylesheet_directory_uri() );
+			$this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], get_template_directory_uri(), get_stylesheet_directory_uri() );
+		}
+	}
+
+	/**
+	 * Display UI for selecting one of several default headers.
+	 *
+	 * @since 3.0.0
+	 */
+	function show_default_header_selector() {
+		echo '<div id="available-headers">';
+		foreach ( $this->default_headers as $header_key => $header ) {
+			$header_thumbnail = $header['thumbnail_url'];
+			$header_url = $header['url'];
+			$header_desc = $header['description'];
+			echo '<div class="default-header">';
+			echo '<label><input name="default-header" type="radio" value="' . esc_attr($header_key) . '" ' . checked($header_url, get_theme_mod( 'header_image' ), false) . ' />';
+			echo '<img src="' . $header_thumbnail . '" alt="' . esc_attr($header_desc) .'" title="' . esc_attr($header_desc) .'" /></label>';
+			echo '</div>';
+		}
+		echo '<div class="clear"></div></div>';
+	}
+
 	/**
 	 * Execute Javascript depending on step.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 */
 	function js() {
 		$step = $this->step();
-		if ( 1 == $step )
+		if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
 			$this->js_1();
 		elseif ( 2 == $step )
 			$this->js_2();
 	}

 	/**
-	 * Display Javascript based on Step 1.
+	 * Display Javascript based on Step 1 and 3.
 	 *
-	 * @since unknown
+	 * @since 2.6.0
 	 */
 	function js_1() { ?>
 <script type="text/javascript">
-	var buttons = ['#name', '#desc', '#pickcolor', '#defaultcolor'];
+/* <![CDATA[ */
+	var text_objects = ['#name', '#desc', '#text-color-row'];
 	var farbtastic;
+	var default_color = '#<?php echo HEADER_TEXTCOLOR; ?>';
+	var old_color = null;

 	function pickColor(color) {
 		jQuery('#name').css('color', color);
 		jQuery('#desc').css('color', color);
-		jQuery('#textcolor').val(color);
+		jQuery('#text-color').val(color);
 		farbtastic.setColor(color);
 	}

+	function toggle_text(s) {
+		if (jQuery(s).attr('id') == 'showtext' && jQuery('#text-color').val() != 'blank')
+			return;
+
+		if (jQuery(s).attr('id') == 'hidetext' && jQuery('#text-color').val() == 'blank')
+			return;
+
+		if (jQuery('#text-color').val() == 'blank') {
+			//Show text
+			if (old_color == '#blank')
+				old_color = default_color;
+
+			jQuery( text_objects.toString() ).show();
+			jQuery('#text-color').val(old_color);
+			jQuery('#name').css('color', old_color);
+			jQuery('#desc').css('color', old_color);
+			pickColor(old_color);
+		} else {
+			//Hide text
+			jQuery( text_objects.toString() ).hide();
+			old_color = jQuery('#text-color').val();
+			jQuery('#text-color').val('blank');
+		}
+	}
+
 	jQuery(document).ready(function() {
 		jQuery('#pickcolor').click(function() {
-			jQuery('#colorPickerDiv').show();
+			jQuery('#color-picker').show();
 		});

-		jQuery('#hidetext').click(function() {
-			toggle_text();
+		jQuery('input[name="hidetext"]').click(function() {
+			toggle_text(this);
 		});

-		farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { pickColor(color); });
-		pickColor('#<?php echo get_theme_mod('header_textcolor', HEADER_TEXTCOLOR); ?>');
+		jQuery('#defaultcolor').click(function() {
+			pickColor(default_color);
+			jQuery('#text-color').val(default_color)
+		});

-		<?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?>
+		jQuery('#text-color').keyup(function() {
+			var _hex = jQuery('#text-color').val();
+			var hex = _hex;
+			if ( hex[0] != '#' )
+				hex = '#' + hex;
+			hex = hex.replace(/[^#a-fA-F0-9]+/, '');
+			if ( hex != _hex )
+				jQuery('#text-color').val(hex);
+			if ( hex.length == 4 || hex.length == 7 )
+				pickColor( hex );
+		});
+
+		jQuery(document).mousedown(function(){
+			jQuery('#color-picker').each( function() {
+				var display = jQuery(this).css('display');
+				if (display == 'block')
+					jQuery(this).fadeOut(2);
+			});
+		});
+
+		farbtastic = jQuery.farbtastic('#color-picker', function(color) { pickColor(color); });
+		<?php if ( $color = get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?>
+		pickColor('#<?php echo $color; ?>');
+		<?php } ?>
+
+		<?php if ( 'blank' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) || '' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) || ! $this->header_text() ) { ?>
 		toggle_text();
 		<?php } ?>
-	});
-
-	jQuery(document).mousedown(function(){
-		// Make the picker disappear, since we're using it in an independant div
-		hide_picker();
-	});
-
-	function colorDefault() {
-		pickColor('#<?php echo HEADER_TEXTCOLOR; ?>');
-	}
-
-	function hide_picker(what) {
-		var update = false;
-		jQuery('#colorPickerDiv').each(function(){
-			var id = jQuery(this).attr('id');
-			if (id == what) {
-				return;
-			}
-			var display = jQuery(this).css('display');
-			if (display == 'block') {
-				jQuery(this).fadeOut(2);
-			}
 		});
-	}
-
-	function toggle_text(force) {
-		if(jQuery('#textcolor').val() == 'blank') {
-			//Show text
-			jQuery( buttons.toString() ).show();
-			jQuery('#textcolor').val('<?php echo HEADER_TEXTCOLOR; ?>');
-			jQuery('#hidetext').val('<?php _e('Hide Text'); ?>');
-		}
-		else {
-			//Hide text
-			jQuery( buttons.toString() ).hide();
-			jQuery('#textcolor').val('blank');
-			jQuery('#hidetext').val('<?php _e('Show Text'); ?>');
-		}
-	}
-
-
-
 </script>
 <?php
 	}
@@ -212,34 +355,24 @@ class Custom_Image_Header {
 	/**
 	 * Display Javascript based on Step 2.
 	 *
-	 * @since unknown
+	 * @since 2.6.0
 	 */
 	function js_2() { ?>
 <script type="text/javascript">
+/* <![CDATA[ */
 	function onEndCrop( coords ) {
 		jQuery( '#x1' ).val(coords.x);
 		jQuery( '#y1' ).val(coords.y);
-		jQuery( '#x2' ).val(coords.x2);
-		jQuery( '#y2' ).val(coords.y2);
 		jQuery( '#width' ).val(coords.w);
 		jQuery( '#height' ).val(coords.h);
 	}

-	// with a supplied ratio
 	jQuery(document).ready(function() {
 		var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>;
 		var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>;
 		var ratio = xinit / yinit;
-		var ximg = jQuery('#upload').width();
-		var yimg = jQuery('#upload').height();
-
-		//set up default values
-		jQuery( '#x1' ).val(0);
-		jQuery( '#y1' ).val(0);
-		jQuery( '#x2' ).val(xinit);
-		jQuery( '#y2' ).val(yinit);
-		jQuery( '#width' ).val(xinit);
-		jQuery( '#height' ).val(yinit);
+		var ximg = jQuery('img#upload').width();
+		var yimg = jQuery('img#upload').height();

 		if ( yimg < yinit || ximg < xinit ) {
 			if ( ximg / yimg > ratio ) {
@@ -251,12 +384,30 @@ class Custom_Image_Header {
 			}
 		}

-		jQuery('#upload').Jcrop({
-			aspectRatio: ratio,
-			setSelect: [ 0, 0, xinit, yinit ],
-			onSelect: onEndCrop
+		jQuery('img#upload').imgAreaSelect({
+			handles: true,
+			keys: true,
+			aspectRatio: xinit + ':' + yinit,
+			show: true,
+			x1: 0,
+			y1: 0,
+			x2: xinit,
+			y2: yinit,
+			maxHeight: <?php echo HEADER_IMAGE_HEIGHT; ?>,
+			maxWidth: <?php echo HEADER_IMAGE_WIDTH; ?>,
+			onInit: function () {
+				jQuery('#width').val(xinit);
+				jQuery('#height').val(yinit);
+			},
+			onSelectChange: function(img, c) {
+				jQuery('#x1').val(c.x1);
+				jQuery('#y1').val(c.y1);
+				jQuery('#width').val(c.width);
+				jQuery('#height').val(c.height);
+			}
 		});
 	});
+/* ]]> */
 </script>
 <?php
 	}
@@ -264,74 +415,164 @@ class Custom_Image_Header {
 	/**
 	 * Display first step of custom header image page.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 */
 	function step_1() {
-		if ( $_GET['updated'] ) { ?>
-<div id="message" class="updated fade">
-<p><?php _e('Header updated.') ?></p>
-</div>
-		<?php } ?>
+		$this->process_default_headers();
+?>

 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e('Your Header Image'); ?></h2>
-<p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
+<h2><?php _e('Custom Header'); ?></h2>

-<div id="headimg" style="background-image: url(<?php esc_url(header_image()) ?>);">
-<h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1>
-<div id="desc"><?php bloginfo('description');?></div>
+<?php if ( ! empty( $this->updated ) ) { ?>
+<div id="message" class="updated">
+<p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
 </div>
-<?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?>
-<form method="post" action="<?php echo admin_url('themes.php?page=custom-header&amp;updated=true') ?>">
-<input type="button" class="button" value="<?php esc_attr_e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
-<input type="button" class="button" value="<?php esc_attr_e('Select a Text Color'); ?>" id="pickcolor" /><input type="button" class="button" value="<?php esc_attr_e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
-<?php wp_nonce_field('custom-header') ?>
-<input type="hidden" name="textcolor" id="textcolor" value="#<?php esc_attr(header_textcolor()) ?>" /><input name="submit" type="submit" class="button" value="<?php esc_attr_e('Save Changes'); ?>" /></form>
 <?php } ?>

-<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"> </div>
-</div>
-<div class="wrap">
-<h2><?php _e('Upload New Header Image'); ?></h2><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?></p>
-<p><?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
+<h3><?php _e( 'Header Image' ) ?></h3>
+<table class="form-table">
+<tbody>

-<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>" style="margin: auto; width: 50%;">
-<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
-<input type="hidden" name="action" value="save" />
-<?php wp_nonce_field('custom-header') ?>
-<p class="submit">
-<input type="submit" value="<?php esc_attr_e('Upload'); ?>" />
-</p>
-</form>

-</div>
+<tr valign="top">
+<th scope="row"><?php _e( 'Preview' ); ?></th>
+<td >
+	<?php if ( $this->admin_image_div_callback ) {
+	  call_user_func( $this->admin_image_div_callback );
+	} else {
+	?>
+	<div id="headimg" style="max-width:<?php echo HEADER_IMAGE_WIDTH; ?>px;height:<?php echo HEADER_IMAGE_HEIGHT; ?>px;background-image:url(<?php esc_url ( header_image() ) ?>);">
+		<?php
+		if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) || '' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) || ! $this->header_text() )
+			$style = ' style="display:none;"';
+		else
+			$style = ' style="color:#' . get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) . ';"';
+		?>
+		<h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>"><?php bloginfo( 'name' ); ?></a></h1>
+		<div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
+	</div>
+	<?php } ?>
+</td>
+</tr>

-		<?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?>
-<div class="wrap">
-<h2><?php _e('Reset Header Image and Color'); ?></h2>
-<p><?php _e('This will restore the original header image and color. You will not be able to retrieve any customizations.') ?></p>
-<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
-<?php wp_nonce_field('custom-header'); ?>
-<input type="submit" class="button" name="resetheader" value="<?php esc_attr_e('Restore Original Header'); ?>" />
+<tr valign="top">
+<th scope="row"><?php _e( 'Upload Image' ); ?></th>
+<td>
+	<p><?php _e( 'You can upload a custom header image to be shown at the top of your site instead of the default one. On the next screen you will be able to crop the image.' ); ?><br />
+	<?php printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT ); ?></p>
+	<form enctype="multipart/form-data" id="upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
+	<p>
+		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
+		<input type="file" id="upload" name="import" />
+		<input type="hidden" name="action" value="save" />
+		<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ) ?>
+		<input type="submit" class="button" value="<?php esc_attr_e( 'Upload' ); ?>" />
+	</p>
+	</form>
+</td>
+</tr>
+</tbody>
+</table>
+
+<form method="post" action="<?php echo esc_attr( add_query_arg( 'step', 1 ) ) ?>">
+<table class="form-table">
+<tbody>
+	<?php if ( ! empty( $this->default_headers ) ) : ?>
+<tr valign="top">
+<th scope="row"><?php _e( 'Default Images' ); ?></th>
+<td>
+	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers.' ) ?></p>
+	<?php
+		$this->show_default_header_selector();
+	?>
+</td>
+</tr>
+	<?php endif;
+
+	if ( get_header_image() ) : ?>
+<tr valign="top">
+<th scope="row"><?php _e( 'Remove Image' ); ?></th>
+<td>
+	<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ) ?></p>
+	<input type="submit" class="button" name="removeheader" value="<?php esc_attr_e( 'Remove Header Image' ); ?>" />
+</td>
+</tr>
+	<?php endif;
+
+	if ( defined( 'HEADER_IMAGE' ) ) : ?>
+<tr valign="top">
+<th scope="row"><?php _e( 'Reset Image' ); ?></th>
+<td>
+	<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ) ?></p>
+	<input type="submit" class="button" name="resetheader" value="<?php esc_attr_e( 'Restore Original Header Image' ); ?>" />
+</td>
+</tr>
+	<?php endif; ?>
+</tbody>
+</table>
+
+	<?php if ( $this->header_text() ) : ?>
+<h3><?php _e( 'Header Text' ) ?></h3>
+<table class="form-table">
+<tbody>
+<tr valign="top" class="hide-if-no-js">
+<th scope="row"><?php _e( 'Display Text' ); ?></th>
+<td>
+	<p>
+	<?php $hidetext = get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ); ?>
+	<label><input type="radio" value="1" name="hidetext" id="hidetext"<?php checked( ( 'blank' == $hidetext || empty( $hidetext ) )  ? true : false ); ?> /> <?php _e( 'No' ); ?></label>
+	<label><input type="radio" value="0" name="hidetext" id="showtext"<?php checked( ( 'blank' == $hidetext || empty( $hidetext ) ) ? false : true ); ?> /> <?php _e( 'Yes' ); ?></label>
+	</p>
+</td>
+</tr>
+
+<tr valign="top" id="text-color-row">
+<th scope="row"><?php _e( 'Text Color' ); ?></th>
+<td>
+	<p>
+		<input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) ); ?>" />
+		<span class="description hide-if-js"><?php _e( 'If you want to hide header text, add <strong>#blank</strong> as text color.' );?></span>
+		<input type="button" class="button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color' ); ?>" id="pickcolor" />
+	</p>
+	<div id="color-picker" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
+</td>
+</tr>
+
+	<?php if ( defined('HEADER_TEXTCOLOR') && get_theme_mod('header_textcolor') ) { ?>
+<tr valign="top">
+<th scope="row"><?php _e('Reset Text Color'); ?></th>
+<td>
+	<p><?php _e( 'This will restore the original header text. You will not be able to restore any customizations.' ) ?></p>
+	<input type="submit" class="button" name="resettext" value="<?php esc_attr_e( 'Restore Original Header Text' ); ?>" />
+</td>
+</tr>
+	<?php } ?>
+
+</tbody>
+</table>
+	<?php endif;
+
+wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
+<p class="submit"><input type="submit" class="button-primary" name="save-header-options" value="<?php esc_attr_e( 'Save Changes' ); ?>" /></p>
 </form>
 </div>
-		<?php endif;

-	}
+<?php }

 	/**
 	 * Display second step of custom header image page.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 */
 	function step_2() {
-		check_admin_referer('custom-header');
+		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
 		$overrides = array('test_form' => false);
 		$file = wp_handle_upload($_FILES['import'], $overrides);

 		if ( isset($file['error']) )
-		die( $file['error'] );
+			wp_die( $file['error'],  __( 'Image Upload Error' ) );

 		$url = $file['url'];
 		$type = $file['type'];
@@ -360,6 +601,9 @@ class Custom_Image_Header {
 		} elseif ( $width > HEADER_IMAGE_WIDTH ) {
 			$oitar = $width / HEADER_IMAGE_WIDTH;
 			$image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
+			if ( is_wp_error( $image ) )
+				wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) );
+
 			$image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication

 			$url = str_replace(basename($url), basename($image), $url);
@@ -371,27 +615,27 @@ class Custom_Image_Header {
 		?>

 <div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php _e( 'Crop Header Image' ); ?></h2>

-<form method="POST" action="<?php echo esc_attr(add_query_arg('step', 3)) ?>">
+<form method="post" action="<?php echo esc_attr(add_query_arg('step', 3)); ?>">
+	<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
+	<p class="hide-if-js"><strong><?php _e( 'You need Javascript to choose a part of the image.'); ?></strong></p>

-<p><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-<div id="testWrap" style="position: relative">
-<img src="<?php echo $url; ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
-</div>
-
-<p class="submit">
-<input type="hidden" name="x1" id="x1" />
-<input type="hidden" name="y1" id="y1" />
-<input type="hidden" name="x2" id="x2" />
-<input type="hidden" name="y2" id="y2" />
-<input type="hidden" name="width" id="width" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($id); ?>" />
-<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr($oitar); ?>" />
-<?php wp_nonce_field('custom-header') ?>
-<input type="submit" value="<?php esc_attr_e('Crop Header'); ?>" />
-</p>
+	<div id="crop_image" style="position: relative">
+		<img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
+	</div>

+	<p class="submit">
+	<input type="hidden" name="x1" id="x1" value="0"/>
+	<input type="hidden" name="y1" id="y1" value="0"/>
+	<input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/>
+	<input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
+	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $id ); ?>" />
+	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
+	<?php wp_nonce_field( 'custom-header-crop-image' ) ?>
+	<input type="submit" class="button-primary" value="<?php esc_attr_e( 'Crop and Publish' ); ?>" />
+	</p>
 </form>
 </div>
 		<?php
@@ -400,10 +644,10 @@ class Custom_Image_Header {
 	/**
 	 * Display third step of custom header image page.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 */
 	function step_3() {
-		check_admin_referer('custom-header');
+		check_admin_referer('custom-header-crop-image');
 		if ( $_POST['oitar'] > 1 ) {
 			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
 			$_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
@@ -414,6 +658,9 @@ class Custom_Image_Header {
 		$original = get_attached_file( $_POST['attachment_id'] );

 		$cropped = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT);
+		if ( is_wp_error( $cropped ) )
+			wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) );
+
 		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $_POST['attachment_id']); // For replication

 		$parent = get_post($_POST['attachment_id']);
@@ -446,25 +693,21 @@ class Custom_Image_Header {
 	/**
 	 * Display last step of custom header image page.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 */
 	function finished() {
-		?>
-<div class="wrap">
-<h2><?php _e('Header complete!'); ?></h2>
-
-<p><?php _e('Visit your site and you should see the new header now.'); ?></p>
-
-</div>
-		<?php
+		$this->updated = true;
+		$this->step_1();
 	}

 	/**
 	 * Display the page based on the current step.
 	 *
-	 * @since unknown
+	 * @since 2.1.0
 	 */
 	function admin_page() {
+		if ( ! current_user_can('edit_theme_options') )
+			wp_die(__('You do not have permission to customize headers.'));
 		$step = $this->step();
 		if ( 1 == $step )
 			$this->step_1();
--- a/wp-admin/edit-attachment-rows.php
+++ b/wp-admin/edit-attachment-rows.php
@@ -39,8 +39,8 @@ elseif ( !$is_trash && $post->post_status == 'trash' )
 	continue;

 $alt = ( 'alternate' == $alt ) ? '' : 'alternate';
-global $current_user;
-$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
+
+$post_owner = ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
 $att_title = _draft_or_post_title();
 ?>
 	<tr id='post-<?php echo $id; ?>' class='<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top">
@@ -71,7 +71,7 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
 				if ( $is_trash ) echo $thumb;
 				else {
 ?>
-				<a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>">
+				<a href="<?php echo get_edit_post_link( $post->ID, true ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>">
 					<?php echo $thumb; ?>
 				</a>

@@ -84,25 +84,33 @@ foreach ($posts_columns as $column_name => $column_display_name ) {

 	case 'media':
 		?>
-		<td <?php echo $attributes ?>><strong><?php if ( $is_trash ) echo $att_title; else { ?><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>"><?php echo $att_title; ?></a><?php } ?></strong><br />
-		<?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
+		<td <?php echo $attributes ?>><strong><?php if ( $is_trash ) echo $att_title; else { ?><a href="<?php echo get_edit_post_link( $post->ID, true ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>"><?php echo $att_title; ?></a><?php } ?></strong>
 		<p>
 		<?php
+		if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
+			echo esc_html( strtoupper( $matches[1] ) );
+		else
+			echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
+		?>
+		</p>
+		<?php
 		$actions = array();
 		if ( current_user_can('edit_post', $post->ID) && !$is_trash )
 			$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
 		if ( current_user_can('delete_post', $post->ID) ) {
 			if ( $is_trash )
-				$actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID) . "'>" . __('Restore') . "</a>";
+				$actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=untrash&amp;post=$post->ID", 'untrash-attachment_' . $post->ID) . "'>" . __('Restore') . "</a>";
 			elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
-				$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID) . "'>" . __('Trash') . "</a>";
+				$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-attachment_' . $post->ID) . "'>" . __('Trash') . "</a>";
 			if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
 				$delete_ays = (!$is_trash && !MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : '';
-				$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
+				$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-attachment_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
 			}
 		}
-		if ( !$is_trash )
+		if ( !$is_trash ) {
+			$title =_draft_or_post_title($post->post_parent);
 			$actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
+		}
 		$actions = apply_filters( 'media_row_actions', $actions, $post );
 		$action_count = count($actions);
 		$i = 0;
@@ -113,7 +121,7 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
 			echo "<span class='$action'>$link$sep</span>";
 		}
 		echo '</div>';
-		?></p></td>
+		?></td>
 		<?php
 		break;

--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -1,83 +0,0 @@
-<?php
-/**
- * Edit category form for inclusion in administration panels.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-// don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
-
-if ( !current_user_can('manage_categories') )
-	wp_die(__('You do not have sufficient permissions to edit categories for this blog.'));
-
-/**
- * @var object
- */
-if ( ! isset( $category ) )
-	$category = (object) array();
-
-/**
- * @ignore
- * @since 2.7
- * @internal Used to prevent errors in page when no category is being edited.
- *
- * @param object $category
- */
-function _fill_empty_category(&$category) {
-	if ( ! isset( $category->name ) )
-		$category->name = '';
-
-	if ( ! isset( $category->slug ) )
-		$category->slug = '';
-
-	if ( ! isset( $category->parent ) )
-		$category->parent = '';
-
-	if ( ! isset( $category->description ) )
-		$category->description = '';
-}
-
-do_action('edit_category_form_pre', $category);
-
-_fill_empty_category($category);
-?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e('Edit Category'); ?></h2>
-<div id="ajax-response"></div>
-<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">
-<input type="hidden" name="action" value="editedcat" />
-<input type="hidden" name="cat_ID" value="<?php echo esc_attr($category->term_id) ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-category_' . $cat_ID); ?>
-	<table class="form-table">
-		<tr class="form-field form-required">
-			<th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
-			<td><input name="cat_name" id="cat_name" type="text" value="<?php echo esc_attr($category->name); ?>" size="40" aria-required="true" /><br />
-		</tr>
-		<tr class="form-field">
-			<th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
-			<td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo esc_attr(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br />
-            <span class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></span></td>
-		</tr>
-		<tr class="form-field">
-			<th scope="row" valign="top"><label for="category_parent"><?php _e('Category Parent') ?></label></th>
-			<td>
-	  			<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'exclude' => $category->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
-                <span class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></span>
-	  		</td>
-		</tr>
-		<tr class="form-field">
-			<th scope="row" valign="top"><label for="category_description"><?php _e('Description') ?></label></th>
-			<td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($category->description); ?></textarea><br />
-            <span class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></span></td>
-		</tr>
-		<?php do_action('edit_category_form_fields', $category); ?>
-	</table>
-<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Category'); ?>" /></p>
-<?php do_action('edit_category_form', $category); ?>
-</form>
-</div>
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -7,7 +7,7 @@
 */

 /** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');

 if ( !current_user_can('edit_posts') )
 	wp_die(__('Cheatin&#8217; uh?'));
@@ -32,10 +32,11 @@ if ( isset($_REQUEST['doaction']) ||  isset($_REQUEST['doaction2']) || isset($_R
 		$comment_ids = array_map( 'absint', explode(',', $_REQUEST['ids']) );
 		$doaction = $_REQUEST['action'];
 	} else {
-		wp_redirect($_SERVER['HTTP_REFERER']);
+		wp_redirect( wp_get_referer() );
 	}

 	$approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
+	$redirect_to = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids'), wp_get_referer() );

 	foreach ($comment_ids as $comment_id) { // Check the permissions on each
 		$_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) );
@@ -75,8 +76,6 @@ if ( isset($_REQUEST['doaction']) ||  isset($_REQUEST['doaction2']) || isset($_R
 		}
 	}

-	$redirect_to = 'edit-comments.php';
-
 	if ( $approved )
 		$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
 	if ( $unapproved )
@@ -94,30 +93,33 @@ if ( isset($_REQUEST['doaction']) ||  isset($_REQUEST['doaction2']) || isset($_R
 	if ( $trashed || $spammed )
 		$redirect_to = add_query_arg( 'ids', join(',', $comment_ids), $redirect_to );

-	if ( $post_id )
-		$redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
-	if ( isset($_REQUEST['apage']) )
-		$redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to );
-	if ( !empty($_REQUEST['mode']) )
-		$redirect_to = add_query_arg('mode', $_REQUEST['mode'], $redirect_to);
-	if ( !empty($_REQUEST['comment_status']) )
-		$redirect_to = add_query_arg('comment_status', $_REQUEST['comment_status'], $redirect_to);
-	if ( !empty($_REQUEST['s']) )
-		$redirect_to = add_query_arg('s', $_REQUEST['s'], $redirect_to);
 	wp_redirect( $redirect_to );
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+	exit;
+} elseif ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }

 if ( $post_id )
-	$title = sprintf(__('Edit Comments on &#8220;%s&#8221;'), wp_html_excerpt(_draft_or_post_title($post_id), 50));
+	$title = sprintf(__('Comments on &#8220;%s&#8221;'), wp_html_excerpt(_draft_or_post_title($post_id), 50));
 else
-	$title = __('Edit Comments');
+	$title = __('Comments');

-require_once('admin-header.php');
+add_contextual_help( $current_screen, '<p>' . __('You can manage comments made on your site similar to the way you manage Posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.') . '</p>' .
+	'<p>' . __('A yellow row means the comment is waiting for you to moderate it.') . '</p>' .
+	'<p>' . __('In the Author column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.') . '</p>' .
+	'<p>' . __('In the Comment column, above each comment it says &#8220;Submitted on,&#8221; followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site.') . '</p>' .
+	'<p>' . __('In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The &#8220;#&#8221; permalink symbol below leads to that post on your live site. The small bubble with the number in it shows how many comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post.') . '</p>' .
+	'<p>' . __('Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link below to learn more.') . '</p>' .
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="http://codex.wordpress.org/Administration_Panels#Comments" target="_blank">Comments Documentation</a>' ) . '</p>' .
+	'<p>' . __( '<a href="http://codex.wordpress.org/Comment_Spam" target="_blank">Comment Spam Documentation</a>') . '</p>' .
+	'<p>' . __( '<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">Keyboard Shortcuts Documentation</a>') . '</p>' .
+	'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+);
+require_once('./admin-header.php');

-$mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
+$mode = ( empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);

 $comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
 if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam', 'trash')) )
@@ -136,45 +138,68 @@ if ( isset($_GET['s']) && $_GET['s'] )
 </h2>

 <?php
-if ( isset($_GET['approved']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) || isset($_GET['spammed']) || isset($_GET['unspammed']) ) {
-	$approved = isset($_GET['approved']) ? (int) $_GET['approved'] : 0;
-	$deleted = isset($_GET['deleted']) ? (int) $_GET['deleted'] : 0;
-	$trashed = isset($_GET['trashed']) ? (int) $_GET['trashed'] : 0;
-	$untrashed = isset($_GET['untrashed']) ? (int) $_GET['untrashed'] : 0;
-	$spammed = isset($_GET['spammed']) ? (int) $_GET['spammed'] : 0;
-	$unspammed = isset($_GET['unspammed']) ? (int) $_GET['unspammed'] : 0;
+if ( isset( $_GET['error'] ) ) {
+	$error = (int) $_GET['error'];
+	$error_msg = '';
+	switch ( $error ) {
+		case 1 :
+			$error_msg = __( 'Oops, no comment with this ID.' );
+			break;
+		case 2 :
+			$error_msg = __( 'You are not allowed to edit comments on this post.' );
+			break;
+	}
+	if ( $error_msg )
+		echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+}

-	if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 ) {
-		echo '<div id="moderated" class="updated fade"><p>';
+if ( isset($_GET['approved']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) || isset($_GET['spammed']) || isset($_GET['unspammed']) || isset($_GET['same']) ) {
+	$approved  = isset( $_GET['approved']  ) ? (int) $_GET['approved']  : 0;
+	$deleted   = isset( $_GET['deleted']   ) ? (int) $_GET['deleted']   : 0;
+	$trashed   = isset( $_GET['trashed']   ) ? (int) $_GET['trashed']   : 0;
+	$untrashed = isset( $_GET['untrashed'] ) ? (int) $_GET['untrashed'] : 0;
+	$spammed   = isset( $_GET['spammed']   ) ? (int) $_GET['spammed']   : 0;
+	$unspammed = isset( $_GET['unspammed'] ) ? (int) $_GET['unspammed'] : 0;
+	$same      = isset( $_GET['same'] )      ? (int) $_GET['same']      : 0;
+
+	if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
+		if ( $approved > 0 )
+			$messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );

-		if ( $approved > 0 ) {
-			printf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
-			echo '<br />';
-		}
 		if ( $spammed > 0 ) {
-			printf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed );
 			$ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
-			echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
-		}
-		if ( $unspammed > 0 ) {
-			printf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
-			echo '<br />';
-		}
-		if ( $trashed > 0 ) {
-			printf( _n( '%s comment moved to the trash.', '%s comments moved to the trash.', $trashed ), $trashed );
-			$ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
-			echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
-		}
-		if ( $untrashed > 0 ) {
-			printf( _n( '%s comment restored from the trash', '%s comments restored from the trash', $untrashed ), $untrashed );
-			echo '<br />';
-		}
-		if ( $deleted > 0 ) {
-			printf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
-			echo '<br />';
+			$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
 		}

-		echo '</p></div>';
+		if ( $unspammed > 0 )
+			$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
+
+		if ( $trashed > 0 ) {
+			$ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
+			$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+		}
+
+		if ( $untrashed > 0 )
+			$messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
+
+		if ( $deleted > 0 )
+			$messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
+
+		if ( $same > 0 && $comment = get_comment( $same ) ) {
+			switch ( $comment->comment_approved ) {
+				case '1' :
+					$messages[] = __('This comment is already approved.') . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+					break;
+				case 'trash' :
+					$messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
+					break;
+				case 'spam' :
+					$messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+					break;
+			}
+		}
+
+		echo '<div id="moderated" class="updated"><p>' . implode( "<br/>\n", $messages ) . '</p></div>';
 	}
 }
 ?>
@@ -187,7 +212,7 @@ $num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments
 //, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
 //, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
 $stati = array(
-		'all' => _n_noop('All', 'All'), // singular not used
+		'all' => _nx_noop('All', 'All', 'comments'), // singular not used
 		'moderated' => _n_noop('Pending <span class="count">(<span class="pending-count">%s</span>)</span>', 'Pending <span class="count">(<span class="pending-count">%s</span>)</span>'),
 		'approved' => _n_noop('Approved', 'Approved'), // singular not used
 		'spam' => _n_noop('Spam <span class="count">(<span class="spam-count">%s</span>)</span>', 'Spam <span class="count">(<span class="spam-count">%s</span>)</span>'),
@@ -202,10 +227,8 @@ if ( !empty($comment_type) && 'all' != $comment_type )
 	$link = add_query_arg( 'comment_type', $comment_type, $link );

 foreach ( $stati as $status => $label ) {
-	$class = '';
+	$class = ( $status == $comment_status ) ? ' class="current"' : '';

-	if ( $status == $comment_status )
-		$class = ' class="current"';
 	if ( !isset( $num_comments->$status ) )
 		$num_comments->$status = 10;
 	$link = add_query_arg( 'comment_status', $status, $link );
@@ -216,8 +239,12 @@ foreach ( $stati as $status => $label ) {
 	if ( !empty( $_GET['s'] ) )
 		$link = add_query_arg( 's', esc_attr( stripslashes( $_GET['s'] ) ), $link );
 	*/
-	$status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf(
-		_n( $label[0], $label[1], $num_comments->$status ),
+	if ( isset( $label[2] ) )
+		$translated_label = _nx( $label[0], $label[1], $num_comments->$status, $label[2] );
+	else
+		$translated_label = _n( $label[0], $label[1], $num_comments->$status );
+	$status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf( 
+		$translated_label,
 		number_format_i18n( $num_comments->$status )
 	) . '</a>';
 }
@@ -236,7 +263,7 @@ unset($status_links);
 </p>

 <?php
-$comments_per_page = (int) get_user_option( 'edit_comments_per_page', 0, false );
+$comments_per_page = (int) get_user_option( 'edit_comments_per_page' );
 if ( empty( $comments_per_page ) || $comments_per_page < 1 )
 	$comments_per_page = 20;
 $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
@@ -254,11 +281,8 @@ $_comment_post_ids = array();
 foreach ( $_comments as $_c ) {
 	$_comment_post_ids[] = $_c->comment_post_ID;
 }
-$_comment_pending_count_temp = (array) get_pending_comments_num($_comment_post_ids);
-foreach ( (array) $_comment_post_ids as $_cpid )
-	$_comment_pending_count[$_cpid] = isset( $_comment_pending_count_temp[$_cpid] ) ? $_comment_pending_count_temp[$_cpid] : 0;
-if ( empty($_comment_pending_count) )
-	$_comment_pending_count = array();
+
+$_comment_pending_count = get_pending_comments_num($_comment_post_ids);

 $comments = array_slice($_comments, 0, $comments_per_page);
 $extra_comments = array_slice($_comments, $comments_per_page);
@@ -295,6 +319,7 @@ $page_links = paginate_links( array(
 <input type="hidden" name="_page" value="<?php echo esc_attr($page); ?>" />
 <?php endif; ?>

+<?php if ( $comments ) : ?>
 <div class="alignleft actions">
 <select name="action">
 <option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option>
@@ -305,12 +330,12 @@ $page_links = paginate_links( array(
 <option value="approve"><?php _e('Approve'); ?></option>
 <?php endif; ?>
 <?php if ( 'all' == $comment_status || 'approved' == $comment_status || 'moderated' == $comment_status ): ?>
-<option value="spam"><?php _e('Mark as Spam'); ?></option>
+<option value="spam"><?php _ex('Mark as Spam', 'comment'); ?></option>
 <?php endif; ?>
 <?php if ( 'trash' == $comment_status ): ?>
 <option value="untrash"><?php _e('Restore'); ?></option>
 <?php elseif ( 'spam' == $comment_status ): ?>
-<option value="unspam"><?php _e('Not Spam'); ?></option>
+<option value="unspam"><?php _ex('Not Spam', 'comment'); ?></option>
 <?php endif; ?>
 <?php if ( 'trash' == $comment_status || 'spam' == $comment_status || !EMPTY_TRASH_DAYS ): ?>
 <option value="delete"><?php _e('Delete Permanently'); ?></option>
@@ -321,6 +346,8 @@ $page_links = paginate_links( array(
 <input type="submit" name="doaction" id="doaction" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary apply" />
 <?php wp_nonce_field('bulk-comments'); ?>

+<?php endif; ?>
+
 <select name="comment_type">
 	<option value="all"><?php _e('Show all comment types'); ?></option>
 <?php
@@ -358,8 +385,8 @@ if ( ( 'spam' == $comment_status || 'trash' == $comment_status) && current_user_
 </div>

 <div class="clear"></div>
-
 <?php if ( $comments ) { ?>
+
 <table class="widefat comments fixed" cellspacing="0">
 <thead>
 	<tr>
@@ -403,7 +430,7 @@ if ( $page_links )
 <option value="approve"><?php _e('Approve'); ?></option>
 <?php endif; ?>
 <?php if ( 'all' == $comment_status || 'approved' == $comment_status || 'moderated' == $comment_status ): ?>
-<option value="spam"><?php _e('Mark as Spam'); ?></option>
+<option value="spam"><?php _ex('Mark as Spam', 'comment'); ?></option>
 <?php endif; ?>
 <?php if ( 'trash' == $comment_status ): ?>
 <option value="untrash"><?php _e('Restore'); ?></option>
@@ -411,7 +438,7 @@ if ( $page_links )
 <?php if ( 'trash' == $comment_status || 'spam' == $comment_status || !EMPTY_TRASH_DAYS ): ?>
 <option value="delete"><?php _e('Delete Permanently'); ?></option>
 <?php elseif ( 'spam' == $comment_status ): ?>
-<option value="unspam"><?php _e('Not Spam'); ?></option>
+<option value="unspam"><?php _ex('Not Spam', 'comment'); ?></option>
 <?php else: ?>
 <option value="trash"><?php _e('Move to Trash'); ?></option>
 <?php endif; ?>
@@ -446,10 +473,12 @@ if ( $page_links )

 <?php } elseif ( 'moderated' == $comment_status ) { ?>
 <p><?php _e('No comments awaiting moderation&hellip; yet.') ?></p>
+</div>
 </form>

 <?php } else { ?>
-<p><?php _e('No results found.') ?></p>
+<p><?php _e('No comments found.') ?></p>
+</div>
 </form>

 <?php } ?>
@@ -458,4 +487,4 @@ if ( $page_links )
 <?php
 wp_comment_reply('-1', true, 'detail');
 wp_comment_trashnotice();
-include('admin-footer.php'); ?>
+include('./admin-footer.php'); ?>
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -10,123 +10,189 @@
 if ( !defined('ABSPATH') )
 	die('-1');

+wp_enqueue_script('post');
+
+if ( post_type_supports($post_type, 'editor') ) {
+	if ( user_can_richedit() )
+		wp_enqueue_script('editor');
+	wp_enqueue_script('word-count');
+}
+
+if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) {
+	add_thickbox();
+	wp_enqueue_script('media-upload');
+}
+
 /**
 * Post ID global
 * @name $post_ID
 * @var int
 */
 $post_ID = isset($post_ID) ? (int) $post_ID : 0;
-
+$temp_ID = isset($temp_ID) ? (int) $temp_ID : 0;
+$user_ID = isset($user_ID) ? (int) $user_ID : 0;
 $action = isset($action) ? $action : '';

+$messages = array();
+$messages['post'] = array(
+	 0 => '', // Unused. Messages start at index 1.
+	 1 => sprintf( __('Post updated. <a href="%s">View post</a>'), esc_url( get_permalink($post_ID) ) ),
+	 2 => __('Custom field updated.'),
+	 3 => __('Custom field deleted.'),
+	 4 => __('Post updated.'),
+	/* translators: %s: date and time of the revision */
+	 5 => isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+	 6 => sprintf( __('Post published. <a href="%s">View post</a>'), esc_url( get_permalink($post_ID) ) ),
+	 7 => __('Post saved.'),
+	 8 => sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
+	 9 => sprintf( __('Post scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview post</a>'),
+		// translators: Publish box date format, see http://php.net/date
+		date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post_ID) ) ),
+	10 => sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
+);
+$messages['page'] = array(
+	 0 => '', // Unused. Messages start at index 1.
+	 1 => sprintf( __('Page updated. <a href="%s">View page</a>'), esc_url( get_permalink($post_ID) ) ),
+	 2 => __('Custom field updated.'),
+	 3 => __('Custom field deleted.'),
+	 4 => __('Page updated.'),
+	 5 => isset($_GET['revision']) ? sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+	 6 => sprintf( __('Page published. <a href="%s">View page</a>'), esc_url( get_permalink($post_ID) ) ),
+	 7 => __('Page saved.'),
+	 8 => sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
+	 9 => sprintf( __('Page scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post_ID) ) ),
+	10 => sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
+);
+
+$messages = apply_filters( 'post_updated_messages', $messages );
+
 $message = false;
 if ( isset($_GET['message']) ) {
 	$_GET['message'] = absint( $_GET['message'] );
-
-	switch ( $_GET['message'] ) {
-		case 1:
-			$message = sprintf( __('Post updated. <a href="%s">View post</a>'), get_permalink($post_ID) );
-			break;
-		case 2:
-			$message = __('Custom field updated.');
-			break;
-		case 3:
-			$message = __('Custom field deleted.');
-			break;
-		case 4:
-			$message = __('Post updated.');
-			break;
-		case 5:
-			if ( isset($_GET['revision']) )
-				$message = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
-			break;
-		case 6:
-			$message = sprintf( __('Post published. <a href="%s">View post</a>'), get_permalink($post_ID) );
-			break;
-		case 7:
-			$message = __('Post saved.');
-			break;
-		case 8:
-			$message = sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
-			break;
-		case 9:
-			// translators: Publish box date formt, see http://php.net/date - Same as in meta-boxes.php
-			$message = sprintf( __('Post scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview post</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) );
-			break;
-		case 10:
-			$message = sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
-			break;
-	}
+	if ( isset($messages[$post_type][$_GET['message']]) )
+		$message = $messages[$post_type][$_GET['message']];
+	elseif ( !isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]) )
+		$message = $messages['post'][$_GET['message']];
 }

 $notice = false;
-if ( 0 == $post_ID ) {
-	$form_action = 'post';
-	$temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
-	$form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='" . esc_attr($temp_ID) . "' />";
+$form_extra = '';
+if ( 'auto-draft' == $post->post_status ) {
+	if ( 'edit' == $action )
+		$post->post_title = '';
 	$autosave = false;
+	$form_extra .= "<input type='hidden' id='auto_draft' name='auto_draft' value='1' />";
 } else {
-	$form_action = 'editpost';
-	$form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($post_ID) . "' />";
 	$autosave = wp_get_post_autosave( $post_ID );
-
-	// Detect if there exists an autosave newer than the post and if that autosave is different than the post
-	if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
-		foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
-			if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
-				$notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>.' ), get_edit_post_link( $autosave->ID ) );
-				break;
-			}
-		}
-		unset($autosave_field, $_autosave_field);
-	}
 }

+$form_action = 'editpost';
+$nonce_action = 'update-' . $post_type . '_' . $post_ID;
+$form_extra .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($post_ID) . "' />";
+
+// Detect if there exists an autosave newer than the post and if that autosave is different than the post
+if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
+	foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
+		if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
+			$notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
+			break;
+		}
+	}
+	unset($autosave_field, $_autosave_field);
+}
+
+$post_type_object = get_post_type_object($post_type);
+
 // All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
-require_once('includes/meta-boxes.php');
+require_once('./includes/meta-boxes.php');

-add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'post', 'side', 'core');
+add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');

-// all tag-style post taxonomies
-foreach ( get_object_taxonomies('post') as $tax_name ) {
-	if ( !is_taxonomy_hierarchical($tax_name) ) {
-		$taxonomy = get_taxonomy($tax_name);
-		$label = isset($taxonomy->label) ? esc_attr($taxonomy->label) : $tax_name;
+// all taxonomies
+foreach ( get_object_taxonomies($post_type) as $tax_name ) {
+	$taxonomy = get_taxonomy($tax_name);
+	if ( ! $taxonomy->show_ui )
+		continue;

-		add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', 'post', 'side', 'core');
-	}
+	$label = $taxonomy->labels->name;
+
+	if ( !is_taxonomy_hierarchical($tax_name) )
+		add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', $post_type, 'side', 'core', array( 'taxonomy' => $tax_name ));
+	else
+		add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', $post_type, 'side', 'core', array( 'taxonomy' => $tax_name ));
 }

-add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
-if ( current_theme_supports( 'post-thumbnails', 'post' ) )
-	add_meta_box('postimagediv', __('Post Thumbnail'), 'post_thumbnail_meta_box', 'post', 'side', 'low');
-add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core');
-add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', 'post', 'normal', 'core');
-add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'normal', 'core');
+if ( post_type_supports($post_type, 'page-attributes') )
+	add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core');
+
+if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' )
+	&& ( ! is_multisite() || ( ( $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ) ) && ! empty( $mu_media_buttons['image'] ) ) ) )
+		add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
+
+if ( post_type_supports($post_type, 'excerpt') )
+	add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core');
+
+if ( post_type_supports($post_type, 'trackbacks') )
+	add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', $post_type, 'normal', 'core');
+
+if ( post_type_supports($post_type, 'custom-fields') )
+	add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', $post_type, 'normal', 'core');
+
 do_action('dbx_post_advanced');
-add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
+if ( post_type_supports($post_type, 'comments') )
+	add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', $post_type, 'normal', 'core');

-if ( 'publish' == $post->post_status || 'private' == $post->post_status )
-	add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', 'post', 'normal', 'core');
+if ( ('publish' == $post->post_status || 'private' == $post->post_status) && post_type_supports($post_type, 'comments') )
+	add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', $post_type, 'normal', 'core');

-if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) )
-	add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'normal', 'core');
+if ( !( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) )
+	add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');

-$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
-if ( $post->post_author && !in_array($post->post_author, $authors) )
-	$authors[] = $post->post_author;
-if ( $authors && count( $authors ) > 1 )
-	add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'normal', 'core');
+if ( post_type_supports($post_type, 'author') ) {
+	$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
+	if ( $post->post_author && !in_array($post->post_author, $authors) )
+		$authors[] = $post->post_author;
+	if ( ( $authors && count( $authors ) > 1 ) || is_super_admin() )
+		add_meta_box('authordiv', __('Author'), 'post_author_meta_box', $post_type, 'normal', 'core');
+}

-if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
-	add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'normal', 'core');
+if ( post_type_supports($post_type, 'revisions') && 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
+	add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', $post_type, 'normal', 'core');

-do_action('do_meta_boxes', 'post', 'normal', $post);
-do_action('do_meta_boxes', 'post', 'advanced', $post);
-do_action('do_meta_boxes', 'post', 'side', $post);
+do_action('add_meta_boxes', $post_type, $post);
+do_action('add_meta_boxes_' . $post_type, $post);

-require_once('admin-header.php');
+do_action('do_meta_boxes', $post_type, 'normal', $post);
+do_action('do_meta_boxes', $post_type, 'advanced', $post);
+do_action('do_meta_boxes', $post_type, 'side', $post);

+if ( 'post' == $post_type ) {
+	add_contextual_help($current_screen,
+	'<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes that allow you to add metadata to your post using drag and drop, and can minimize or expand them by clicking the title bar of the box. You can also hide any of the boxes by using the Screen Options tab, where you can also choose a 1- or 2-column layout for this screen.') . '</p>' .
+	'<p>' . __('<strong>Title</strong> - Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>' .
+	'<p>' . __('<strong>Post editor</strong> - Enter the text for your post. There are two modes of editing: Visual and HTML. Choose the mode by clicking on the appropriate tab. Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. The HTML mode allows you to enter raw HTML along with your post text. You can insert media files by clicking the icons above the post editor and following the directions.') . '</p>' .
+	'<p>' . __('<strong>Publish</strong> - You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.') . '</p>' .
+	'<p>' . __('<strong>Featured Image</strong> - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the featured image as a post thumbnail on the home page, a custom header, etc.') . '</p>' .
+	'<p>' . __('<strong>Send Trackbacks</strong> - Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.') . '</p>' .
+	'<p>' . __('<strong>Discussion</strong> - You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '</p>' .
+	'<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'options-writing.php') . '</p>' .
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="http://codex.wordpress.org/Writing_Posts" target="_blank">Documentation on Writing Posts</a>') . '</p>' .
+	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	);
+} elseif ( 'page' == $post_type ) {
+	add_contextual_help($current_screen, '<p>' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the &#8220;Parent&#8221; of the other, creating a group of Pages.') . '</p>' .
+	'<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. The Page editor mostly works the same Post editor, but there are some Page-specific features in the Page Attributes box:') . '</p>' .
+	'<p>' . __('<strong>Parent</strong> - You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
+	'<p>' . __('<strong>Template</strong> - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
+	'<p>' . __('<strong>Order</strong> - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>' .
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="http://codex.wordpress.org/Pages_Add_New_SubPanel" target="_blank">Page Creation Documentation</a>') . '</p>' .
+	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	);
+}
+
+require_once('./admin-header.php');
 ?>

 <div class="wrap">
@@ -136,61 +202,70 @@ require_once('admin-header.php');
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
 <?php endif; ?>
 <?php if ( $message ) : ?>
-<div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
+<div id="message" class="updated"><p><?php echo $message; ?></p></div>
 <?php endif; ?>
-<form name="post" action="post.php" method="post" id="post">
-<?php
-
-if ( 0 == $post_ID)
-	wp_nonce_field('add-post');
-else
-	wp_nonce_field('update-post_' .  $post_ID);
-
-?>
-
+<form name="post" action="post.php" method="post" id="post"<?php do_action('post_edit_form_tag'); ?>>
+<?php wp_nonce_field($nonce_action); ?>
 <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
 <input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr($form_action) ?>" />
 <input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr($form_action) ?>" />
 <input type="hidden" id="post_author" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
-<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr($post->post_type) ?>" />
+<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr($post_type) ?>" />
 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr($post->post_status) ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
+<input type="hidden" id="referredby" name="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
 <?php
 if ( 'draft' != $post->post_status )
 	wp_original_referer_field(true, 'previous');

-echo $form_extra ?>
+echo $form_extra;
+
+wp_nonce_field( 'autosave', 'autosavenonce', false );
+wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+?>

 <div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
 <div id="side-info-column" class="inner-sidebar">

-<?php do_action('submitpost_box'); ?>
-
-<?php $side_meta_boxes = do_meta_boxes('post', 'side', $post); ?>
+<?php
+('page' == $post_type) ? do_action('submitpage_box') : do_action('submitpost_box');
+$side_meta_boxes = do_meta_boxes($post_type, 'side', $post);
+?>
 </div>

 <div id="post-body">
 <div id="post-body-content">
+<?php if ( post_type_supports($post_type, 'title') ) { ?>
 <div id="titlediv">
 <div id="titlewrap">
-	<label class="screen-reader-text" for="title"><?php _e('Title') ?></label>
+	<label class="hide-if-no-js" style="visibility:hidden" id="title-prompt-text" for="title"><?php _e('Enter title here') ?></label>
 	<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo esc_attr( htmlspecialchars( $post->post_title ) ); ?>" id="title" autocomplete="off" />
 </div>
 <div class="inside">
 <?php
 $sample_permalink_html = get_sample_permalink_html($post->ID);
-if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) ) { ?>
+$shortlink = wp_get_shortlink($post->ID, 'post');
+if ( !empty($shortlink) )
+    $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+
+if ( !( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) ) { ?>
 	<div id="edit-slug-box">
-<?php
-	if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
-		echo $sample_permalink_html;
-endif; ?>
+	<?php
+		if ( ! empty($post->ID) && ! empty($sample_permalink_html) && 'auto-draft' != $post->post_status )
+			echo $sample_permalink_html;
+	?>
 	</div>
 <?php
-} ?>
+}
+?>
 </div>
+<?php
+wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
+?>
 </div>
+<?php } ?>

+<?php if ( post_type_supports($post_type, 'editor') ) { ?>
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">

 <?php the_editor($post->post_content); ?>
@@ -200,7 +275,7 @@ endif; ?>
 	<td class="autosave-info">
 	<span id="autosave">&nbsp;</span>
 <?php
-	if ( $post_ID ) {
+	if ( 'auto-draft' != $post->post_status ) {
 		echo '<span id="last-edit">';
 		if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
 			$last_user = get_userdata($last_id);
@@ -213,21 +288,16 @@ endif; ?>
 	</td>
 </tr></tbody></table>

-<?php
-wp_nonce_field( 'autosave', 'autosavenonce', false );
-wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-wp_nonce_field( 'getpermalink', 'getpermalinknonce', false );
-wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
 </div>

 <?php
+}

-do_meta_boxes('post', 'normal', $post);
+do_meta_boxes($post_type, 'normal', $post);

-do_action('edit_form_advanced');
+( 'page' == $post_type ) ? do_action('edit_page_form') : do_action('edit_form_advanced');

-do_meta_boxes('post', 'advanced', $post);
+do_meta_boxes($post_type, 'advanced', $post);

 do_action('dbx_post_sidebar'); ?>

--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -47,9 +47,9 @@ $comment->comment_author_email = esc_attr($comment->comment_author_email);
 <div id="misc-publishing-actions">

 <div class="misc-pub-section" id="comment-status-radio">
-<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ echo _x('Approved', 'adjective') ?></label><br />
-<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ echo _x('Pending', 'adjective') ?></label><br />
-<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ echo _x('Spam', 'adjective'); ?></label>
+<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ _ex('Approved', 'adjective') ?></label><br />
+<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ _ex('Pending', 'adjective') ?></label><br />
+<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ _ex('Spam', 'adjective'); ?></label>
 </div>

 <div class="misc-pub-section curtime misc-pub-section-last">
@@ -124,8 +124,12 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>

-<?php do_meta_boxes('comment', 'normal', $comment); ?>
+<?php
+do_action('add_meta_boxes', 'comment', $comment);
+do_action('add_meta_boxes_comment', $comment);

+do_meta_boxes('comment', 'normal', $comment);
+?>
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
 <input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
 <input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -7,7 +7,7 @@
 */

 /** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');

 // Handle bulk actions
 if ( isset($_GET['action']) && isset($_GET['delete']) ) {
@@ -40,7 +40,7 @@ if ( isset($_GET['action']) && isset($_GET['delete']) ) {
 		wp_redirect($location);
 		exit();
 	}
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+} elseif ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
@@ -51,6 +51,13 @@ wp_enqueue_script('admin-categories');
 if ( current_user_can('manage_categories') )
 	wp_enqueue_script('inline-edit-tax');

+add_contextual_help($current_screen, '<p>' . __('You can create groups of links by using link categories. Link category names must be unique and link categories are separate from the categories you use for posts.') . '</p>' .
+	'<p>' . __('You can delete link categories, but that action does not delete the links within the category. Instead, it moves them to the default link category.') . '</p>' .
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="http://codex.wordpress.org/Links_Link_Categories_SubPanel" target="_blank">Link Categories Documentation</a>') . '</p>' .
+	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+);
+
 require_once ('admin-header.php');

 $messages[1] = __('Category added.');
@@ -68,7 +75,7 @@ if ( isset($_GET['s']) && $_GET['s'] )
 </h2>

 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
+<div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>

@@ -92,7 +99,7 @@ endif; ?>
 $pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
 if ( empty($pagenum) )
 	$pagenum = 1;
-if( ! isset( $catsperpage ) || $catsperpage < 0 )
+if ( ! isset( $catsperpage ) || $catsperpage < 0 )
 	$catsperpage = 20;

 $page_links = paginate_links( array(
@@ -198,18 +205,18 @@ if ( $page_links )

 <div class="form-field form-required">
 	<label for="name"><?php _e('Link Category name') ?></label>
-	<input name="name" id="name" type="text" value="" size="40" aria-required="true" />
+	<input name="name" id="link-name" type="text" value="" size="40" aria-required="true" />
 </div>
-
+<?php if ( !global_terms_enabled() ) { ?>
 <div class="form-field">
 	<label for="slug"><?php _e('Link Category slug') ?></label>
-	<input name="slug" id="slug" type="text" value="" size="40" />
+	<input name="slug" id="link-slug" type="text" value="" size="40" />
 	<p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
 </div>
-
+<?php } ?>
 <div class="form-field">
 	<label for="description"><?php _e('Description (optional)') ?></label>
-	<textarea name="description" id="description" rows="5" cols="40"></textarea>
+	<textarea name="description" id="link-description" rows="5" cols="40"></textarea>
 	<p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>

@@ -226,5 +233,5 @@ if ( $page_links )
 </div><!-- /col-container -->
 </div><!-- /wrap -->

-<?php inline_edit_term_row('edit-link-categories'); ?>
-<?php include('admin-footer.php'); ?>
+<?php inline_edit_term_row('edit-link-categories', 'link_category'); ?>
+<?php include('./admin-footer.php'); ?>
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -11,7 +11,7 @@ if ( !defined('ABSPATH') )
 	die('-1');

 if ( !current_user_can('manage_categories') )
-	wp_die(__('You do not have sufficient permissions to edit link categories for this blog.'));
+	wp_die(__('You do not have sufficient permissions to edit link categories for this site.'));

 /**
 * @var object
@@ -72,11 +72,13 @@ _fill_empty_link_category($category);
 			<th scope="row" valign="top"><label for="name"><?php _e('Link Category name') ?></label></th>
 			<td><input name="name" id="name" type="text" value="<?php echo esc_attr($category->name); ?>" size="40" aria-required="true" /></td>
 		</tr>
+<?php if ( !is_multisite() ) { ?>
 		<tr class="form-field">
 			<th scope="row" valign="top"><label for="slug"><?php _e('Link Category slug') ?></label></th>
 			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br />
            <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
 		</tr>
+<?php } ?>
 		<tr class="form-field">
 			<th scope="row" valign="top"><label for="description"><?php _e('Description (optional)') ?></label></th>
 			<td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea><br />
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -22,7 +22,7 @@ if ( ! empty($link_id) ) {
 	$nonce_action = 'add-bookmark';
 }

-require_once('includes/meta-boxes.php');
+require_once('./includes/meta-boxes.php');

 add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core');
 add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');
@@ -30,10 +30,22 @@ add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'nor
 add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'normal', 'core');
 add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core');

+do_action('add_meta_boxes', 'link', $link);
+do_action('add_meta_boxes_link', $link);
+
 do_action('do_meta_boxes', 'link', 'normal', $link);
 do_action('do_meta_boxes', 'link', 'advanced', $link);
 do_action('do_meta_boxes', 'link', 'side', $link);

+add_contextual_help($current_screen,
+	'<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
+	'<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
+	'<p>' . __( 'XFN stands for <a href="http://gmpg.org/xfn/" target="_blank">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>' .
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="http://codex.wordpress.org/Links_Add_New_SubPanel" target="_blank">Documentation on Creating Links</a>' ) . '</p>' .
+	'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+);
+
 require_once ('admin-header.php');

 ?>
@@ -42,7 +54,7 @@ require_once ('admin-header.php');
 <h2><?php echo esc_html( $title ); ?></h2>

 <?php if ( isset( $_GET['added'] ) ) : ?>
-<div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div>
+<div id="message" class="updated"><p><?php _e('Link added.'); ?></p></div>
 <?php endif; ?>

 <?php
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -1,195 +0,0 @@
-<?php
-/**
- * Edit page form for inclusion in the administration panels.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-// don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
-
-/**
- * Post ID global.
- * @name $post_ID
- * @var int
- */
-if ( ! isset( $post_ID ) )
-	$post_ID = 0;
-if ( ! isset( $temp_ID ) )
-	$temp_ID = 0;
-
-$message = false;
-if ( isset($_GET['message']) ) {
-	$_GET['message'] = absint( $_GET['message'] );
-
-	switch ( $_GET['message'] ) {
-		case 1:
-			$message = sprintf( __('Page updated. <a href="%s">View page</a>'), get_permalink($post_ID) );
-			break;
-		case 2:
-			$message = __('Custom field updated.');
-			break;
-		case 3:
-			$message = __('Custom field deleted.');
-			break;
-		case 4:
-			$message = sprintf( __('Page published. <a href="%s">View page</a>'), get_permalink($post_ID) );
-			break;
-		case 5:
-			if ( isset($_GET['revision']) )
-				$message = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
-			break;
-		case 6:
-			$message = sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
-			break;
-		case 7:
-			// translators: Publish box date formt, see http://php.net/date - Same as in meta-boxes.php
-			$message = sprintf( __('Page scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) );
-			break;
-		case 8:
-			$message = sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
-			break;
-	}
-}
-
-$notice = false;
-if ( 0 == $post_ID) {
-	$form_action = 'post';
-	$nonce_action = 'add-page';
-	$temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
-	$form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
-} else {
-	$post_ID = (int) $post_ID;
-	$form_action = 'editpost';
-	$nonce_action = 'update-page_' . $post_ID;
-	$form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
-	$autosave = wp_get_post_autosave( $post_ID );
-	if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) )
-		$notice = sprintf( __( 'There is an autosave of this page that is more recent than the version below.  <a href="%s">View the autosave</a>.' ), get_edit_post_link( $autosave->ID ) );
-}
-
-$temp_ID = (int) $temp_ID;
-$user_ID = (int) $user_ID;
-
-require_once('includes/meta-boxes.php');
-
-add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'page', 'side', 'core');
-add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', 'page', 'side', 'core');
-add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'page', 'normal', 'core');
-add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'page', 'normal', 'core');
-add_meta_box('slugdiv', __('Page Slug'), 'post_slug_meta_box', 'page', 'normal', 'core');
-if ( current_theme_supports( 'post-thumbnails', 'page' ) )
-	add_meta_box('postimagediv', __('Page Image'), 'post_thumbnail_meta_box', 'page', 'side', 'low');
-
-$authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM
-if ( $post->post_author && !in_array($post->post_author, $authors) )
-	$authors[] = $post->post_author;
-if ( $authors && count( $authors ) > 1 )
-	add_meta_box('pageauthordiv', __('Page Author'), 'post_author_meta_box', 'page', 'normal', 'core');
-
-if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
-	add_meta_box('revisionsdiv', __('Page Revisions'), 'post_revisions_meta_box', 'page', 'normal', 'core');
-
-do_action('do_meta_boxes', 'page', 'normal', $post);
-do_action('do_meta_boxes', 'page', 'advanced', $post);
-do_action('do_meta_boxes', 'page', 'side', $post);
-
-require_once('admin-header.php');
-?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
-
-<form name="post" action="page.php" method="post" id="post">
-<?php if ( $notice ) : ?>
-<div id="notice" class="error"><p><?php echo $notice ?></p></div>
-<?php endif; ?>
-<?php if ( $message ) : ?>
-<div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
-<?php endif; ?>
-
-<?php wp_nonce_field($nonce_action); ?>
-
-<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
-<input type="hidden" id="hiddenaction" name="action" value='<?php echo esc_attr($form_action) ?>' />
-<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr($form_action) ?>" />
-<input type="hidden" id="post_author" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
-<?php echo $form_extra ?>
-<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr($post->post_type) ?>" />
-<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr($post->post_status) ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
-<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
-
-<div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
-
-<div id="side-info-column" class="inner-sidebar">
-<?php
-do_action('submitpage_box');
-$side_meta_boxes = do_meta_boxes('page', 'side', $post); ?>
-</div>
-
-<div id="post-body">
-<div id="post-body-content">
-<div id="titlediv">
-<div id="titlewrap">
-	<label class="screen-reader-text" for="title"><?php _e('Title') ?></label>
-	<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo esc_attr( htmlspecialchars( $post->post_title ) ); ?>" id="title" autocomplete="off" />
-</div>
-<div class="inside">
-<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
-	<div id="edit-slug-box">
-<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
-	echo $sample_permalink_html;
-endif; ?>
-	</div>
-</div>
-</div>
-
-<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-
-<?php the_editor($post->post_content); ?>
-<table id="post-status-info" cellspacing="0"><tbody><tr>
-	<td id="wp-word-count"></td>
-	<td class="autosave-info">
-	<span id="autosave">&nbsp;</span>
-
-<?php
-	if ($post_ID) {
-		if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
-			$last_user = get_userdata($last_id);
-			printf(__('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
-		} else {
-			printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
-		}
-	}
-?>
-	</td>
-</tr></tbody></table>
-
-<?php
-wp_nonce_field( 'autosave', 'autosavenonce', false );
-wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-wp_nonce_field( 'getpermalink', 'getpermalinknonce', false );
-wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
-</div>
-
-<?php
-do_meta_boxes('page', 'normal', $post);
-do_action('edit_page_form');
-do_meta_boxes('page', 'advanced', $post);
-?>
-
-</div>
-</div>
-</div>
-
-</form>
-</div>
-
-<script type="text/javascript">
-try{document.post.title.focus();}catch(e){}
-</script>
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -1,384 +0,0 @@
-<?php
-/**
- * Edit Pages Administration Panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** WordPress Administration Bootstrap */
-require_once('admin.php');
-
-if ( !current_user_can('edit_pages') )
-	wp_die(__('Cheatin&#8217; uh?'));
-
-// Handle bulk actions
-if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
-	check_admin_referer('bulk-pages');
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
-
-	if ( strpos($sendback, 'page.php') !== false )
-		$sendback = admin_url('page-new.php');
-
-	if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
-		$post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_GET['post_status']);
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = %s", $post_status ) );
-		$doaction = 'delete';
-	} elseif ( ( $_GET['action'] != -1 || $_GET['action2'] != -1 ) && ( isset($_GET['post']) || isset($_GET['ids']) ) ) {
-		$post_ids = isset($_GET['post']) ? array_map( 'intval', (array) $_GET['post'] ) : explode(',', $_GET['ids']);
-		$doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
-	} else {
-		wp_redirect( admin_url('edit-pages.php') );
-	}
-
-	switch ( $doaction ) {
-		case 'trash':
-			$trashed = 0;
-			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can('delete_page', $post_id) )
-					wp_die( __('You are not allowed to move this page to the trash.') );
-
-				if ( !wp_trash_post($post_id) )
-					wp_die( __('Error in moving to trash...') );
-
-				$trashed++;
-			}
-			$sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids)), $sendback );
-			break;
-		case 'untrash':
-			$untrashed = 0;
-			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can('delete_page', $post_id) )
-					wp_die( __('You are not allowed to restore this page from the trash.') );
-
-				if ( !wp_untrash_post($post_id) )
-					wp_die( __('Error in restoring from trash...') );
-
-				$untrashed++;
-			}
-			$sendback = add_query_arg('untrashed', $untrashed, $sendback);
-			break;
-		case 'delete':
-			$deleted = 0;
-			foreach( (array) $post_ids as $post_id ) {
-				$post_del = & get_post($post_id);
-
-				if ( !current_user_can('delete_page', $post_id) )
-					wp_die( __('You are not allowed to delete this page.') );
-
-				if ( $post_del->post_type == 'attachment' ) {
-					if ( ! wp_delete_attachment($post_id) )
-						wp_die( __('Error in deleting...') );
-				} else {
-					if ( !wp_delete_post($post_id) )
-						wp_die( __('Error in deleting...') );
-				}
-				$deleted++;
-			}
-			$sendback = add_query_arg('deleted', $deleted, $sendback);
-			break;
-		case 'edit':
-			$_GET['post_type'] = 'page';
-			$done = bulk_edit_posts($_GET);
-
-			if ( is_array($done) ) {
-				$done['updated'] = count( $done['updated'] );
-				$done['skipped'] = count( $done['skipped'] );
-				$done['locked'] = count( $done['locked'] );
-				$sendback = add_query_arg( $done, $sendback );
-			}
-			break;
-	}
-
-	if ( isset($_GET['action']) )
-		$sendback = remove_query_arg( array('action', 'action2', 'post_parent', 'page_template', 'post_author', 'comment_status', 'ping_status', '_status',  'post', 'bulk_edit', 'post_view', 'post_type'), $sendback );
-
-	wp_redirect($sendback);
-	exit();
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
-	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
-	 exit;
-}
-
-if ( empty($title) )
-	$title = __('Edit Pages');
-$parent_file = 'edit-pages.php';
-wp_enqueue_script('inline-edit-post');
-
-$post_stati  = array(	//	array( adj, noun )
-		'publish' => array(_x('Published', 'page'), __('Published pages'), _nx_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>', 'page')),
-		'future' => array(_x('Scheduled', 'page'), __('Scheduled pages'), _nx_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>', 'page')),
-		'pending' => array(_x('Pending Review', 'page'), __('Pending pages'), _nx_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>', 'page')),
-		'draft' => array(_x('Draft', 'page'), _x('Drafts', 'manage posts header'), _nx_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>', 'page')),
-		'private' => array(_x('Private', 'page'), __('Private pages'), _nx_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>', 'page')),
-		'trash' => array(_x('Trash', 'page'), __('Trash pages'), _nx_noop('Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>', 'page'))
-	);
-
-if ( !EMPTY_TRASH_DAYS )
-	unset($post_stati['trash']);
-
-$post_stati = apply_filters('page_stati', $post_stati);
-
-$query = array('post_type' => 'page', 'orderby' => 'menu_order title',
-	'posts_per_page' => -1, 'posts_per_archive_page' => -1, 'order' => 'asc');
-
-$post_status_label = __('Pages');
-if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) {
-	$post_status_label = $post_stati[$_GET['post_status']][1];
-	$query['post_status'] = $_GET['post_status'];
-	$query['perm'] = 'readable';
-}
-
-$query = apply_filters('manage_pages_query', $query);
-wp($query);
-
-if ( is_singular() ) {
-	wp_enqueue_script( 'admin-comments' );
-	enqueue_comment_hotkeys_js();
-}
-
-require_once('admin-header.php'); ?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="page-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'page'); ?></a> <?php
-if ( isset($_GET['s']) && $_GET['s'] )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
-</h2>
-
-<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) ) { ?>
-<div id="message" class="updated fade"><p>
-<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
-	printf( _n( '%s page updated.', '%s pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
-	unset($_GET['updated']);
-}
-if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) {
-	printf( _n( '%s page not updated, invalid parent page specified.', '%s pages not updated, invalid parent page specified.', $_GET['skipped'] ), number_format_i18n( $_GET['skipped'] ) );
-	unset($_GET['skipped']);
-}
-if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
-	printf( _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) );
-	unset($_GET['locked']);
-}
-if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
-	printf( _n( 'Page permanently deleted.', '%s pages permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
-	unset($_GET['deleted']);
-}
-if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
-	printf( _n( 'Page moved to the trash.', '%s pages moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
-	$ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
-	echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo') . '</a><br />';
-	unset($_GET['trashed']);
-}
-if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
-	printf( _n( 'Page restored from the trash.', '%s pages restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
-	unset($_GET['untrashed']);
-}
-$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI'] );
-?>
-</p></div>
-<?php } ?>
-
-<?php if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Your page has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View page'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit page'); ?></a></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
-endif; ?>
-
-<form id="posts-filter" action="<?php echo admin_url('edit-pages.php'); ?>" method="get">
-<ul class="subsubsub">
-<?php
-
-$avail_post_stati = get_available_post_statuses('page');
-if ( empty($locked_post_status) ) :
-$status_links = array();
-$num_posts = wp_count_posts('page', 'readable');
-$total_posts = array_sum( (array) $num_posts ) - $num_posts->trash;
-$class = empty($_GET['post_status']) ? ' class="current"' : '';
-$status_links[] = "<li><a href='edit-pages.php'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'pages' ), number_format_i18n( $total_posts ) ) . '</a>';
-foreach ( $post_stati as $status => $label ) {
-	$class = '';
-
-	if ( !in_array($status, $avail_post_stati) || $num_posts->$status <= 0 )
-		continue;
-
-	if ( isset( $_GET['post_status'] ) && $status == $_GET['post_status'] )
-		$class = ' class="current"';
-
-	$status_links[] = "<li><a href='edit-pages.php?post_status=$status'$class>" . sprintf( _nx( $label[2][0], $label[2][1], $num_posts->$status, $label[2][2] ), number_format_i18n( $num_posts->$status ) ) . '</a>';
-}
-echo implode( " |</li>\n", $status_links ) . '</li>';
-unset($status_links);
-endif;
-?>
-</ul>
-
-<p class="search-box">
-	<label class="screen-reader-text" for="page-search-input"><?php _e( 'Search Pages' ); ?>:</label>
-	<input type="text" id="page-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-	<input type="submit" value="<?php esc_attr_e( 'Search Pages' ); ?>" class="button" />
-</p>
-
-<input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_GET['post_status']) ? esc_attr($_GET['post_status']) : 'all'; ?>" />
-
-<?php if ($posts) { ?>
-
-<div class="tablenav">
-
-<?php
-$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
-if ( empty($pagenum) )
-	$pagenum = 1;
-$per_page = (int) get_user_option( 'edit_pages_per_page', 0, false );
-if ( empty( $per_page ) || $per_page < 1 )
-	$per_page = 20;
-$per_page = apply_filters( 'edit_pages_per_page', $per_page );
-
-$num_pages = ceil($wp_query->post_count / $per_page);
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'pagenum', '%#%' ),
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => $num_pages,
-	'current' => $pagenum
-));
-
-$is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
-
-if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-	number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
-	number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ),
-	number_format_i18n( $wp_query->post_count ),
-	$page_links
-); echo $page_links_text; ?></div>
-<?php endif; ?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( $is_trash ) { ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php } else { ?>
-<option value="edit"><?php _e('Edit'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php } else { ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-<?php wp_nonce_field('bulk-pages'); ?>
-<?php if ( $is_trash ) { ?>
-<input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php } ?>
-</div>
-
-<br class="clear" />
-</div>
-
-<div class="clear"></div>
-
-<table class="widefat page fixed" cellspacing="0">
-  <thead>
-  <tr>
-<?php print_column_headers('edit-pages'); ?>
-  </tr>
-  </thead>
-
-  <tfoot>
-  <tr>
-<?php print_column_headers('edit-pages', false); ?>
-  </tr>
-  </tfoot>
-
-  <tbody>
-  <?php page_rows($posts, $pagenum, $per_page); ?>
-  </tbody>
-</table>
-
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( $is_trash ) { ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php } else { ?>
-<option value="edit"><?php _e('Edit'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php } else { ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php if ( $is_trash ) { ?>
-<input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php } ?>
-</div>
-
-<br class="clear" />
-</div>
-
-<?php } else { ?>
-<div class="clear"></div>
-<p><?php _e('No pages found.') ?></p>
-<?php
-} // end if ($posts)
-?>
-
-</form>
-
-<?php inline_edit_row( 'page' ) ?>
-
-<div id="ajax-response"></div>
-
-
-<?php
-
-if ( 1 == count($posts) && is_singular() ) :
-
-	$comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) );
-	if ( $comments ) :
-		// Make sure comments, post, and post_author are cached
-		update_comment_cache($comments);
-		$post = get_post($id);
-		$authordata = get_userdata($post->post_author);
-	?>
-
-<br class="clear" />
-
-<table class="widefat" cellspacing="0">
-<thead>
-  <tr>
-    <th scope="col" class="column-comment">
-		<?php  /* translators: column name */ echo _x('Comment', 'column name') ?>
-	</th>
-    <th scope="col" class="column-author"><?php _e('Author') ?></th>
-    <th scope="col" class="column-date"><?php _e('Submitted') ?></th>
-  </tr>
-</thead>
-<tbody id="the-comment-list" class="list:comment">
-<?php
-	foreach ($comments as $comment)
-		_wp_comment_row( $comment->comment_ID, 'single', false, false );
-?>
-</tbody>
-</table>
-
-<?php
-wp_comment_reply();
-endif; // comments
-endif; // posts;
-
-?>
-
-</div>
-
-<?php
-include('admin-footer.php');
--- a/wp-admin/edit-post-rows.php
+++ b/wp-admin/edit-post-rows.php
@@ -10,20 +10,25 @@
 if ( !defined('ABSPATH') )
 	die('-1');
 ?>
-<table class="widefat post fixed" cellspacing="0">
+<table class="widefat <?php echo $post_type_object->hierarchical ? 'page' : 'post'; ?> fixed" cellspacing="0">
 	<thead>
 	<tr>
-<?php print_column_headers('edit'); ?>
+<?php print_column_headers( $current_screen ); ?>
 	</tr>
 	</thead>

 	<tfoot>
 	<tr>
-<?php print_column_headers('edit', false); ?>
+<?php print_column_headers($current_screen, false); ?>
 	</tr>
 	</tfoot>

 	<tbody>
-<?php post_rows(); ?>
+<?php
+if ( $post_type_object->hierarchical )
+	page_rows($posts, $pagenum, $per_page);
+else
+	post_rows();
+?>
 	</tbody>
 </table>
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -10,20 +10,21 @@
 if ( !defined('ABSPATH') )
 	die('-1');

-if ( !current_user_can('manage_categories') )
-	wp_die(__('You do not have sufficient permissions to edit tags for this blog.'));
-
 if ( empty($tag_ID) ) { ?>
-	<div id="message" class="updated fade"><p><strong><?php _e('A tag was not selected for editing.'); ?></strong></p></div>
+	<div id="message" class="updated"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
 <?php
 	return;
 }

-do_action('edit_tag_form_pre', $tag); ?>
+if ( 'category' == $taxonomy )
+	do_action('edit_category_form_pre', $tag );
+else
+	do_action('edit_tag_form_pre', $tag);
+do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy);  ?>

 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e('Edit Tag'); ?></h2>
+<h2><?php echo $tax->labels->edit_item; ?></h2>
 <div id="ajax-response"></div>
 <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="editedtag" />
@@ -32,22 +33,48 @@ do_action('edit_tag_form_pre', $tag); ?>
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" /></td>
+			<th scope="row" valign="top"><label for="name"><?php _ex('Name', 'Taxonomy Name'); ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
 		</tr>
+<?php if ( !global_terms_enabled() ) { ?>
 		<tr class="form-field">
-			<th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
+			<th scope="row" valign="top"><label for="slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label></th>
 			<td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo esc_attr(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
-            <p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
+			<p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
 		</tr>
+<?php } ?>
+<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
 		<tr class="form-field">
-			<th scope="row" valign="top"><label for="description"><?php _e('Description') ?></label></th>
-			<td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($tag->description); ?></textarea><br />
-            <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
+			<th scope="row" valign="top"><label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label></th>
+			<td>
+				<?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
+				<?php if ( 'category' == $taxonomy ) : ?>
+				<span class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></span>
+				<?php endif; ?>
+			</td>
 		</tr>
-		<?php do_action('edit_tag_form_fields', $tag); ?>
+<?php endif; // is_taxonomy_hierarchical() ?>
+		<tr class="form-field">
+			<th scope="row" valign="top"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
+			<td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($tag->description); ?></textarea><br />
+			<span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
+		</tr>
+		<?php
+		if ( 'category' == $taxonomy )
+			do_action('edit_category_form_fields', $tag);
+		else
+			do_action('edit_tag_form_fields', $tag);
+		do_action($taxonomy . '_edit_form_fields', $tag, $taxonomy);
+		?>
 	</table>
-<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Tag'); ?>" /></p>
-<?php do_action('edit_tag_form', $tag); ?>
+<?php
+if ( 'category' == $taxonomy )
+	do_action('edit_category_form', $tag);
+else
+	do_action('edit_tag_form', $tag);
+do_action($taxonomy . '_edit_form', $tag, $taxonomy);
+?>
+<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php echo esc_attr( __( 'Update' ) ); ?>" /></p>
 </form>
 </div>
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -7,20 +7,33 @@
 */

 /** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');

-$title = __('Tags');
-
-wp_reset_vars( array('action', 'tag', 'taxonomy') );
+wp_reset_vars( array('action', 'tag', 'taxonomy', 'post_type') );

 if ( empty($taxonomy) )
 	$taxonomy = 'post_tag';

-if ( !is_taxonomy($taxonomy) )
+if ( !taxonomy_exists($taxonomy) )
 	wp_die(__('Invalid taxonomy'));

-$parent_file = 'edit.php';
-$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
+$tax = get_taxonomy($taxonomy);
+
+if ( ! current_user_can($tax->cap->manage_terms) )
+	wp_die(__('Cheatin&#8217; uh?'));
+
+$title = $tax->labels->name;
+
+if ( empty($post_type) || !in_array( $post_type, get_post_types( array('public' => true) ) ) )
+	$post_type = 'post';
+
+if ( 'post' != $post_type ) {
+	$parent_file = "edit.php?post_type=$post_type";
+	$submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
+} else {
+	$parent_file = 'edit.php';
+	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
+}

 if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
 	$action = 'bulk-delete';
@@ -31,38 +44,49 @@ case 'add-tag':

 	check_admin_referer('add-tag');

-	if ( !current_user_can('manage_categories') )
+	if ( !current_user_can($tax->cap->edit_terms) )
 		wp_die(__('Cheatin&#8217; uh?'));

 	$ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
-	if ( $ret && !is_wp_error( $ret ) ) {
-		wp_redirect('edit-tags.php?message=1#addtag');
-	} else {
-		wp_redirect('edit-tags.php?message=4#addtag');
+	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+	if ( 'post' != $post_type )
+		$location .= '&post_type=' . $post_type;
+
+	if ( $referer = wp_get_original_referer() ) {
+		if ( false !== strpos($referer, 'edit-tags.php') )
+			$location = $referer;
 	}
+
+	if ( $ret && !is_wp_error( $ret ) )
+		$location = add_query_arg('message', 1, $location);
+	else
+		$location = add_query_arg('message', 4, $location);
+	wp_redirect($location);
 	exit;
 break;

 case 'delete':
+	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+	if ( 'post' != $post_type )
+		$location .= '&post_type=' . $post_type;
+	if ( $referer = wp_get_referer() ) {
+		if ( false !== strpos($referer, 'edit-tags.php') )
+			$location = $referer;
+	}
+
 	if ( !isset( $_GET['tag_ID'] ) ) {
-		wp_redirect("edit-tags.php?taxonomy=$taxonomy");
+		wp_redirect($location);
 		exit;
 	}

 	$tag_ID = (int) $_GET['tag_ID'];
 	check_admin_referer('delete-tag_' .  $tag_ID);

-	if ( !current_user_can('manage_categories') )
+	if ( !current_user_can($tax->cap->delete_terms) )
 		wp_die(__('Cheatin&#8217; uh?'));

 	wp_delete_term( $tag_ID, $taxonomy);

-	$location = 'edit-tags.php';
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos($referer, 'edit-tags.php') )
-			$location = $referer;
-	}
-
 	$location = add_query_arg('message', 2, $location);
 	wp_redirect($location);
 	exit;
@@ -72,7 +96,7 @@ break;
 case 'bulk-delete':
 	check_admin_referer('bulk-tags');

-	if ( !current_user_can('manage_categories') )
+	if ( !current_user_can($tax->cap->delete_terms) )
 		wp_die(__('Cheatin&#8217; uh?'));

 	$tags = (array) $_GET['delete_tags'];
@@ -80,7 +104,9 @@ case 'bulk-delete':
 		wp_delete_term( $tag_ID, $taxonomy);
 	}

-	$location = 'edit-tags.php';
+	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+	if ( 'post' != $post_type )
+		$location .= '&post_type=' . $post_type;
 	if ( $referer = wp_get_referer() ) {
 		if ( false !== strpos($referer, 'edit-tags.php') )
 			$location = $referer;
@@ -93,13 +119,16 @@ case 'bulk-delete':
 break;

 case 'edit':
-	$title = __('Edit Tag');
+	$title = $tax->labels->edit_item;

 	require_once ('admin-header.php');
 	$tag_ID = (int) $_GET['tag_ID'];

+	if ( !current_user_can($tax->cap->edit_terms) )
+		wp_die( __('You are not allowed to edit this item.') );
+
 	$tag = get_term($tag_ID, $taxonomy, OBJECT, 'edit');
-	include('edit-tag-form.php');
+	include('./edit-tag-form.php');

 break;

@@ -107,12 +136,15 @@ case 'editedtag':
 	$tag_ID = (int) $_POST['tag_ID'];
 	check_admin_referer('update-tag_' . $tag_ID);

-	if ( !current_user_can('manage_categories') )
+	if ( !current_user_can($tax->cap->edit_terms) )
 		wp_die(__('Cheatin&#8217; uh?'));

 	$ret = wp_update_term($tag_ID, $taxonomy, $_POST);

-	$location = 'edit-tags.php';
+	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+	if ( 'post' != $post_type )
+		$location .= '&post_type=' . $post_type;
+
 	if ( $referer = wp_get_original_referer() ) {
 		if ( false !== strpos($referer, 'edit-tags.php') )
 			$location = $referer;
@@ -129,45 +161,83 @@ break;

 default:

-if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+if ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }

-$can_manage = current_user_can('manage_categories');
-
 wp_enqueue_script('admin-tags');
-if ( $can_manage )
+if ( current_user_can($tax->cap->edit_terms) )
 	wp_enqueue_script('inline-edit-tax');

+if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
+	if ( 'category' == $taxonomy )
+		$help = '<p>' . sprintf(__('You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.'), 'options-writing.php') . '</p>';
+	else
+		$help = '<p>' . __('You can assign keywords to your posts using Post Tags. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.') . '</p>';
+
+	$help .='<p>' . __('What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.') . '</p>';
+
+	if ( 'category' == $taxonomy )
+		$help .= '<p>' . __('When adding a new category on this screen, you&#8217;ll fill in the following fields:') . '</p>';
+	else
+		$help .= '<p>' . __('When adding a new tag on this screen, you&#8217;ll fill in the following fields:') . '</p>';
+
+	$help .= '<ul>' .
+		'<li>' . __('<strong>Name</strong> - The name is how it appears on your site.') . '</li>';
+	if ( ! global_terms_enabled() )
+		$help .= '<li>' . __('<strong>Slug</strong> - The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.') . '</li>';
+
+	if ( 'category' == $taxonomy )
+		$help .= '<li>' . __('<strong>Parent</strong> - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.') . '</li>';
+
+	$help .= '<li>' . __('<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.') . '</li>' .
+		'</ul>' .
+		'<p>' . __('You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.') . '</p>' .
+		'<p><strong>' . __('For more information:') . '</strong></p>';
+
+	if ( 'category' == $taxonomy )
+		$help .= '<p>' . __('<a href="http://codex.wordpress.org/Manage_Categories_SubPanel" target="_blank">Categories Documentation</a>') . '</p>';
+	else
+		$help .= '<p>' . __('<a href="http://codex.wordpress.org/Post_Tags_SubPanel" target="_blank">Tags Documentation</a>') . '</p>';
+
+	$help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
+
+	add_contextual_help($current_screen, $help);
+	unset($help);
+}
+
 require_once ('admin-header.php');

-$messages[1] = __('Tag added.');
-$messages[2] = __('Tag deleted.');
-$messages[3] = __('Tag updated.');
-$messages[4] = __('Tag not added.');
-$messages[5] = __('Tag not updated.');
-$messages[6] = __('Tags deleted.'); ?>
+$messages[1] = __('Item added.');
+$messages[2] = __('Item deleted.');
+$messages[3] = __('Item updated.');
+$messages[4] = __('Item not added.');
+$messages[5] = __('Item not updated.');
+$messages[6] = __('Items deleted.');
+
+?>

 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title );
-if ( isset($_GET['s']) && $_GET['s'] )
+if ( !empty($_GET['s']) )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
 </h2>

 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
+<div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
 <div id="ajax-response"></div>

 <form class="search-form" action="" method="get">
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
+<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 <p class="search-box">
-	<label class="screen-reader-text" for="tag-search-input"><?php _e( 'Search Tags' ); ?>:</label>
+	<label class="screen-reader-text" for="tag-search-input"><?php echo $tax->labels->search_items; ?>:</label>
 	<input type="text" id="tag-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-	<input type="submit" value="<?php esc_attr_e( 'Search Tags' ); ?>" class="button" />
+	<input type="submit" value="<?php echo esc_attr( $tax->labels->search_items );  ?>" class="button" />
 </p>
 </form>
 <br class="clear" />
@@ -178,24 +248,35 @@ endif; ?>
 <div class="col-wrap">
 <form id="posts-filter" action="" method="get">
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
+<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 <div class="tablenav">
 <?php
 $pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
 if ( empty($pagenum) )
 	$pagenum = 1;

-$tags_per_page = (int) get_user_option( 'edit_tags_per_page', 0, false );
+$tags_per_page = (int) get_user_option( 'edit_' .  $taxonomy . '_per_page' );
+
 if ( empty($tags_per_page) || $tags_per_page < 1 )
 	$tags_per_page = 20;
-$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
-$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
+
+if ( 'post_tag' == $taxonomy ) {
+	$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+	$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
+} elseif ( 'category' == $taxonomy ) {
+	$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
+} else {
+	$tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page );
+}
+
+$searchterms = !empty($_GET['s']) ? trim(stripslashes($_GET['s'])) : '';

 $page_links = paginate_links( array(
 	'base' => add_query_arg( 'pagenum', '%#%' ),
 	'format' => '',
 	'prev_text' => __('&laquo;'),
 	'next_text' => __('&raquo;'),
-	'total' => ceil(wp_count_terms($taxonomy) / $tags_per_page),
+	'total' => ceil(wp_count_terms($taxonomy, array('search' => $searchterms)) / $tags_per_page),
 	'current' => $pagenum
 ));

@@ -216,27 +297,21 @@ if ( $page_links )
 </div>

 <div class="clear"></div>
-
 <table class="widefat tag fixed" cellspacing="0">
 	<thead>
 	<tr>
-<?php print_column_headers('edit-tags'); ?>
+<?php print_column_headers($current_screen); ?>
 	</tr>
 	</thead>

 	<tfoot>
 	<tr>
-<?php print_column_headers('edit-tags', false); ?>
+<?php print_column_headers($current_screen, false); ?>
 	</tr>
 	</tfoot>

 	<tbody id="the-list" class="list:tag">
-<?php
-
-$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '';
-
-$count = tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy );
-?>
+<?php tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy ); ?>
 	</tbody>
 </table>

@@ -259,52 +334,103 @@ if ( $page_links )

 <br class="clear" />
 </form>
+
+<?php if ( 'category' == $taxonomy ) : ?>
+<div class="form-wrap">
+<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
+<?php if ( current_user_can( 'import' ) ) : ?>
+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'import.php') ?></p>
+<?php endif; ?>
+</div>
+<?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
+<div class="form-wrap">
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'import.php') ;?>.</p>
+</div>
+<?php endif;
+do_action('after-' . $taxonomy . '-table', $taxonomy);
+?>
+
 </div>
 </div><!-- /col-right -->

 <div id="col-left">
 <div class="col-wrap">

-<div class="tagcloud">
-<h3><?php _e('Popular Tags'); ?></h3>
 <?php
-if ( $can_manage )
-	wp_tag_cloud(array('taxonomy' => $taxonomy, 'link' => 'edit'));
-else
-	wp_tag_cloud(array('taxonomy' => $taxonomy));
-?>
-</div>

-<?php if ( $can_manage ) {
-	do_action('add_tag_form_pre'); ?>
+if ( !is_taxonomy_hierarchical($taxonomy) ) {
+	if ( current_user_can( $tax->cap->edit_terms ) )
+		$tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) );
+	else
+		$tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
+
+	if ( $tag_cloud ) :
+	?>
+<div class="tagcloud">
+<h3><?php echo $tax->labels->popular_items; ?></h3>
+<?php echo $tag_cloud; unset( $tag_cloud ); ?>
+</div>
+<?php
+endif;
+}
+
+if ( current_user_can($tax->cap->edit_terms) ) {
+	if ( 'category' == $taxonomy )
+		do_action('add_category_form_pre', (object)array('parent' => 0) );  // Back compat hook. Deprecated in preference to $taxonomy_pre_add_form
+	else
+		do_action('add_tag_form_pre', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories
+	do_action($taxonomy . '_pre_add_form', $taxonomy);
+?>

 <div class="form-wrap">
-<h3><?php _e('Add a New Tag'); ?></h3>
+<h3><?php echo $tax->labels->add_new_item; ?></h3>
 <form id="addtag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="add-tag" />
+<input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
+<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 <?php wp_nonce_field('add-tag'); ?>

 <div class="form-field form-required">
-	<label for="tag-name"><?php _e('Tag name') ?></label>
+	<label for="tag-name"><?php _ex('Name', 'Taxonomy Name'); ?></label>
 	<input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
-	<p><?php _e('The name is how the tag appears on your site.'); ?></p>
+	<p><?php _e('The name is how it appears on your site.'); ?></p>
 </div>
-
+<?php if ( ! global_terms_enabled() ) : ?>
 <div class="form-field">
-	<label for="slug"><?php _e('Tag slug') ?></label>
-	<input name="slug" id="slug" type="text" value="" size="40" />
+	<label for="tag-slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label>
+	<input name="slug" id="tag-slug" type="text" value="" size="40" />
 	<p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
 </div>
-
+<?php endif; // is_multisite() ?>
+<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
 <div class="form-field">
-	<label for="description"><?php _e('Description') ?></label>
-	<textarea name="description" id="description" rows="5" cols="40"></textarea>
-    <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
+	<label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label>
+	<?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
+	<?php if ( 'category' == $taxonomy ) : // @todo: Generic text for hierarchical taxonomies ?>
+		<p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
+	<?php endif; ?>
+</div>
+<?php endif; // is_taxonomy_hierarchical() ?>
+<div class="form-field">
+	<label for="tag-description"><?php _ex('Description', 'Taxonomy Description'); ?></label>
+	<textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
+	<p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>

-<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
-<?php do_action('add_tag_form'); ?>
+<?php
+if ( ! is_taxonomy_hierarchical($taxonomy) )
+	do_action('add_tag_form_fields', $taxonomy);
+do_action($taxonomy . '_add_form_fields', $taxonomy);
+?>
+<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" /></p>
+<?php
+if ( 'category' == $taxonomy )
+	do_action('edit_category_form',	(object)array('parent' => 0) );  // Back compat hook. Deprecated in preference to $taxonomy_add_form
+else
+	do_action('add_tag_form', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories
+do_action($taxonomy . '_add_form', $taxonomy);
+?>
 </form></div>
 <?php } ?>

@@ -314,12 +440,12 @@ else
 </div><!-- /col-container -->
 </div><!-- /wrap -->

-<?php inline_edit_term_row('edit-tags'); ?>
+<?php inline_edit_term_row('edit-tags', $taxonomy); ?>

 <?php
 break;
 }

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

 ?>
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -7,9 +7,19 @@
 */

 /** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');

-if ( !current_user_can('edit_posts') )
+if ( !isset($_GET['post_type']) )
+	$post_type = 'post';
+elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) )
+	$post_type = $_GET['post_type'];
+else
+	wp_die( __('Invalid post type') );
+$_GET['post_type'] = $post_type;
+
+$post_type_object = get_post_type_object($post_type);
+
+if ( !current_user_can($post_type_object->cap->edit_posts) )
 	wp_die(__('Cheatin&#8217; uh?'));

 // Back-compat for viewing comments of an entry
@@ -20,34 +30,55 @@ if ( $_redirect = intval( max( @$_GET['p'], @$_GET['attachment_id'], @$_GET['pag
 	unset( $_redirect );
 }

+if ( 'post' != $post_type ) {
+	$parent_file = "edit.php?post_type=$post_type";
+	$submenu_file = "edit.php?post_type=$post_type";
+	$post_new_file = "post-new.php?post_type=$post_type";
+} else {
+	$parent_file = 'edit.php';
+	$submenu_file = 'edit.php';
+	$post_new_file = 'post-new.php';
+}
+
+$pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
+if ( empty($pagenum) )
+	$pagenum = 1;
+$edit_per_page = 'edit_' . $post_type . '_per_page';
+$per_page = (int) get_user_option( $edit_per_page );
+if ( empty( $per_page ) || $per_page < 1 )
+	$per_page = 20;
+
+$per_page = apply_filters( $edit_per_page, $per_page );
+$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+
 // Handle bulk actions
 if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
 	check_admin_referer('bulk-posts');
 	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );

 	if ( strpos($sendback, 'post.php') !== false )
-		$sendback = admin_url('post-new.php');
+		$sendback = admin_url($post_new_file);

 	if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
 		$post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_GET['post_status']);
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='post' AND post_status = %s", $post_status ) );
+		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) );
 		$doaction = 'delete';
 	} elseif ( ( $_GET['action'] != -1 || $_GET['action2'] != -1 ) && ( isset($_GET['post']) || isset($_GET['ids']) ) ) {
 		$post_ids = isset($_GET['post']) ? array_map( 'intval', (array) $_GET['post'] ) : explode(',', $_GET['ids']);
 		$doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
 	} else {
-		wp_redirect( admin_url('edit.php') );
+		wp_redirect( admin_url("edit.php?post_type=$post_type") );
 	}

 	switch ( $doaction ) {
 		case 'trash':
 			$trashed = 0;
 			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can('delete_post', $post_id) )
-					wp_die( __('You are not allowed to move this post to the trash.') );
+				if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
+					wp_die( __('You are not allowed to move this item to the Trash.') );

 				if ( !wp_trash_post($post_id) )
-					wp_die( __('Error in moving to trash...') );
+					wp_die( __('Error in moving to Trash.') );

 				$trashed++;
 			}
@@ -56,11 +87,11 @@ if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delet
 		case 'untrash':
 			$untrashed = 0;
 			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can('delete_post', $post_id) )
-					wp_die( __('You are not allowed to restore this post from the trash.') );
+				if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
+					wp_die( __('You are not allowed to restore this item from the Trash.') );

 				if ( !wp_untrash_post($post_id) )
-					wp_die( __('Error in restoring from trash...') );
+					wp_die( __('Error in restoring from Trash.') );

 				$untrashed++;
 			}
@@ -71,8 +102,8 @@ if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delet
 			foreach( (array) $post_ids as $post_id ) {
 				$post_del = & get_post($post_id);

-				if ( !current_user_can('delete_post', $post_id) )
-					wp_die( __('You are not allowed to delete this post.') );
+				if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
+					wp_die( __('You are not allowed to delete this item.') );

 				if ( $post_del->post_type == 'attachment' ) {
 					if ( ! wp_delete_attachment($post_id) )
@@ -98,34 +129,67 @@ if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delet
 	}

 	if ( isset($_GET['action']) )
-		$sendback = remove_query_arg( array('action', 'action2', 'cat', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status',  'post', 'bulk_edit', 'post_view', 'post_type'), $sendback );
+		$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status',  'post', 'bulk_edit', 'post_view'), $sendback );

 	wp_redirect($sendback);
 	exit();
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+} elseif ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }

-if ( empty($title) )
-	$title = __('Edit Posts');
-$parent_file = 'edit.php';
 wp_enqueue_script('inline-edit-post');

 $user_posts = false;
-if ( !current_user_can('edit_others_posts') ) {
-	$user_posts_count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(1) FROM $wpdb->posts WHERE post_type = 'post' AND post_status != 'trash' AND post_author = %d", $current_user->ID) );
+if ( !current_user_can($post_type_object->cap->edit_others_posts) ) {
+	$user_posts_count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(1) FROM $wpdb->posts WHERE post_type = '%s' AND post_status NOT IN ('trash', 'auto-draft') AND post_author = %d", $post_type, $current_user->ID) );
 	$user_posts = true;
 	if ( $user_posts_count && empty($_GET['post_status']) && empty($_GET['all_posts']) && empty($_GET['author']) )
 		$_GET['author'] = $current_user->ID;
 }

-list($post_stati, $avail_post_stati) = wp_edit_posts_query();
+$avail_post_stati = wp_edit_posts_query();

-require_once('admin-header.php');
+if ( $post_type_object->hierarchical )
+	$num_pages = ceil($wp_query->post_count / $per_page);
+else
+	$num_pages = $wp_query->max_num_pages;

-if ( !isset( $_GET['paged'] ) )
-	$_GET['paged'] = 1;
+$title = $post_type_object->labels->name;
+
+if ( 'post' == $post_type ) {
+	add_contextual_help($current_screen,
+	'<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
+	'<ul>' .
+	'<li>' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '</li>' .
+	'<li>' . __('You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts.') . '</li>' .
+	'<li>' . __('You can view posts in a simple title list or with an excerpt. Choose the view you prefer by clicking on the icons at the top of the list on the right.') . '</li>' .
+	'<li>' . __('You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.') . '</li>' .
+	'</ul>' .
+	'<p>' . __('Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:') . '</p>' .
+	'<ul>' .
+	'<li>' . __('Edit takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.') . '</li>' .
+	'<li>' . __('Quick Edit provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.') . '</li>' .
+	'<li>' . __('Trash removes your post from this list and places it in the trash, from which you can permanently delete it.') . '</li>' .
+	'<li>' . __('Preview will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.') . '</li>' .
+	'</ul>' .
+	'<p>' . __('You can also edit multiple posts at once. Select the posts you want to edit using the checkboxes, select Edit from the Bulk Actions menu and click Apply. You will be able to change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>' .
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="http://codex.wordpress.org/Posts_Edit_SubPanel" target="_blank">Edit Posts Documentation</a>') . '</p>' .
+	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	);
+} elseif ( 'page' == $post_type ) {
+	add_contextual_help($current_screen,
+	'<p>' . __('Pages are similar to to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the &#8220;Parent&#8221; of the other, creating a group of Pages.') . '</p>' .
+	'<p>' . __('Managing Pages is very similar to managing Posts, and the screens can be customized in the same way.') . '</p>' .
+	'<p>' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a Page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple Pages at once.') . '</p>' .
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="http://codex.wordpress.org/Pages_Edit_SubPanel" target="_blank">Page Management Documentation</a>') . '</p>' .
+	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	);
+}
+
+require_once('./admin-header.php');

 if ( empty($_GET['mode']) )
 	$mode = 'list';
@@ -134,19 +198,19 @@ else

 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="post-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'post'); ?></a> <?php
+<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="button add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
 if ( isset($_GET['s']) && $_GET['s'] )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
 </h2>

 <?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
+<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View Post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit Post'); ?></a></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 endif; ?>

 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) ) { ?>
-<div id="message" class="updated fade"><p>
+<div id="message" class="updated"><p>
 <?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
 	printf( _n( '%s post updated.', '%s posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
 	unset($_GET['updated']);
@@ -156,24 +220,24 @@ if ( isset($_GET['skipped']) && (int) $_GET['skipped'] )
 	unset($_GET['skipped']);

 if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
-	printf( _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
+	printf( _n( '%s item not updated, somebody is editing it.', '%s items not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
 	unset($_GET['locked']);
 }

 if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
-	printf( _n( 'Post permanently deleted.', '%s posts permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
+	printf( _n( 'Item permanently deleted.', '%s items permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
 	unset($_GET['deleted']);
 }

 if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
-	printf( _n( 'Post moved to the trash.', '%s posts moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
+	printf( _n( 'Item moved to the trash.', '%s items moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
 	$ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
-	echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a><br />';
+	echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a><br />';
 	unset($_GET['trashed']);
 }

 if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
-	printf( _n( 'Post restored from the trash.', '%s posts restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
+	printf( _n( 'Item restored from the Trash.', '%s items restored from the Trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
 	unset($_GET['undeleted']);
 }

@@ -188,34 +252,41 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated'
 <?php
 if ( empty($locked_post_status) ) :
 $status_links = array();
-$num_posts = wp_count_posts( 'post', 'readable' );
+$num_posts = wp_count_posts( $post_type, 'readable' );
 $class = '';
 $allposts = '';

 if ( $user_posts ) {
 	if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user->ID ) )
 		$class = ' class="current"';
-	$status_links[] = "<li><a href='edit.php?author=$current_user->ID'$class>" . sprintf( _nx( 'My Posts <span class="count">(%s)</span>', 'My Posts <span class="count">(%s)</span>', $user_posts_count, 'posts' ), number_format_i18n( $user_posts_count ) ) . '</a>';
-	$allposts = '?all_posts=1';
+	$status_links[] = "<li><a href='edit.php?post_type=$post_type&author=$current_user->ID'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $user_posts_count, 'posts' ), number_format_i18n( $user_posts_count ) ) . '</a>';
+	$allposts = '&all_posts=1';
 }

-$total_posts = array_sum( (array) $num_posts ) - $num_posts->trash;
-$class = empty($class) && empty($_GET['post_status']) ? ' class="current"' : '';
-$status_links[] = "<li><a href='edit.php{$allposts}'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
+$total_posts = array_sum( (array) $num_posts );

-foreach ( $post_stati as $status => $label ) {
+// Subtract post types that are not included in the admin all list.
+foreach ( get_post_stati( array('show_in_admin_all_list' => false) ) as $state )
+	$total_posts -= $num_posts->$state;
+
+$class = empty($class) && empty($_GET['post_status']) ? ' class="current"' : '';
+$status_links[] = "<li><a href='edit.php?post_type=$post_type{$allposts}'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
+
+foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
 	$class = '';

-	if ( !in_array( $status, $avail_post_stati ) )
+	$status_name = $status->name;
+
+	if ( !in_array( $status_name, $avail_post_stati ) )
 		continue;

-	if ( empty( $num_posts->$status ) )
+	if ( empty( $num_posts->$status_name ) )
 		continue;

-	if ( isset($_GET['post_status']) && $status == $_GET['post_status'] )
+	if ( isset($_GET['post_status']) && $status_name == $_GET['post_status'] )
 		$class = ' class="current"';

-	$status_links[] = "<li><a href='edit.php?post_status=$status'$class>" . sprintf( _n( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>';
+	$status_links[] = "<li><a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( _n( $status->label_count[0], $status->label_count[1], $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
 }
 echo implode( " |</li>\n", $status_links ) . '</li>';
 unset( $status_links );
@@ -224,12 +295,13 @@ endif;
 </ul>

 <p class="search-box">
-	<label class="screen-reader-text" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
+	<label class="screen-reader-text" for="post-search-input"><?php echo $post_type_object->labels->search_items; ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
-	<input type="submit" value="<?php esc_attr_e( 'Search Posts' ); ?>" class="button" />
+	<input type="submit" value="<?php echo esc_attr( $post_type_object->labels->search_items  ); ?>" class="button" />
 </p>

 <input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_GET['post_status']) ? esc_attr($_GET['post_status']) : 'all'; ?>" />
+<input type="hidden" name="post_type" class="post_type_page" value="<?php echo $post_type; ?>" />
 <input type="hidden" name="mode" value="<?php echo esc_attr($mode); ?>" />

 <?php if ( have_posts() ) { ?>
@@ -241,8 +313,8 @@ $page_links = paginate_links( array(
 	'format' => '',
 	'prev_text' => __('&laquo;'),
 	'next_text' => __('&raquo;'),
-	'total' => $wp_query->max_num_pages,
-	'current' => $_GET['paged']
+	'total' => $num_pages,
+	'current' => $pagenum
 ));

 $is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
@@ -267,7 +339,7 @@ $is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';

 <?php // view filters
 if ( !is_singular() ) {
-$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC";
+$arc_query = $wpdb->prepare("SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = %s ORDER BY post_date DESC", $post_type);

 $arc_result = $wpdb->get_results( $arc_query );

@@ -298,39 +370,50 @@ foreach ($arc_result as $arc_row) {
 <?php } ?>

 <?php
-$dropdown_options = array('show_option_all' => __('View all categories'), 'hide_empty' => 0, 'hierarchical' => 1,
-	'show_count' => 0, 'orderby' => 'name', 'selected' => $cat);
-wp_dropdown_categories($dropdown_options);
+if ( is_object_in_taxonomy($post_type, 'category') ) {
+	$dropdown_options = array('show_option_all' => __('View all categories'), 'hide_empty' => 0, 'hierarchical' => 1,
+		'show_count' => 0, 'orderby' => 'name', 'selected' => $cat);
+	wp_dropdown_categories($dropdown_options);
+}
 do_action('restrict_manage_posts');
 ?>
 <input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
 <?php }

-if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
+if ( $is_trash && current_user_can($post_type_object->cap->edit_others_posts) ) { ?>
 <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>
 </div>

 <?php if ( $page_links ) { ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-	number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
-	number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
-	number_format_i18n( $wp_query->found_posts ),
-	$page_links
-); echo $page_links_text; ?></div>
-<?php } ?>
+<div class="tablenav-pages"><?php
+	$count_posts = $post_type_object->hierarchical ? $wp_query->post_count : $wp_query->found_posts;
+	$page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
+						number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
+						number_format_i18n( min( $pagenum * $per_page, $count_posts ) ),
+						number_format_i18n( $count_posts ),
+						$page_links
+						);
+	echo $page_links_text;
+	?></div>
+<?php
+}
+
+if ( !$post_type_object->hierarchical ) {
+?>

 <div class="view-switch">
-	<a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
-	<a href="<?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
+	<a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
+	<a href="<?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
 </div>

+<?php } ?>
 <div class="clear"></div>
 </div>

 <div class="clear"></div>

-<?php include( 'edit-post-rows.php' ); ?>
+<?php include( './edit-post-rows.php' ); ?>

 <div class="tablenav">

@@ -353,7 +436,7 @@ if ( $page_links )
 <?php } ?>
 </select>
 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
+<?php if ( $is_trash && current_user_can($post_type_object->cap->edit_others_posts) ) { ?>
 <input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>
 <br class="clear" />
@@ -365,19 +448,19 @@ if ( $page_links )
 <div class="clear"></div>
 <p><?php
 if ( isset($_GET['post_status']) && 'trash' == $_GET['post_status'] )
-	_e('No posts found in the trash');
+	echo $post_type_object->labels->not_found_in_trash;
 else
-	_e('No posts found');
+	echo $post_type_object->labels->not_found;
 ?></p>
 <?php } ?>

 </form>

-<?php inline_edit_row( 'post' ); ?>
+<?php inline_edit_row( $current_screen ); ?>

 <div id="ajax-response"></div>
 <br class="clear" />
 </div>

 <?php
-include('admin-footer.php');
+include('./admin-footer.php');
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -9,20 +9,59 @@
 /** Load WordPress Bootstrap */
 require_once ('admin.php');

-if ( !current_user_can('edit_files') )
-	wp_die(__('You do not have sufficient permissions to export the content of this blog.'));
+if ( !current_user_can('export') )
+	wp_die(__('You do not have sufficient permissions to export the content of this site.'));

 /** Load WordPress export API */
-require_once('includes/export.php');
+require_once('./includes/export.php');
 $title = __('Export');

+add_contextual_help($current_screen,
+	'<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can set filters to have the WXR file only include a certain date, author, category, tag, all posts or all pages, certain publishing statuses.') . '</p>' .
+	'<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>' .
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="http://codex.wordpress.org/Tools_Export_SubPanel" target="_blank">Export Documentation</a>') . '</p>' .
+	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+);
+
 if ( isset( $_GET['download'] ) ) {
-	$author = isset($_GET['author']) ? $_GET['author'] : 'all';
-	export_wp( $author );
+		$author = isset($_GET['author']) ? $_GET['author'] : 'all';
+		$taxonomy = array();
+		foreach ( get_taxonomies( array( 'show_ui' => true ) ) as $tax )
+			$taxonomy[ $tax ] = ! empty( $_GET['export_taxonomy'][ $tax ] ) ? $_GET['export_taxonomy'][ $tax ] : 'all';
+		$post_type = isset($_GET['export_post_type']) ? stripslashes_deep($_GET['export_post_type']) : 'all';
+		$status = isset($_GET['export_post_status']) ? stripslashes_deep($_GET['export_post_status']) : 'all';
+		$mm_start = isset($_GET['mm_start']) ? $_GET['mm_start'] : 'all';
+		$mm_end = isset($_GET['mm_end']) ? $_GET['mm_end'] : 'all';
+		if( $mm_start != 'all' ) {
+			$start_date = sprintf( "%04d-%02d-%02d", substr( $mm_start, 0, 4 ), substr( $mm_start, 5, 2 ), 1 );
+		} else {
+			$start_date = 'all';
+		}
+		if( $mm_end != 'all' ) {
+			$end_date = sprintf( "%04d-%02d-%02d", substr( $mm_end, 0, 4 ), substr( $mm_end, 5, 2 ), 1 );
+		} else {
+			$end_date = 'all';
+		}
+
+	export_wp( array( 'author' => $author, 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'post_status' => $status, 'start_date' => $start_date, 'end_date' => $end_date ) );
 	die();
 }

 require_once ('admin-header.php');
+
+$dateoptions = $edateoptions = '';
+$types = "'" . implode("', '", get_post_types( array( 'public' => true, 'can_export' => true ), 'names' )) . "'";
+$stati = "'" . implode("', '", get_post_stati( array( 'internal' => false ), 'names' )) . "'";
+if ( $monthyears = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, YEAR(DATE_ADD(post_date, INTERVAL 1 MONTH)) AS `eyear`, MONTH(DATE_ADD(post_date, INTERVAL 1 MONTH)) AS `emonth` FROM $wpdb->posts WHERE post_type IN ($types) AND post_status IN ($stati) ORDER BY post_date ASC ") ) {
+	foreach ( $monthyears as $k => $monthyear )
+		$monthyears[$k]->lmonth = $wp_locale->get_month( $monthyear->month, 2 );
+	for( $s = 0, $e = count( $monthyears ) - 1; $e >= 0; $s++, $e-- ) {
+		$dateoptions .= "\t<option value=\"" . $monthyears[$s]->year . '-' . zeroise( $monthyears[$s]->month, 2 ) . '">' . $monthyears[$s]->lmonth . ' ' . $monthyears[$s]->year . "</option>\n";
+		$edateoptions .= "\t<option value=\"" . $monthyears[$e]->eyear . '-' . zeroise( $monthyears[$e]->emonth, 2 ) . '">' . $monthyears[$e]->lmonth . ' ' . $monthyears[$e]->year . "</option>\n";
+	}
+}
+
 ?>

 <div class="wrap">
@@ -31,26 +70,71 @@ require_once ('admin-header.php');

 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
-<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>
+<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress site to import this site.'); ?></p>
 <form action="" method="get">
-<h3><?php _e('Options'); ?></h3>
+<h3><?php _e('Filters'); ?></h3>

 <table class="form-table">
 <tr>
-<th><label for="author"><?php _e('Restrict Author'); ?></label></th>
+<th><label for="mm_start"><?php _e('Start Date'); ?></label></th>
+<td>
+<select name="mm_start" id="mm_start">
+	<option value="all" selected="selected"><?php _e('All Dates'); ?></option>
+<?php echo $dateoptions; ?>
+</select>
+</td>
+</tr>
+<tr>
+<th><label for="mm_end" id="mm_end"><?php _e('End Date'); ?></label></th>
+<td>
+<select name="mm_end" id="mm_end">
+	<option value="all" selected="selected"><?php _e('All Dates'); ?></option>
+<?php echo $edateoptions; ?>
+</select>
+</td>
+</tr>
+<tr>
+<th><label for="author"><?php _e('Authors'); ?></label></th>
 <td>
 <select name="author" id="author">
 <option value="all" selected="selected"><?php _e('All Authors'); ?></option>
 <?php
-$authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );
-foreach ( $authors as $id ) {
-	$o = get_userdata( $id );
-	echo "<option value='" . esc_attr($o->ID) . "'>$o->display_name</option>";
+$authors = $wpdb->get_results( "SELECT DISTINCT u.id, u.display_name FROM $wpdb->users u INNER JOIN $wpdb->posts p WHERE u.id = p.post_author ORDER BY u.display_name" );
+foreach ( (array) $authors as $author ) {
+	echo "<option value='{$author->id}'>{$author->display_name}</option>\n";
 }
 ?>
 </select>
 </td>
 </tr>
+<?php foreach ( get_taxonomies( array( 'show_ui' => true ), 'objects' ) as $tax_obj ) {
+	$term_dropdown = wp_dropdown_categories( array( 'taxonomy' => $tax_obj->name, 'hide_if_empty' => true, 'show_option_all' => __( 'All Terms' ), 'name' => 'export_taxonomy[' . $tax_obj->name . ']', 'id' => 'taxonomy-' . $tax_obj->name, 'class' => '', 'echo' => false ) );
+	if ( $term_dropdown )
+		echo '<tr><th><label for="taxonomy-' . $tax_obj->name . '">' . $tax_obj->labels->name . '</label></th><td>' . $term_dropdown . '</td></tr>';
+}
+?>
+<tr>
+<th><label for="post_type"><?php _e('Content Types'); ?></label></th>
+<td>
+<select name="export_post_type" id="post_type">
+	<option value="all" selected="selected"><?php _e('All Content'); ?></option>
+	<?php foreach ( get_post_types( array( 'public' => true, 'can_export' => true ), 'objects' ) as $post_type_obj ) { ?>
+		<option value="<?php echo $post_type_obj->name; ?>"><?php echo $post_type_obj->labels->name; ?></option>
+	<?php } ?>
+</select>
+</td>
+</tr>
+<tr>
+<th><label for="status"><?php _e('Statuses'); ?></label></th>
+<td>
+<select name="export_post_status" id="status">
+	<option value="all" selected="selected"><?php _e('All Statuses'); ?></option>
+<?php foreach ( get_post_stati( array( 'internal' => false ), 'objects' ) as $post_status_obj ) { ?>
+	<option value="<?php echo $post_status_obj->name; ?>"><?php echo $post_status_obj->label; ?></option>
+<?php } ?>
+</select>
+</td>
+</tr>
 </table>
 <p class="submit"><input type="submit" name="submit" class="button" value="<?php esc_attr_e('Download Export File'); ?>" />
 <input type="hidden" name="download" value="true" />
--- a/wp-admin/gears-manifest.php
+++ b/wp-admin/gears-manifest.php
@@ -34,15 +34,15 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 $entries = '';

 foreach ( $files as $file ) {
+	// Set ignoreQuery, defaulting to true
+	$ignore_query = ( isset($file[2]) && !$file[2] ) ? '' : ', "ignoreQuery" : true ';
+
 	// If version is not set, just output the file
 	if ( !isset($file[1]) )
-		$entries .= '{ "url" : "' . $file[0] . '" },' . "\n";
-	// If ver is set but ignoreQuery is not, output file with ver tacked on
-	elseif ( !isset($file[2]) )
-		$entries .= '{ "url" : "' . $file[0] . '?' . $file[1] . '" },' . "\n";
-	// Output url, src, and ignoreQuery
+		$entries .= '{ "url" : "' . $file[0] . '"' . $ignore_query . ' }' . "\n";
+	// Output url and src
 	else
-		$entries .= '{ "url" : "' . $file[0] . '", "src" : "' . $file[0] . '?' . $file[1] . '", "ignoreQuery" : true },' . "\n";
+		$entries .= '{ "url" : "' . $file[0] . '", "src" : "' . $file[0] . '?' . $file[1] . '"' . $ignore_query . ' },' . "\n";
 }

 echo trim( trim($entries), ',' );
--- a/wp-admin/images/browse-happy.gif
+++ b/wp-admin/images/browse-happy.gif
--- a/wp-admin/images/fav-arrow-rtl.gif
+++ b/wp-admin/images/fav-arrow-rtl.gif
--- a/wp-admin/images/fav-arrow-vs-rtl.gif
+++ b/wp-admin/images/fav-arrow-vs-rtl.gif
--- a/wp-admin/images/fav-arrow.gif
+++ b/wp-admin/images/fav-arrow.gif
--- a/wp-admin/images/fav-top.png
+++ b/wp-admin/images/fav-top.png
--- a/wp-admin/images/icons32-vs.png
+++ b/wp-admin/images/icons32-vs.png
--- a/wp-admin/images/icons32.png
+++ b/wp-admin/images/icons32.png
--- a/wp-admin/images/media-button-image.gif
+++ b/wp-admin/images/media-button-image.gif
--- a/wp-admin/images/media-button-music.gif
+++ b/wp-admin/images/media-button-music.gif
--- a/wp-admin/images/media-button-other.gif
+++ b/wp-admin/images/media-button-other.gif
--- a/wp-admin/images/media-button-video.gif
+++ b/wp-admin/images/media-button-video.gif
--- a/wp-admin/images/menu-bits-rtl.gif
+++ b/wp-admin/images/menu-bits-rtl.gif
--- a/wp-admin/images/menu-bits.gif
+++ b/wp-admin/images/menu-bits.gif
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;padding-left:16px;position:static;}#dashboard_right_now td.b a.musublink{font-size:16px;}#dashboard_right_now div.musubtable{border-top:none;}#dashboard_right_now div.musubtable .t{white-space:normal;}.ms-sites-php .postbox h3{cursor:auto;}.ms-sites-php .postbox .description{margin:10px 0 0;padding:0 10px 10px;border-bottom:1px solid #DFDFDF;}tr.site-deleted{background:#ff8573;}tr.site-spammed{background:#faa;}tr.site-archived{background:#ffebe8;}tr.site-mature{background:#fecac2;}
				`@@ -0,0 +1 @@`
				#nav-menus-frame{margin-right:300px;margin-left:0;}#wpbody-content #menu-settings-column{margin-right:-300px;margin-left:0;float:right;}#menu-management-liquid{float:right;}#menu-management{margin-left:20px;margin-right:0;}#post-body{padding:0 10px 10px 0;}.post-body-plain{padding:10px 0 0 10px;}#menu-management .nav-tabs-arrow-left{right:0;left:auto;}#menu-management .nav-tabs-arrow-right{left:0;right:auto;text-align:left;}#menu-management .nav-tabs{padding-right:20px;padding-left:10px;}.js #menu-management .nav-tabs{float:right;margin-right:0;margin-left:-400px;}#select-nav-menu-container{text-align:left;}#wpbody .open-label{float:right;}#wpbody .open-label span{padding-left:10px;padding-right:0;}.js .input-with-default-title{font-style:normal;font-weight:bold;}.postbox .howto input{float:left;}#nav-menu-theme-locations .button-controls{text-align:left;}.meta-sep,.submitdelete,.submitcancel{float:right;}#cancel-save{margin-right:20px;margin-left:0;}.list-controls{float:right;}.add-to-menu{float:left;}#add-custom-link label span{float:right;padding-left:5px;padding-right:0;}.howto span{float:right;}.list li .menu-item-title input{margin-left:3px;margin-right:0;}.menu-item-handle{padding-right:10px;padding-left:0;}.menu-item-edit-active .menu-item-handle{-moz-border-radius:6px 6px 0 0;-webkit-border-bottom-left-radius:0;-webkit-border-bottom-right-radius:0;-khtml-border-bottom-left-radius:0;-khtml-border-bottom-right-radius:0;border-bottom-left-radius:0;border-bottom-right-radius:0;}.menu-item-handle .item-title{margin-left:13em;margin-right:0;}.menu-item-depth-0{margin-right:0;margin-left:0;}.menu-item-depth-1{margin-right:30px;margin-left:0;}.menu-item-depth-2{margin-right:60px;margin-left:0;}.menu-item-depth-3{margin-right:90px;margin-left:0;}.menu-item-depth-4{margin-right:120px;margin-left:0;}.menu-item-depth-5{margin-right:150px;margin-left:0;}.menu-item-depth-6{margin-right:180px;margin-left:0;}.menu-item-depth-7{margin-right:210px;margin-left:0;}.menu-item-depth-8{margin-right:240px;margin-left:0;}.menu-item-depth-9{margin-right:270px;margin-left:0;}.menu-item-depth-10{margin-right:300px;margin-left:0;}.menu-item-depth-11{margin-right:330px;margin-left:0;}.menu-item-depth-0 .menu-item-transport{margin-right:0;margin-left:0;}.menu-item-depth-1 .menu-item-transport{margin-right:-30px;margin-left:0;}.menu-item-depth-2 .menu-item-transport{margin-right:-60px;margin-left:0;}.menu-item-depth-3 .menu-item-transport{margin-right:-90px;margin-left:0;}.menu-item-depth-4 .menu-item-transport{margin-right:-120px;margin-left:0;}.menu-item-depth-5 .menu-item-transport{margin-right:-150px;margin-left:0;}.menu-item-depth-6 .menu-item-transport{margin-right:-180px;margin-left:0;}.menu-item-depth-7 .menu-item-transport{margin-right:-210px;margin-left:0;}.menu-item-depth-8 .menu-item-transport{margin-right:-240px;margin-left:0;}.menu-item-depth-9 .menu-item-transport{margin-right:-270px;margin-left:0;}.menu-item-depth-10 .menu-item-transport{margin-right:-300px;margin-left:0;}.menu-item-depth-11 .menu-item-transport{margin-right:-330px;margin-left:0;}.item-type{padding-left:10px;padding-right:0;}.item-controls{left:20px;right:auto;}.item-controls .item-order{padding-left:10px;padding-right:0;}.item-edit{background-image:url("../images/menu-bits-rtl.gif?ver=20100531");background-position:100% -105px;left:-20px;right:auto;-moz-border-radius-bottomright:3px;-moz-border-radius-bottomleft:0;-webkit-border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:0;-khtml-border-bottom-right-radius:3px;-khtml-border-bottom-left-radius:0;border-bottom-right-radius:3px;border-bottom-left-radius:0;}.menu-item-settings{padding:10px 10px 10px 0;border-width:0 1px 1px 1px;}.link-to-original{font-style:normal;font-weight:bold;}.link-to-original a{padding-right:4px;padding-left:0;}.menu-item-settings .description-thin,.menu-item-settings .description-wide{margin-left:10px;margin-right:0;float:right;}.major-publishing-actions .publishing-action{text-align:left;float:left;}.major-publishing-actions .delete-action{text-align:right;float:right;padding-left:15px;padding-right:0;}.menu-name-label{margin-left:15px;margin-right:0;}.auto-add-pages{float:right;}