2.6.3

git-svn-id: http://svn.automattic.com/wordpress/tags/2.6.3@9310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Snoopy cleanup
2008-10-23 22:49:15 +00:00 · 2008-10-23 22:42:59 +00:00 · 2008-10-23 21:19:53 +00:00 · 2008-10-23 21:10:50 +00:00 · 2008-10-03 15:55:35 +00:00 · 2008-09-17 02:10:01 +00:00
963 changed files with 62631 additions and 170416 deletions
--- a/license.txt
+++ b/license.txt
@@ -1,48 +1,8 @@
-WordPress - Web publishing software
-
-Copyright 2011 by the contributors
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-This program incorporates work covered by the following copyright and
-permission notices:
-
-  b2 is (c) 2001, 2002 Michel Valdrighi - m@tidakada.com -
-  http://tidakada.com
-
-  Wherever third party code has been used, credit has been given in the code's
-  comments.
-
-  b2 is released under the GPL
-
-and
-
-  WordPress - Web publishing software
-
-  Copyright 2003-2010 by the contributors
-
-  WordPress is released under the GPL
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
+                          675 Mass Ave, Cambridge, MA 02139, USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -318,10 +278,3 @@ POSSIBILITY OF SUCH DAMAGES.

 		     END OF TERMS AND CONDITIONS

-
-WRITTEN OFFER
-
-The source code for any program binaries or compressed scripts that are
-included with WordPress can be freely obtained at the following URL:
-
-	http://wordpress.org/download/source/
--- a/readme.html
+++ b/readme.html
@@ -2,108 +2,90 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>WordPress &#8250; ReadMe</title>
-	<link rel="stylesheet" href="wp-admin/css/install.css?ver=20100228" type="text/css" />
+	<title>WordPress &rsaquo; ReadMe</title>
+	<link rel="stylesheet" href="wp-admin/css/install.css" type="text/css" />
 </head>
 <body>
-<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.2.1
+<h1 id="logo" style="text-align: center">
+	<img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
+	<br /> Version 2.6.1
 </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 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>
+	<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>
 </ol>

-<h1>Updating</h1>
-<h2>Using the Automatic Updater</h2>
-<p>If you are updating from version 2.7 or higher, you can use the automatic updater:</p>
+<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.6.1:</h2>
 <ol>
-	<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>Updating Manually</h2>
-<ol>
-	<li>Before you update anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</li>
-	<li>Delete your old WordPress files, saving ones you've modified.</li>
+	<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>You wanted more, perhaps? That's it!</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>5.2.4</strong> or higher.</li>
-	<li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or higher.</li>
-</ul>
-
-<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>
+<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>

 <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/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>
+	<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>
 		<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 <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>
+	<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>
 </dl>

-<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>System Recommendations</h1>
+<ul>
+	<li>PHP version <strong>4.3</strong> or higher.</li>
+	<li>MySQL version <strong>4.0</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>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 <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>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>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 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>
+<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>

-<h1>Final Notes</h1>
+<h1> Final notes</h1>
 <ul>
-	<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="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>
+	<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>
 </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>License</h1>
-<p>WordPress is free software, and is released under the terms of the <abbr title="GNU General Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
-
+<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
@@ -1,102 +0,0 @@
-<?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( site_url( '/wp-login.php?action=register' ) );
-	die();
-}
-
-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: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; font-weight: bold; color: #333; }
-	</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">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;.  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, 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">Log in</a>'), $url, $url . 'wp-login.php' ); ?></p>
-			<?php else: ?>
-				<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p>
-			<?php endif;
-		}
-	}
-	?>
-</div>
-<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
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -1,51 +1,14 @@
-<?php
-/**
- * WordPress Administration Template Footer
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-// don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
-?>
-
-<div class="clear"></div></div><!-- wpbody-content -->
-<div class="clear"></div></div><!-- wpbody -->
-<div class="clear"></div></div><!-- wpcontent -->
-
+</div><!-- wpbody -->
+</div><!-- wpcontent -->
+</div><!-- wpwrap -->
 <div id="footer">
-<?php do_action( 'in_admin_footer' ); ?>
-<p id="footer-left" class="alignleft"><?php
+<p><?php
+do_action('in_admin_footer', '');
 $upgrade = apply_filters( 'update_footer', '' );
-$footer_text = array(
-	'<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>' ),
-	sprintf( __( '<a href="%s">Freedoms</a>' ), admin_url( 'freedoms.php' ) ),
-	__('<a href="http://wordpress.org/support/forum/4">Feedback</a>'),
-	sprintf(__('<a href="%s">Credits</a>'), admin_url('credits.php') ),
-);
-echo apply_filters( 'admin_footer_text', implode( ' &bull; ', $footer_text ) );
-unset( $footer_text );
+echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').' | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' '.$upgrade;
 ?></p>
-<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-" . $GLOBALS['hook_suffix']);
-
-// get_site_option() won't exist when auto upgrading from <= 2.7
-if ( function_exists('get_site_option') ) {
-	if ( false === get_site_option('can_compress_scripts') )
-		compression_test();
-}
-
-?>
-
-<div class="clear"></div></div><!-- wpwrap -->
+<?php do_action('admin_footer', ''); ?>
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
 </html>
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -1,16 +1,5 @@
 <?php
-/**
- * Administration Functions
- *
- * This file is deprecated, use 'wp-admin/includes/admin.php' instead.
- *
- * @deprecated 2.5
- * @package WordPress
- * @subpackage Administration
- */
-
+// Deprecated.  Use includes/admin.php.
 _deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/admin.php' );
-
-/** WordPress Administration API: Includes all Administration functions. */
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
-?>
+?>
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -1,219 +1,132 @@
 <?php
-/**
- * WordPress Administration Template Header
- *
- * @package WordPress
- * @subpackage Administration
- */
-
@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if ( ! defined( 'WP_ADMIN' ) )
-	require_once( './admin.php' );
+if (!isset($_GET["page"])) require_once('admin.php');
+if ( $editing ) {
+	if ( user_can_richedit() )
+		wp_enqueue_script( 'wp_tiny_mce' );
+}
+wp_enqueue_script( 'wp-gears' );
+
+$min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' );
+$the_current_page = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
+$ie6_no_scrollbar = true;
+
+function add_minwidth($c) {
+	return $c . 'minwidth ';
+}
+
+if ( in_array( $the_current_page, $min_width_pages ) ) {
+		$ie6_no_scrollbar = false;
+		add_filter( 'admin_body_class', 'add_minwidth' );
+}

 get_admin_page_title();
-$title = esc_html( strip_tags( $title ) );
-
-if ( is_network_admin() )
-	$admin_title = __( 'Network Admin' );
-elseif ( is_user_admin() )
-	$admin_title = __( 'Global Dashboard' );
-else
-	$admin_title = get_bloginfo( 'name' );
-
-if ( $admin_title == $title )
-	$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
-else
-	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
-
-$admin_title = apply_filters( 'admin_title', $admin_title, $title );
-
-wp_user_settings();

 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php echo $admin_title; ?></title>
+<title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title>
 <?php

-wp_admin_css( 'global' );
+wp_admin_css( 'css/global' );
 wp_admin_css();
-wp_admin_css( 'colors' );
-wp_admin_css( 'ie' );
-if ( is_multisite() )
-	wp_admin_css( 'ms' );
-wp_enqueue_script('utils');
+wp_admin_css( 'css/colors' );
+wp_admin_css( 'css/ie' );

-$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() ?>'
-	},
-	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(); ?>;
+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();}}};
 //]]>
 </script>
-<?php
+<?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') && $ie6_no_scrollbar ) : ?>
+<style type="text/css">* html { overflow-x: hidden; }</style>
+<?php endif;

-if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
-	wp_enqueue_script('quicktags');
-}
+$hook_suffixes = array();

-do_action('admin_enqueue_scripts', $hook_suffix);
-do_action("admin_print_styles-$hook_suffix");
-do_action('admin_print_styles');
-do_action("admin_print_scripts-$hook_suffix");
-do_action('admin_print_scripts');
-do_action("admin_head-$hook_suffix");
-do_action('admin_head');
+if ( isset($page_hook) )
+	$hook_suffixes[] = "-$page_hook";
+else if ( isset($plugin_page) )
+	$hook_suffixes[] = "-$plugin_page";
+else if ( isset($pagenow) )
+	$hook_suffixes[] = "-$pagenow";

-if ( get_user_setting('mfold') == 'f' )
-	$admin_body_class .= ' folded';
+$hook_suffixes[] = '';

-if ( is_admin_bar_showing() )
-	$admin_body_class .= ' admin-bar';
+foreach ( $hook_suffixes as $hook_suffix )
+	do_action("admin_print_styles$hook_suffix"); // do_action( 'admin_print_styles-XXX' ); do_action( 'admin_print_styles' );
+foreach ( $hook_suffixes as $hook_suffix )
+	do_action("admin_print_scripts$hook_suffix"); // do_action( 'admin_print_scripts-XXX' ); do_action( 'admin_print_scripts' );
+foreach ( $hook_suffixes as $hook_suffix )
+	do_action("admin_head$hook_suffix"); // do_action( 'admin_head-XXX' ); do_action( 'admin_head' );
+unset($hook_suffixes, $hook_suffix);

-if ( is_rtl() )
-	$admin_body_class .= ' rtl';
-
-$admin_body_class .= ' branch-' . str_replace( '.', '-', floatval( $wp_version ) );
-$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
-$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-
-if ( $is_iphone ) { ?>
-<style type="text/css">.row-actions{visibility:visible;}</style>
-<?php } ?>
+?>
 </head>
-<body class="wp-admin no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>">
-<script type="text/javascript">
-//<![CDATA[
-(function(){
-var c = document.body.className;
-c = c.replace(/no-js/, 'js');
-document.body.className = c;
-})();
-//]]>
-</script>
-
+<body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>">
 <div id="wpwrap">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
 <div id="wpcontent">
 <div id="wphead">
-<?php
-
-if ( is_network_admin() )
-	$blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
-elseif ( is_user_admin() )
-	$blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
-else
-	$blog_name = get_bloginfo('name', 'display');
-if ( '' == $blog_name ) {
-	$blog_name = __( 'Visit Site' );
-} else {
-	$blog_name_excerpt = wp_html_excerpt($blog_name, 40);
-	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') ) {
-	if ( mb_strlen($blog_name, 'UTF-8') > 30 )
-		$title_class = 'class="long-title"';
-} else {
-	if ( strlen($blog_name) > 30 )
-		$title_class = 'class="long-title"';
-}
-?>
-
-<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="16" height="16" />
-<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>
-</h1>
+<h1><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1>
+</div>

 <?php
-
-do_action('in_admin_header');
-
-$links = array();
-
-// Generate user profile and info links.
-$links[5] = sprintf( __('Howdy, %1$s'), $user_identity );
-
-$links[8] = '<a href="profile.php" title="' . esc_attr__('Edit your profile') . '">' . __('Your Profile') . '</a>';
-
-if ( is_multisite() && is_super_admin() ) {
-	if ( !is_network_admin() )
-		$links[10] = '<a href="' . network_admin_url() . '" title="' . ( ! empty( $update_title ) ? $update_title : esc_attr__('Network Admin') ) . '">' . __('Network Admin') . ( ! empty( $total_update_count ) ? ' (' . number_format_i18n( $total_update_count ) . ')' : '' ) . '</a>';
-	else
-		$links[10] = '<a href="' . get_dashboard_url( get_current_user_id() ) . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
-}
-
-$links[15] = '<a href="' . wp_logout_url() . '" title="' . esc_attr__('Log Out') . '">' . __('Log Out') . '</a>';
-
-$links = apply_filters( 'admin_user_info_links', $links, $current_user );
-ksort( $links );
-
-// Trim whitespace and pipes from links, then convert to list items.
-$links = array_map( 'trim', $links, array_fill( 0, count( $links ), " |\n\t" ) );
-
-$howdy = array_shift( $links );
-
-$links_no_js = implode( ' | ', $links );
-$links_js = '<li>' . implode( '</li><li>', $links ) . '</li>';
-
+if ( ! $is_opera ) { 
 ?>
-
-<div id="wphead-info">
-<div id="user_info">
-	<p class="hide-if-js"><?php echo "$howdy | $links_no_js"; ?></p>
-
-	<div class="hide-if-no-js">
-		<p><?php echo $howdy; ?></p>
-		<div id="user_info_arrow"></div>
-		<div id="user_info_links_wrap"><div id="user_info_links">
-			<ul><?php echo $links_js; ?></ul>
-		</div></div>
+	<div id="gears-info-box" class="info-box" style="display:none;">
+	<img src="images/gear.png" title="Gear" alt="" class="gears-img" />
+	<div id="gears-msg1">
+	<h3 class="info-box-title"><?php _e('Speed up WordPress'); ?></h3>
+	<p><?php _e('WordPress now has support for Gears, which adds new features to your web browser.'); ?><br />
+	<a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p>
+	<p><?php _e('After you install and enable Gears most of WordPress&#8217; images, scripts, and CSS files will be stored locally on your computer. This speeds up page load time.'); ?></p>
+	<p><strong><?php _e('Don&#8217;t install on a public or shared computer.'); ?></strong></p>	<div class="submit"><button onclick="window.location = 'http://gears.google.com/?action=install&amp;return=<?php echo urlencode( admin_url() ); ?>';" class="button"><?php _e('Install Now'); ?></button>
+	<button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div>
 	</div>
-</div>
-</div>

-</div>
+	<div id="gears-msg2" style="display:none;">
+	<h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
+	<p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> 
+	<p><?php 
+	
+	if ( $is_safari )
+		_e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.');
+	else
+		_e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.'); 
+	
+	?></p>
+	<p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p>
+	<div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button>
+	<button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div>
+	</div>
+
+	<div id="gears-msg3" style="display:none;">
+	<h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
+	<p><?php
+	
+	if ( $is_safari )
+		_e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.');
+	else
+		_e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); 
+	
+	?></p>
+	<p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p>
+	<p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p>
+	<div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div>
+	</div>
+	</div>
+<?php } ?>
+
+<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( ! $is_opera ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div>

-<div id="wpbody">
 <?php
-unset($title_class, $blog_name, $total_update_count, $update_title);
+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($current_screen);
-
-if ( is_network_admin() )
-	do_action('network_admin_notices');
-elseif ( is_user_admin() )
-	do_action('user_admin_notices');
-else
-	do_action('admin_notices');
-
-do_action('all_admin_notices');
-
-if ( $parent_file == 'options-general.php' )
+if ( $parent_file == 'options-general.php' ) {
 	require(ABSPATH . 'wp-admin/options-head.php');
+}
+?>
+<div id="wpbody">
--- a/wp-admin/admin-post.php
+++ b/wp-admin/admin-post.php
@@ -1,13 +1,5 @@
 <?php
-/**
- * WordPress Administration Generic POST Handler.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** We are located in WordPress Administration Screens */
-define('WP_ADMIN', true);
+define('WP_ADMIN', TRUE);

 if ( defined('ABSPATH') )
 	require_once(ABSPATH . 'wp-load.php');
@@ -16,15 +8,14 @@ else

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

+if ( !wp_validate_auth_cookie() )
+	wp_die(__('Cheatin&#8217; uh?'));
+
 nocache_headers();

 do_action('admin_init');

 $action = 'admin_post';
-
-if ( !wp_validate_auth_cookie() )
-	$action .= '_nopriv';
-
 if ( !empty($_REQUEST['action']) )
 	$action .= '_' . $_REQUEST['action'];

--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -1,64 +1,14 @@
 <?php
-/**
- * WordPress Administration Bootstrap
- *
- * @package WordPress
- * @subpackage Administration
- */
+define('WP_ADMIN', TRUE);

-/**
- * In WordPress Administration Screens
- *
- * @since 2.3.2
- */
-if ( ! defined('WP_ADMIN') )
-	define('WP_ADMIN', TRUE);
+if ( defined('ABSPATH') )
+	require_once(ABSPATH . 'wp-load.php');
+else
+	require_once('../wp-load.php');

-if ( ! defined('WP_NETWORK_ADMIN') )
-	define('WP_NETWORK_ADMIN', FALSE);
-
-if ( ! defined('WP_USER_ADMIN') )
-	define('WP_USER_ADMIN', FALSE);
-
-if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
-	define('WP_BLOG_ADMIN', TRUE);
-}
-
-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();
-	update_option( 'db_upgraded',  false );
-
-	/**
-	 * Runs on the next page load after successful upgrade
-	 *
-	 * @since 2.8
-	 */
-	do_action('after_db_upgrade');
-} elseif ( get_option('db_version') != $wp_db_version ) {
-	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);
-	}
+if ( get_option('db_version') != $wp_db_version ) {
+	wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
+	exit;
 }

 require_once(ABSPATH . 'wp-admin/includes/admin.php');
@@ -67,82 +17,36 @@ auth_redirect();

 nocache_headers();

-// Schedule trash collection
-if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )
-	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
-
-set_screen_options();
+update_category_cache();

+$posts_per_page = get_option('posts_per_page');
+$what_to_show = get_option('what_to_show');
 $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_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
+
+wp_admin_css_color('classic', __('Classic'), admin_url("css/colors-classic.css"), array('#07273E', '#14568A', '#D54E21', '#2683AE'));
+wp_admin_css_color('fresh', __('Fresh'), admin_url("css/colors-fresh.css"), array('#464646', '#CEE1EF', '#D54E21', '#2683AE'));

 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 = '';
-
-if ( WP_NETWORK_ADMIN )
-	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
-	require(ABSPATH . 'wp-admin/user/menu.php');
-else
-	require(ABSPATH . 'wp-admin/menu.php');
-
-if ( current_user_can( 'manage_options' ) )
-	@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+require(ABSPATH . 'wp-admin/menu.php');

 do_action('admin_init');

-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') ) {
-			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
-			else
-				$query_string = 'page=' . $plugin_page;
-			wp_redirect( admin_url('tools.php?' . $query_string) );
-			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 (isset($plugin_page)) {
+	$page_hook = get_plugin_page_hook($plugin_page, $pagenow);
+
 	if ( $page_hook ) {
 		do_action('load-' . $page_hook);
 		if (! isset($_GET['noheader']))
@@ -150,22 +54,19 @@ 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") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
+		if (! ( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_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');

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

 	include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -179,20 +80,20 @@ if ( isset($plugin_page) ) {
 		wp_die(__('You are not allowed to import.'));

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

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

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

@@ -203,33 +104,13 @@ if ( isset($plugin_page) ) {

 	define('WP_IMPORTING', true);

-	if ( apply_filters( 'force_filtered_html_on_import', false ) )
-		kses_init_filters();  // Always filter imported data with kses on multisite.
-
 	call_user_func($wp_importers[$importer][2]);

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

-	// Make sure rules are flushed
-	global $wp_rewrite;
-	$wp_rewrite->flush_rules(false);
-
 	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 ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
-			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
-			do_action( 'load-edit-link-categories.php' );
-	}
 }

 if ( !empty($_REQUEST['action']) )
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -1,12 +1,8 @@
 <?php
-/**
- * Accepts file uploads from swfupload or other asynchronous upload methods.
- *
- * @package WordPress
- * @subpackage Administration
- */

-define('WP_ADMIN', true);
+/* This accepts file uploads from swfupload or other asynchronous upload methods.
+
+*/

 if ( defined('ABSPATH') )
 	require_once(ABSPATH . 'wp-load.php');
@@ -18,50 +14,33 @@ if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_c
 	$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
 elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
 	$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
-	$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
 unset($current_user);
-require_once('./admin.php');
+require_once('admin.php');

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

 if ( !current_user_can('upload_files') )
 	wp_die(__('You do not have permission to upload files.'));

-// just fetch the detail form for that attachment
-if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
-	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
-		wp_die( __( 'Unknown post type.' ) );
-	$post_type_object = get_post_type_object( 'attachment' );
-	if ( ! current_user_can( $post_type_object->cap->edit_post, $id ) )
-		wp_die( __( 'You are not allowed to edit this item.' ) );
-
-	if ( 2 == $_REQUEST['fetch'] ) {
-		add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-		echo get_media_item($id, array( 'send' => false, 'delete' => true ));
-	} else {
-		add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
-		echo get_media_item($id);
-	}
+// just fetch the detail form for that attachment	
+if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
+	echo get_media_item($id);
 	exit;
 }

 check_admin_referer('media-form');

 $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-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>';
+if (is_wp_error($id)) {
+	echo '<div id="media-upload-error">'.wp_specialchars($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
@@ -0,0 +1,211 @@
+<?php
+require_once('admin.php');
+
+$title = __('Categories');
+$parent_file = 'edit.php';
+
+wp_reset_vars(array('action', 'cat'));
+
+if ( isset($_GET['deleteit']) && isset($_GET['delete']) )
+	$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_redirect('categories.php?message=1#addcat');
+	} else {
+		wp_redirect('categories.php?message=4#addcat');
+	}
+	exit;
+break;
+
+case 'delete':
+	$cat_ID = (int) $_GET['cat_ID'];
+	check_admin_referer('delete-category_' .  $cat_ID);
+
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));
+
+	$cat_name = get_catname($cat_ID);
+
+	// 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"), $cat_name));
+
+	wp_delete_category($cat_ID);
+
+	wp_redirect('categories.php?message=2');
+	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.') );
+
+	foreach ( (array) $_GET['delete'] as $cat_ID ) {
+		$cat_name = get_catname($cat_ID);
+
+		// 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"), $cat_name));
+
+		wp_delete_category($cat_ID);
+	}
+
+	$sendback = wp_get_referer();
+	$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
+
+	wp_redirect($sendback);
+	exit();
+
+break;
+case 'edit':
+
+	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?'));
+
+	if ( wp_update_category($_POST) )
+		wp_redirect('categories.php?message=3');
+	else
+		wp_redirect('categories.php?message=5');
+
+	exit;
+break;
+
+default:
+
+if ( !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' );
+wp_enqueue_script('admin-forms');
+
+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.');
+?>
+
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+endif; ?>
+
+<div class="wrap">
+<form id="posts-filter" action="" method="get">
+<?php if ( current_user_can('manage_categories') ) : ?>
+	<h2><?php printf(__('Manage Categories (<a href="%s">add new</a>)'), '#addcat') ?> </h2>
+<?php else : ?>
+	<h2><?php _e('Manage Categories') ?> </h2>
+<?php endif; ?>
+
+<p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label>
+	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
+</p>
+
+<br class="clear" />
+
+<div class="tablenav">
+
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+	$pagenum = 1;
+if( !$catsperpage || $catsperpage < 0 )
+	$catsperpage = 20;
+
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'pagenum', '%#%' ),
+	'format' => '',
+	'total' => ceil(wp_count_terms('category') / $catsperpage),
+	'current' => $pagenum
+));
+
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft">
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
+<?php wp_nonce_field('bulk-categories'); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+<br class="clear" />
+
+<table class="widefat">
+	<thead>
+	<tr>
+		<th scope="col" class="check-column"><input type="checkbox" /></th>
+        <th scope="col"><?php _e('Name') ?></th>
+        <th scope="col"><?php _e('Description') ?></th>
+        <th scope="col" class="num"><?php _e('Posts') ?></th>
+	</tr>
+	</thead>
+	<tbody id="the-list" class="list:cat">
+<?php
+cat_rows(0, 0, 0, $pagenum, $catsperpage);
+?>
+	</tbody>
+</table>
+</form>
+
+<div class="tablenav">
+
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+<br class="clear" />
+</div>
+<br class="clear" />
+
+</div>
+
+<?php if ( current_user_can('manage_categories') ) : ?>
+<div class="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_catname(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>
+
+<?php include('edit-category-form.php'); ?>
+
+<?php endif; ?>
+
+<?php
+break;
+}
+
+include('admin-footer.php');
+
+?>
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -1,13 +1,5 @@
 <?php
-/**
- * Comment Management Screen
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** Load WordPress Bootstrap */
-require_once('./admin.php');
+require_once('admin.php');

 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
@@ -17,26 +9,9 @@ wp_reset_vars( array('action') );
 if ( isset( $_POST['deletecomment'] ) )
 	$action = 'deletecomment';

-if ( 'cdc' == $action )
-	$action = 'delete';
-elseif ( 'mac' == $action )
-	$action = 'approve';
-
-if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
-		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
-		$action = 'trash';
-}
-
-/**
- * Display error message at bottom of comments.
- *
- * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
- */
-function comment_footer_die( $msg ) {
+function comment_footer_die( $msg ) {  // $msg is assumed to contain HTML and be sanitized
 	echo "<div class='wrap'><p>$msg</p></div>";
-	include('./admin-footer.php');
+	include('admin-footer.php');
 	die;
 }

@@ -45,112 +20,80 @@ 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_Screens#Comments" target="_blank">Documentation on Comments</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'] );

 	if ( !$comment = get_comment( $comment_id ) )
 		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)') );

-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('You are not allowed to edit this comment.') );
-
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+		comment_footer_die( __('You are not allowed to edit comments on this post.') );

 	$comment = get_comment_to_edit( $comment_id );

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

 	break;

-case 'delete'  :
-case 'approve' :
-case 'trash'   :
-case 'spam'    :
+case 'cdc' :
+case 'mac' :

-	$title = __('Moderate Comment');
+	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_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
-		die();
-	}
-
-	// No need to re-approve/re-trash/re-spam a comment.
-	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
-		die();
- 	}
-
-	require_once('./admin-header.php');
-
-	$formaction    = $action . 'comment';
-	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
+	$formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment';
+	$nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-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( 'cdc' == $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 echo esc_html( $title ); ?></h2>
-
 <?php
-switch ( $action ) {
-	case 'spam' :
-		$caution_msg = __('You are about to mark the following comment as spam:');
-		$button      = __('Spam Comment');
-		break;
-	case 'trash' :
-		$caution_msg = __('You are about to move the following comment to the Trash:');
-		$button      = __('Trash Comment');
-		break;
-	case 'delete' :
-		$caution_msg = __('You are about to delete the following comment:');
-		$button      = __('Permanently Delete Comment');
-		break;
-	default :
-		$caution_msg = __('You are about to approve the following comment:');
-		$button      = __('Approve Comment');
-		break;
-}
-
-if ( $comment->comment_approved != '0' ) { // if not unapproved
-	$message = '';
-	switch ( $comment->comment_approved ) {
-		case '1' :
-			$message = __('This comment is currently approved.');
-			break;
-		case 'spam' :
-			$message  = __('This comment is currently marked as spam.');
-			break;
-		case 'trash' :
-			$message  = __('This comment is currently in the Trash.');
-			break;
-	}
-	if ( $message )
-		echo '<div class="updated"><p>' . $message . '</p></div>';
+if ( 'spam' == $_GET['dt'] ) {
+	$caution_msg = __('You are about to mark the following comment as spam:');
+	$button = __('Spam Comment');
+} elseif ( 'cdc' == $action ) {
+	$caution_msg = __('You are about to delete the following comment:');
+	$button = __('Delete Comment');
+} else {
+	$caution_msg = __('You are about to approve the following comment:');
+	$button = __('Approve Comment');
 }
 ?>
+
 <p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>

-<table class="form-table comment-ays">
+<p><?php _e('Are you sure you want to do that?'); ?></p>
+
+<form action='comment.php' method='get'>
+
+<table width="100%">
+<tr>
+<td><input type='button' class="button" value='<?php _e('No'); ?>' onclick="self.location='<?php echo admin_url('edit-comments.php'); ?>" /></td>
+<td class="textright"><input type='submit' class="button" value='<?php echo $button; ?>' /></td>
+</tr>
+</table>
+
+<?php wp_nonce_field( $nonce_action ); ?>
+<input type='hidden' name='action' value='<?php echo $formaction; ?>' />
+<?php if ( 'spam' == $_GET['dt'] ) { ?>
+<input type='hidden' name='dt' value='spam' />
+<?php } ?>
+<input type='hidden' name='p' value='<?php echo $comment->comment_post_ID; ?>' />
+<input type='hidden' name='c' value='<?php echo $comment->comment_ID; ?>' />
+<input type='hidden' name='noredir' value='1' />
+</form>
+
+<table class="form-table" cellpadding="5">
 <tr class="alt">
 <th scope="row"><?php _e('Author'); ?></th>
 <td><?php echo $comment->comment_author; ?></td>
@@ -164,114 +107,110 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 <?php if ( $comment->comment_author_url ) { ?>
 <tr>
 <th scope="row"><?php _e('URL'); ?></th>
-<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
+<td><a href='<?php echo $comment->comment_author_url; ?>'><?php echo $comment->comment_author_url; ?></a></td>
 </tr>
 <?php } ?>
 <tr>
-<th scope="row" valign="top"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
+<th scope="row" valign="top"><?php _e('Comment'); ?></th>
 <td><?php echo $comment->comment_content; ?></td>
 </tr>
 </table>

-<p><?php _e('Are you sure you want to do this?'); ?></p>
-
-<form action='comment.php' method='get'>
-
-<table width="100%">
-<tr>
-<td><a class="button" href="<?php echo admin_url('edit-comments.php'); ?>"><?php esc_attr_e('No'); ?></a></td>
-<td class="textright"><?php submit_button( $button, 'button' ); ?></td>
-</tr>
-</table>
-
-<?php wp_nonce_field( $nonce_action ); ?>
-<input type='hidden' name='action' value='<?php echo esc_attr($formaction); ?>' />
-<input type='hidden' name='c' value='<?php echo esc_attr($comment->comment_ID); ?>' />
-<input type='hidden' name='noredir' value='1' />
-</form>
-
 </div>
 </div>
 <?php
 	break;

-case 'deletecomment'    :
-case 'trashcomment'     :
-case 'untrashcomment'   :
-case 'spamcomment'      :
-case 'unspamcomment'    :
-case 'approvecomment'   :
-case 'unapprovecomment' :
+case 'deletecomment' :
 	$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 );
+	if ( isset( $_REQUEST['noredir'] ) )
+		$noredir = true;
 	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+		$noredir = false;

-	$noredir = isset($_REQUEST['noredir']);
-
-	if ( !$comment = get_comment($comment_id) )
+	if ( !$comment = get_comment( $comment_id ) )
 		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+
+	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() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
-		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	if ( 'spam' == $_REQUEST['dt'] )
+		wp_set_comment_status( $comment->comment_ID, 'spam' );
 	else
-		$redir = admin_url('edit-comments.php');
+		wp_delete_comment( $comment->comment_ID );

-	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+	if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ) )
+		wp_redirect( wp_get_referer() );
+	else if ( '' != wp_get_original_referer() && false == $noredir )
+		wp_redirect( wp_get_original_referer() );
+	else
+		wp_redirect( admin_url('edit-comments.php') );

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

+case 'unapprovecomment' :
+	$comment_id = absint( $_GET['c'] );
+	check_admin_referer( 'unapprove-comment_' . $comment_id );
+
+	if ( isset( $_GET['noredir'] ) )
+		$noredir = true;
+	else
+		$noredir = false;
+
+	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 ) )
+		comment_footer_die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
+
+	wp_set_comment_status( $comment->comment_ID, 'hold' );
+
+	if ( '' != wp_get_referer() && false == $noredir )
+		wp_redirect( wp_get_referer() );
+	else
+		wp_redirect( admin_url('edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );
+
+	exit();
+	break;
+
+case 'approvecomment' :
+	$comment_id = absint( $_GET['c'] );
+	check_admin_referer( 'approve-comment_' . $comment_id );
+
+	if ( isset( $_GET['noredir'] ) )
+		$noredir = true;
+	else
+		$noredir = false;
+
+	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) )
+		comment_footer_die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
+
+	wp_set_comment_status( $comment->comment_ID, 'approve' );
+
+	if ( '' != wp_get_referer() && false == $noredir )
+		wp_redirect( wp_get_referer() );
+	else
+		wp_redirect( admin_url('edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );
+
+	exit();
+	break;
+
 case 'editedcomment' :

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

 	check_admin_referer( 'update-comment_' . $comment_id );

 	edit_comment();

-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+	$location = ( empty( $_POST['referredby'] ) ? "edit.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
 	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
 	wp_redirect( $location );

@@ -284,6 +223,6 @@ default:

 } // end switch

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

 ?>
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -1,176 +0,0 @@
-<?php
-/**
- * Credits administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** WordPress Administration Bootstrap */
-require_once( './admin.php' );
-
-$title = __( 'Credits' );
-$parent_file = 'index.php';
-
-add_contextual_help($current_screen,
-	'<p>' . __('Each name or handle is a link to that person&#8217;s profile in the WordPress.org community directory.') . '</p>' .
-	'<p>' . __('You can register your own profile at <a href="http://wordpress.org/support/register.php" target="_blank">this link</a> to start contributing.') . '</p>' .
-	'<p>' . __('WordPress always needs more people to report bugs, patch bugs, test betas, work on UI design, translate strings, write documentation, and add questions/answers/suggestions to the Support Forums. Join in!') . '</p>' .
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="http://codex.wordpress.org/Contributing_to_WordPress" target="_blank">Documentation on Contributing to WordPress</a>') . '</p>' .
-	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-);
-
-add_action( 'admin_head', '_wp_credits_add_css' );
-function _wp_credits_add_css() { ?>
-<style type="text/css">
-div.wrap { max-width: 750px }
-h3.wp-people-group, p.wp-credits-list { clear: both; }
-ul.compact { margin-bottom: 0 }
-
-<?php if ( is_rtl() ) { ?>
-ul.wp-people-group { margin-bottom: 30px; float: right; clear: both; }
-li.wp-person { float: right; height: 70px; width: 220px; margin-left: 10px; }
-li.wp-person img.gravatar { float: right; margin-left: 10px; margin-bottom: 10px; }
-<?php } else { ?>
-li.wp-person { float: left; margin-right: 10px; }
-li.wp-person img.gravatar { float: left; margin-right: 10px; margin-bottom: 10px; }
-<?php } ?>
-li.wp-person img.gravatar { width: 60px; height: 60px; }
-ul.compact li.wp-person img.gravatar { width: 30px; height: 30px; }
-li.wp-person { height: 70px; width: 220px; }
-ul.compact li.wp-person { height: 40px; width: auto; white-space: nowrap }
-li.wp-person a.web { font-size: 16px; text-decoration: none; }
-</style>
-<?php }
-
-function wp_credits() {
-	global $wp_version;
-	$locale = get_locale();
-
-	$results = get_site_transient( 'wordpress_credits_' . $locale );
-
-	if ( ! is_array( $results ) ) {
-		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.0/?version=$wp_version&locale=$locale" );
-
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-			return false;
-
-		$results = maybe_unserialize( wp_remote_retrieve_body( $response ) );
-
-		if ( ! is_array( $results ) )
-			return false;
-
-		set_site_transient( 'wordpress_credits_' . $locale, $results, 86400 ); // One day
-	}
-
-	return $results;
-}
-
-function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
-	$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
-}
-
-function _wp_credits_build_object_link( &$data ) {
-	$data = '<a href="' . esc_url( $data[1] ) . '">' . $data[0] . '</a>';
-}
-
-include( './admin-header.php' );
-?>
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e( 'WordPress Credits' ); ?></h2>
-
-<?php
-
-$credits = wp_credits();
-
-if ( ! $credits ) {
-	echo '<p>' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
-		'http://wordpress.org/about/',
-		/* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
-		__( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';
-	include( './admin-footer.php' );
-	exit;
-}
-
-echo '<p>' . __( 'WordPress is created by a worldwide team of passionate individuals. We couldn&#8217;t possibly list them all, but here some of the most influential people currently involved with the project:' ) . "</p>\n";
-
-$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/';
-
-foreach ( $credits['groups'] as $group_slug => $group_data ) {
-	if ( $group_data['name'] ) {
-		if ( 'Translators' == $group_data['name'] ) {
-			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
-			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
-		} elseif ( isset( $group_data['placeholders'] ) ) {
-			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
-		} else {
-			$title = translate( $group_data['name'] );
-		}
-
-		echo '<h3 class="wp-people-group">' . $title . "</h3>\n";
-	}
-
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
-
-	switch ( $group_data['type'] ) {
-		case 'list' :
-			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
-			break;
-		case 'libraries' :
-			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
-			break;
-		default:
-			$compact = 'compact' == $group_data['type'];
-			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
-			echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
-			foreach ( $group_data['data'] as $person_data ) {
-				echo '<li class="wp-person" id="wp-person-' . $person_data[2] . '">' . "\n\t";
-				echo '<a href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">';
-				$size = 'compact' == $group_data['type'] ? '30' : '60';
-				echo '<img src="' . $gravatar . $person_data[1] . '?s=' . $size . '" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
-				echo '<a class="web" href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">' . $person_data[0] . "</a>\n\t";
-				if ( ! $compact )
-					echo '<br /><span class="title">' . translate( $person_data[3] ) . "</span>\n";
-				echo "</li>\n";
-			}
-			echo "</ul>\n";
-		break;
-	}
-}
-
-?>
-<p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-	/* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
-	__( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ); ?></p>
-
-</div>
-<?php
-
-include( './admin-footer.php' );
-
-return;
-
-// These are strings returned by the API that we want to be translatable
-__( 'Project Leaders' );
-__( 'Extended Core Team' );
-__( 'Recent Rockstars' );
-__( 'Core Contributors to WordPress %s' );
-__( 'Cofounder, Project Lead' );
-__( 'Lead Developer' );
-__( 'User Experience Lead' );
-__( 'Core Committer' );
-__( 'Guest Committer' );
-__( 'Developer' );
-__( 'Designer' );
-__( 'XML-RPC' );
-__( 'Internationalization' );
-__( 'External Libraries' );
-__( 'Icon Design' );
-__( 'Blue Color Scheme' );
-
-?>
--- a/wp-admin/css/colors-classic-rtl.css
+++ b/wp-admin/css/colors-classic-rtl.css
@@ -1 +1,24 @@
-.bar{border-right-color:none;border-left-color:#99d;}.post-com-count{background-image:url(../images/bubble_bg-rtl.gif);}#user_info_arrow{background:transparent url(../images/arrows-vs.png) no-repeat 0 5px;}#user_info:hover #user_info_arrow,#user_info.active #user_info_arrow{background:transparent url(../images/arrows-dark-vs.png) no-repeat 0 5px;}#adminmenushadow,#adminmenuback{background-image:url(../images/menu-shadow-rtl.png);background-position:top left;}#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/arrows-dark-vs.png) no-repeat 8px 6px;}#adminmenu .wp-has-submenu:hover .wp-menu-toggle,#adminmenu .wp-menu-open .wp-menu-toggle{background:transparent url(../images/arrows-vs.png) no-repeat 8px 6px;}#adminmenu .wp-submenu .wp-submenu-head{border-right-color:none;border-left-color:#d1e5ee;}.folded #adminmenu .wp-submenu-wrap{-moz-box-shadow:-2px 2px 5px rgba(0,0,0,0.4);-webkit-box-shadow:-2px 2px 5px rgba(0,0,0,0.4);box-shadow:-2px 2px 5px rgba(0,0,0,0.4);}#collapse-button div{background-position:0 -108px;}.folded #collapse-button div{background-position:0 -72px;}.meta-box-sortables .postbox:hover .handlediv{background:transparent url(../images/arrows-vs.png) no-repeat 6px 7px;}.tablenav .tablenav-pages a{border-color:#d1e5ee;background:#eee url('../images/menu-bits-rtl-vs.gif?ver=20100610') repeat-x scroll right -379px;}#post-body .misc-pub-section{border-right-color:none;border-left-color:#d1e5ee;}#favorite-toggle{background:transparent url(../images/arrows-vs.png) no-repeat 4px 2px;}#screen-meta a.show-settings,.toggle-arrow{background:transparent url(../images/arrows-vs.png) no-repeat left 3px;}#screen-meta .screen-meta-active a.show-settings{background:transparent url(../images/arrows-vs.png) no-repeat left -33px;}.sidebar-name-arrow{background:transparent url(../images/arrows-vs.png) no-repeat 5px 9px;}.sidebar-name:hover .sidebar-name-arrow{background:transparent url(../images/arrows-dark-vs.png) no-repeat 5px 9px;}
+.post-com-count {
+}
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
+	background-image: url(../images/comment-stalk-rtl.gif);
+	background-position:right bottom;
+}
+#footer {
+	background-position:99% 10px;
+}
+#poststuff .closed .togbox, #poststuff .togbox {
+	background-image: url(../images/toggle-arrow-rtl.gif) !important;
+}
+.bar {
+	border-right-color: transparent;
+	border-left-color: #99d;
+}
+.plugins .togl {
+	border-right-color: transparent;
+	border-left-color: #ccc;
+}
+#upload-menu li.current {
+	border-right-color: transparent;
+	border-left-color: #448abd;
+}
--- a/wp-admin/css/colors-classic-rtl.dev.css
+++ b/wp-admin/css/colors-classic-rtl.dev.css
@@ -1,98 +0,0 @@
-.bar {
-	border-right-color: none;
-	border-left-color: #99d;
-}
-
-.post-com-count {
-	background-image: url(../images/bubble_bg-rtl.gif);
-}
-
-#user_info_arrow {
-	background: transparent url(../images/arrows-vs.png) no-repeat 0 5px;
-}
-
-#user_info:hover #user_info_arrow,
-#user_info.active #user_info_arrow {
-	background: transparent url(../images/arrows-dark-vs.png) no-repeat 0 5px;
-}
-
-/* editors */
-
-/* menu */
-
-#adminmenushadow,
-#adminmenuback {
-	background-image: url(../images/menu-shadow-rtl.png);
-	background-position: top left;
-}
-
-#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/arrows-dark-vs.png) no-repeat 8px 6px;
-}
-
-#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
-#adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/arrows-vs.png) no-repeat 8px 6px;
-}
-
-
-#adminmenu .wp-submenu .wp-submenu-head {
-	border-right-color: none;
-	border-left-color: #d1e5ee;
-}
-
-.folded #adminmenu .wp-submenu-wrap {
-	-moz-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 );
-	-webkit-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 );
-	box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 );
-}
-
-/* collapse menu button */
-#collapse-button div {
-	background-position: 0 -108px;
-}
-.folded #collapse-button div {
-	background-position: 0 -72px;
-}
-
-/* edit image */
-
-.meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/arrows-vs.png) no-repeat 6px 7px;
-}
-
-.tablenav .tablenav-pages a {
-	border-color: #d1e5ee;
-	background: #eee url('../images/menu-bits-rtl-vs.gif?ver=20100610') repeat-x scroll right -379px;
-}
-
-#post-body .misc-pub-section {
-	border-right-color: none;
-	border-left-color: #d1e5ee;
-}
-
-#favorite-toggle {
-	background: transparent url(../images/arrows-vs.png) no-repeat 4px 2px;
-}
-
-#screen-meta a.show-settings,
-.toggle-arrow {
-	background: transparent url(../images/arrows-vs.png) no-repeat left 3px;
-}
-
-#screen-meta .screen-meta-active a.show-settings {
-	background: transparent url(../images/arrows-vs.png) no-repeat left -33px;
-}
-
-.sidebar-name-arrow {
-	background: transparent url(../images/arrows-vs.png) no-repeat 5px 9px;
-}
-.sidebar-name:hover .sidebar-name-arrow {
-	background: transparent url(../images/arrows-dark-vs.png) no-repeat 5px 9px;
-}
-
-
-/* custom header & background pages */
-
-/* custom header & background pages */
--- 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
--- a/wp-admin/css/colors-fresh-rtl.css
+++ b/wp-admin/css/colors-fresh-rtl.css
@@ -1 +1,24 @@
-.bar{border-right-color:none;border-left-color:#99d;}.post-com-count{background-image:url(../images/bubble_bg-rtl.gif);}#user_info_arrow{background:transparent url(../images/arrows.png) no-repeat 0 5px;}#user_info:hover #user_info_arrow,#user_info.active #user_info_arrow{background:transparent url(../images/arrows-dark.png) no-repeat 0 5px;}#adminmenushadow,#adminmenuback{background-image:url(../images/menu-shadow-rtl.png);background-position:top left;}#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/arrows-dark.png) no-repeat 8px 6px;}#adminmenu .wp-has-submenu:hover .wp-menu-toggle,#adminmenu .wp-menu-open .wp-menu-toggle{background:transparent url(../images/arrows.png) no-repeat 8px 6px;}#adminmenu .wp-submenu .wp-submenu-head{border-right-color:none;border-left-color:#dfdfdf;}.folded #adminmenu .wp-submenu-wrap{-moz-box-shadow:-2px 2px 5px rgba(0,0,0,0.4);-webkit-box-shadow:-2px 2px 5px rgba(0,0,0,0.4);box-shadow:-2px 2px 5px rgba(0,0,0,0.4);}#collapse-button div{background-position:0 -108px;}.folded #collapse-button div{background-position:0 -72px;}.meta-box-sortables .postbox:hover .handlediv{background:transparent url(../images/arrows.png) no-repeat 6px 7px;}.tablenav .tablenav-pages a{border-color:#e3e3e3;background:#eee url('../images/menu-bits-rtl.gif?ver=20100610') repeat-x scroll right -379px;}#post-body .misc-pub-section{border-right-color:none;border-left-color:#eee;}#favorite-toggle{background:transparent url(../images/arrows.png) no-repeat 4px 2px;}#screen-meta a.show-settings,.toggle-arrow{background:transparent url(../images/arrows.png) no-repeat left 3px;}#screen-meta .screen-meta-active a.show-settings{background:transparent url(../images/arrows.png) no-repeat left -33px;}.sidebar-name-arrow{background:transparent url(../images/arrows.png) no-repeat 5px 9px;}.sidebar-name:hover .sidebar-name-arrow{background:transparent url(../images/arrows-dark.png) no-repeat 5px 9px;}
+.bar {
+	border-right-color: transparent;
+	border-left-color: #99d;
+}
+.post-com-count {
+}
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
+	background-image: url(../images/comment-stalk-rtl.gif);
+	background-position:right bottom;
+}
+#footer {
+	background-position:99% 10px;
+}
+.plugins .togl {
+	border-right-color: transparent;
+	border-left-color: #ccc;
+}
+#poststuff .closed .togbox, #poststuff .togbox {
+	background-image: url(../images/toggle-arrow-rtl.gif);
+}
+#upload-menu li.current {
+	border-right-color:transparent;
+	border-left-color: #448abd;
+}
--- a/wp-admin/css/colors-fresh-rtl.dev.css
+++ b/wp-admin/css/colors-fresh-rtl.dev.css
@@ -1,98 +0,0 @@
-.bar {
-	border-right-color: none;
-	border-left-color: #99d;
-}
-
-.post-com-count {
-	background-image: url(../images/bubble_bg-rtl.gif);
-}
-
-#user_info_arrow {
-	background: transparent url(../images/arrows.png) no-repeat 0 5px;
-}
-
-#user_info:hover #user_info_arrow,
-#user_info.active #user_info_arrow {
-	background: transparent url(../images/arrows-dark.png) no-repeat 0 5px;
-}
-
-/* editors */
-
-/* menu */
-
-#adminmenushadow,
-#adminmenuback {
-	background-image: url(../images/menu-shadow-rtl.png);
-	background-position: top left;
-}
-
-#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/arrows-dark.png) no-repeat 8px 6px;
-}
-
-#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
-#adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/arrows.png) no-repeat 8px 6px;
-}
-
-
-#adminmenu .wp-submenu .wp-submenu-head {
-	border-right-color: none;
-	border-left-color: #dfdfdf;
-}
-
-.folded #adminmenu .wp-submenu-wrap {
-	-moz-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 );
-	-webkit-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 );
-	box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 );
-}
-
-/* collapse menu button */
-#collapse-button div {
-	background-position: 0 -108px;
-}
-.folded #collapse-button div {
-	background-position: 0 -72px;
-}
-
-/* edit image */
-
-.meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/arrows.png) no-repeat 6px 7px;
-}
-
-.tablenav .tablenav-pages a {
-	border-color: #e3e3e3;
-	background: #eee url('../images/menu-bits-rtl.gif?ver=20100610') repeat-x scroll right -379px;
-}
-
-#post-body .misc-pub-section {
-	border-right-color: none;
-	border-left-color: #eee;
-}
-
-#favorite-toggle {
-	background: transparent url(../images/arrows.png) no-repeat 4px 2px;
-}
-
-#screen-meta a.show-settings,
-.toggle-arrow {
-	background: transparent url(../images/arrows.png) no-repeat left 3px;
-}
-
-#screen-meta .screen-meta-active a.show-settings {
-	background: transparent url(../images/arrows.png) no-repeat left -33px;
-}
-
-.sidebar-name-arrow {
-	background: transparent url(../images/arrows.png) no-repeat 5px 9px;
-}
-.sidebar-name:hover .sidebar-name-arrow {
-	background: transparent url(../images/arrows-dark.png) no-repeat 5px 9px;
-}
-
-
-/* custom header & background pages */
-
-/* custom header & background pages */
--- 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
--- a/wp-admin/css/dashboard-rtl.css
+++ b/wp-admin/css/dashboard-rtl.css
@@ -1 +1,62 @@
-#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{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 a{font-family:Tahoma,Arial;}#dashboard_right_now a.button{float:left;clear:left;}#dashboard_plugins .inside span{padding-left:0;padding-right:5px;}#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;}
+/* Right Now */
+#rightnow {
+	margin-right:0;
+	margin-left: 7px;
+}
+#rightnow .reallynow span {
+	text-align: right;
+	float: right;
+}
+#rightnow .reallynow a {
+	text-align: left;
+	float: left;
+	margin: 1px 0 0 6px;
+}
+/* Widgets */
+div#dashboard-widgets-wrap {
+	margin-right:0;
+	margin-left:-13px;
+}
+div.dashboard-widget-holder {
+	float:right;
+}
+div.dashboard-widget {
+	margin-right:0;
+	margin-left: 20px;
+}
+h3.dashboard-widget-title span {
+	text-align: right;
+	float: right;
+}
+h3.dashboard-widget-title small {
+	text-align: left;
+	float:left;
+}
+div.dashboard-widget-submit input  {
+	font-family: Tahoma;
+}
+div.dashboard-widget-content ul, div.dashboard-widget-content ol, div.dashboard-widget-content dl {
+	padding-left:0;
+	padding-right:15px;
+}
+#dashboard_secondary div.dashboard-widget-content ul li {
+	float:right;
+}
+#dashboard_secondary div.dashboard-widget-content ul li .post {
+	font-family:arial;
+}
+#dashboard_secondary div.dashboard-widget-content ul li a {
+	border-right:0 none;
+	border-left: 1px solid #dadada;
+	height:110px;
+}
+#dashboard_secondary div.dashboard-widget-content ul li a cite {
+	font-family: Tahoma;
+}
+#dashboard-widgets .widget_rss ul li span.rss-date {
+	float:right;
+}
+#dashboard-widgets .widget_rss ul li a {
+	float: right;
+	margin: 0 0 .2em .5em;
+}
--- a/wp-admin/css/dashboard-rtl.dev.css
+++ b/wp-admin/css/dashboard-rtl.dev.css
@@ -1,110 +0,0 @@
-#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  {
-	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 a {
-	font-family: Tahoma, Arial;
-}
-#dashboard_right_now a.button {
-	float: left;
-	clear: left;
-}
-#dashboard_plugins .inside span {
-	 padding-left: 0;
-	 padding-right: 5px;
-}
-#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
@@ -1,486 +0,0 @@
-.postbox p,
-.postbox ul,
-.postbox ol,
-.postbox blockquote,
-#wp-version-message {
-	font-size: 12px;
-}
-
-.edit-box {
-	display: none;
-}
-
-h3:hover .edit-box {
-	display: inline;
-}
-
-form .input-text-wrap {
-	background: #fff;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px 3px;
-	border-color: #ccc;
-}
-
-#dashboard-widgets form .input-text-wrap input {
-	border: 0 none;
-	outline: none;
-	margin: 0;
-	padding: 0;
-	width: 99%;
-	color: #333;
-}
-
-form .textarea-wrap {
-	background: #fff;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-	border-color: #ccc;
-}
-
-#dashboard-widgets form .textarea-wrap textarea {
-	border: 0 none;
-	padding: 0;
-	outline: none;
-	width: 99%;
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
-	box-sizing: border-box;
-}
-
-#dashboard-widgets .postbox form .submit {
-	float: none;
-	margin: .5em 0 0;
-	padding: 0;
-	border: none;
-}
-
-#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit input {
-	margin: 0;
-}
-
-#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish {
-	min-width: 0;
-}
-
-div.postbox div.inside {
-	margin: 10px 0;
-	position: relative;
-}
-
-#dashboard-widgets a {
-	text-decoration: none;
-}
-
-#dashboard-widgets h3 a {
-	text-decoration: underline;
-}
-
-#dashboard-widgets h3 .postbox-title-action {
-	position: absolute;
-	right: 30px;
-	padding: 0;
-	top: 8px;
-}
-
-#dashboard-widgets h4 {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-weight: normal;
-	font-size: 13px;
-	margin: 0 0 .2em;
-	padding: 0;
-}
-
-/* Right Now */
-
-#dashboard_right_now p.sub,
-#dashboard_right_now .table, #dashboard_right_now .versions {
-	margin: -12px;
-}
-
-#dashboard_right_now .inside {
-	font-size: 12px;
-	padding-top: 20px;
-}
-
-#dashboard_right_now p.sub {
-	padding: 5px 0 15px;
-	color: #8f8f8f;
-	font-size: 14px;
-	position: absolute;
-	top: -17px;
-	left: 15px;
-}
-
-#dashboard_right_now .table {
-	margin: 0;
-	padding: 0;
-	position: relative;
-}
-
-#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;
-}
-
-#dashboard_right_now table tr.first td {
-	border-top: none;
-}
-
-#dashboard_right_now td.b {
-	padding-right: 6px;
-	text-align: right;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-size: 14px;
-	width: 1%;
-}
-
-#dashboard_right_now td.b a {
-	font-size: 18px;
-}
-
-#dashboard_right_now td.b a:hover {
-	color: #d54e21;
-}
-
-#dashboard_right_now .t {
-	font-size: 12px;
-	padding-right: 12px;
-	padding-top: 6px;
-	color: #777;
-}
-
-#dashboard_right_now .t a {
-	white-space: nowrap;
-}
-
-#dashboard_right_now .spam {
-	color: red;
-}
-
-#dashboard_right_now .waiting {
-	color: #e66f00;
-}
-
-#dashboard_right_now .approved {
-	color: green;
-}
-
-#dashboard_right_now .versions {
-	padding: 6px 10px 12px;
-	clear: both;
-}
-
-#dashboard_right_now .versions .b {
-	font-weight: bold;
-}
-
-#dashboard_right_now a.button {
-	float: right;
-	clear: right;
-	position: relative;
-	top: -5px;
-}
-
-/* Recent Comments */
-
-#dashboard_recent_comments h3 {
-	margin-bottom: 0;
-}
-
-#dashboard_recent_comments .inside {
-	margin-top: 0;
-}
-
-#dashboard_recent_comments .comment-meta .approve {
-	font-style: italic;
-	font-family: sans-serif;
-	font-size: 10px;
-}
-
-#dashboard_recent_comments .subsubsub {
-	float: none;
-}
-
-#the-comment-list {
-	position: relative;
-}
-
-#the-comment-list .comment-item {
-	padding: 1em 10px;
-	border-top: 1px solid;
-}
-
-#the-comment-list .pingback {
-	padding-left: 9px !important;
-}
-
-#the-comment-list .comment-item,
-#the-comment-list #replyrow {
-	margin: 0 -10px;
-}
-
-#the-comment-list .comment-item:first-child {
-	border-top: none;
-}
-
-#the-comment-list .comment-item .avatar {
-	float: left;
-	margin: 0 10px 5px 0;
-}
-
-#the-comment-list .comment-item h4 {
-	line-height: 1.7em;
-	margin-top: -0.4em;
-	color: #777;
-}
-
-#the-comment-list .comment-item h4 cite {
-	font-style: normal;
-	font-weight: normal;
-}
-
-#the-comment-list .comment-item blockquote,
-#the-comment-list .comment-item blockquote p {
-	margin: 0;
-	padding: 0;
-	display: inline;
-}
-
-#dashboard_recent_comments #the-comment-list .trackback blockquote,
-#dashboard_recent_comments #the-comment-list .pingback blockquote {
-	display: block;
-}
-
-#the-comment-list .comment-item p.row-actions {
-	margin: 3px 0 0;
-	padding: 0;
-	font-size: 12px;
-}
-
-/* QuickPress */
-
-#dashboard_quick_press h4 {
-	font-family: sans-serif;
-	float: left;
-	width: 5.5em;
-	clear: both;
-	font-weight: normal;
-	text-align: right;
-	padding-top: 5px;
-	font-size: 12px;
-}
-
-#dashboard_quick_press h4 label {
-	margin-right: 10px;
-}
-
-#dashboard_quick_press .input-text-wrap,
-#dashboard_quick_press .textarea-wrap {
-	margin: 0 0 1em 5em;
-}
-
-#dashboard_quick_press #media-buttons {
-	margin: 0 0 .5em 5em;
-	padding: 0 0 0 10px;
-	font-size: 12px;
-	line-height: 17px;
-	color: #777;
-}
-
-#dashboard_quick_press #media-buttons a {
-	vertical-align: bottom;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit {
-	margin-left: 4.6em;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit input {
-	float: left;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
-	margin: 0 1em 0 10px;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit #publish {
-	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;
-	padding: 0;
-	list-style: none;
-}
-
-#dashboard_recent_drafts ul li {
-	margin-bottom: 1em;
-}
-
-#dashboard_recent_drafts h4 {
-	line-height: 1.7em;
-}
-
-#dashboard_recent_drafts h4 abbr {
-	font-weight: normal;
-	font-family: sans-serif;
-	font-size: 12px;
-	color: #999;
-	margin-left: 3px;
-}
-
-#dashboard_recent_drafts p {
-	margin: 0;
-	padding: 0;
-}
-
-/* Feeds */
-
-.rss-widget ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-a.rsswidget {
-	font-size: 13px;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	line-height: 1.7em;
-}
-
-.rss-widget ul li {
-	line-height: 1.5em;
-	margin-bottom: 12px;
-}
-
-.rss-widget span.rss-date {
-	color: #999;
-	font-size: 12px;
-	margin-left: 3px;
-}
-
-.rss-widget cite {
-	display: block;
-	text-align: right;
-	margin: 0 0 1em;
-	padding: 0;
-}
-
-.rss-widget cite:before {
-	content: '\2014';
-}
-
-/* Plugins */
-#dashboard_plugins h4 {
-	line-height: 1.7em;
-}
-#dashboard_plugins h5 {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-weight: normal;
-	font-size: 13px;
-	margin: 0;
-	display: inline;
-	line-height: 1.4em;
-}
-
-#dashboard_plugins h5 a {
-	line-height: 1.4em;
-}
-
-#dashboard_plugins .inside span {
-	font-size: 12px;
-	padding-left: 5px;
-}
-
-#dashboard_plugins p {
-	margin: 0.3em 0 1.4em;
-	line-height: 1.4em;
-}
-
-.dashboard-comment-wrap {
-	overflow: hidden;
-	word-wrap: break-word;
-}
-
-/* Browser Nag */
-#dashboard_browser_nag a.update-browser-link {
-	font-size: 1.2em;
-	font-weight: bold;
-}
-
-#dashboard_browser_nag a {
-	text-decoration: underline;
-}
-
-#dashboard_browser_nag p.browser-update-nag.has-browser-icon {
-	padding-right: 125px;
-}
-
-#dashboard_browser_nag .browser-icon {
-	margin-top: -35px;
-}
-
-#dashboard_browser_nag.postbox.browser-insecure {
-	background-color: #ac1b1b;
-	border-color: #ac1b1b;
-}
-
-#dashboard_browser_nag.postbox {
-	background-color: #e29808;
-	background-image: none;
-	border-color: #edc048;
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-	color: #fff;
-}
-
-#dashboard_browser_nag.postbox.browser-insecure h3 {
-	border-bottom-color: #cd5a5a;
-	color: #fff;
-}
-
-#dashboard_browser_nag.postbox h3 {
-	border-bottom-color: #f6e2ac;
-	text-shadow: none;
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-	background: transparent none;
-	color: #fff;
-}
-
-#dashboard_browser_nag a {
-	color: #fff;
-}
-
-#dashboard_browser_nag.browser-insecure a.browse-happy-link,
-#dashboard_browser_nag.browser-insecure a.update-browser-link {
-	text-shadow: #871b15 0 1px 0;
-}
-
-#dashboard_browser_nag a.browse-happy-link,
-#dashboard_browser_nag a.update-browser-link {
-	text-shadow: #d29a04 0 1px 0;
-}
--- a/wp-admin/css/farbtastic-rtl.css
+++ b/wp-admin/css/farbtastic-rtl.css
@@ -1,7 +0,0 @@
-.farbtastic .color, .farbtastic .overlay {
-	left: 0;
-	right: 47px;
-}
-.farbtastic .marker {
-	margin: -8px -8px 0 0;
-}
--- a/wp-admin/css/farbtastic.css
+++ b/wp-admin/css/farbtastic.css
@@ -1,32 +0,0 @@
-.farbtastic {
-  position: relative;
-}
-.farbtastic * {
-  position: absolute;
-  cursor: crosshair;
-}
-.farbtastic, .farbtastic .wheel {
-  width: 195px;
-  height: 195px;
-}
-.farbtastic .color, .farbtastic .overlay {
-  top: 47px;
-  left: 47px;
-  width: 101px;
-  height: 101px;
-}
-.farbtastic .wheel {
-  background: url(../images/wheel.png) no-repeat;
-  width: 195px;
-  height: 195px;
-}
-.farbtastic .overlay {
-  background: url(../images/mask.png) no-repeat;
-}
-.farbtastic .marker {
-  width: 17px;
-  height: 17px;
-  margin: -8px 0 0 -8px;
-  overflow: hidden;
-  background: url(../images/marker.png) no-repeat;
-}
--- a/wp-admin/css/global-rtl.css
+++ b/wp-admin/css/global-rtl.css
@@ -1 +1,31 @@
-#wpcontent{margin-left:0;margin-right:165px;}.wp-admin #footer{margin-left:15px;margin-right:165px;}.js.folded #wpcontent{margin-left:0;margin-right:52px;}.js.folded.wp-admin #footer{margin-left:15px;margin-right:52px;}#wpbody-content{float:right;}#adminmenuwrap{float:right;}#adminmenu{clear:right;}.inner-sidebar{float:left;clear:left;}.has-right-sidebar #post-body{float:right;clear:right;margin-right:0;margin-left:-340px;}.has-right-sidebar #post-body-content{margin-right:0;margin-left:300px;}#col-right{float:left;clear:left;}.alignleft{float:right;}.alignright{float:left;}.textleft{text-align:right;}.textright{text-align:left;}.screen-reader-text,.screen-reader-text span{left:auto;right:-1000em;}body,td,textarea,input,select{font-family:Tahoma,Arial,sans-serif;}ul.ul-disc,ul.ul-square,ol.ol-decimal{margin-left:0;margin-right:1.8em;}.subsubsub{float:right;}.widefat thead th:first-of-type{-moz-border-radius-topleft:0;-moz-border-radius-topright:3px;-khtml-border-top-left-radius:0;-khtml-border-top-right-radius:3px;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:3px;border-top-left-radius:0;border-top-right-radius:3px;}.widefat thead th:last-of-type{-moz-border-radius-topright:0;-moz-border-radius-topleft:3px;-khtml-border-top-right-radius:0;-khtml-border-top-left-radius:3px;-webkit-border-top-right-radius:0;-webkit-border-top-left-radius:3px;border-top-right-radius:0;border-top-left-radius:3px;}.widefat tfoot th:first-of-type{-moz-border-radius-bottomleft:0;-moz-border-radius-bottomright:3px;-khtml-border-bottom-left-radius:0;-khtml-border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:0;-webkit-border-bottom-right-radius:3px;border-bottom-left-radius:0;border-bottom-right-radius:3px;}.widefat tfoot th:last-of-type{-moz-border-radius-bottomright:0;-moz-border-radius-bottomleft:3px;-khtml-border-bottom-right-radius:0;-khtml-border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:0;-webkit-border-bottom-left-radius:3px;border-bottom-right-radius:0;border-bottom-left-radius:3px;}.widefat th{text-align:right;}.widefat th input{margin:0 8px 0 0;}.wrap{margin:0 0 0 15px;}.wrap h2,.subtitle{font-family:Tahoma,Arial,sans-serif;}.wrap h2{padding:9px 0 4px 15px;}.subtitle{padding-left:0;padding-right:25px;}.wrap .add-new-h2{font-family:Tahoma,Arial,sans-serif;margin-left:0;margin-right:4px;}.wrap h2.long-header{padding-left:0;}
+body, td {
+	font-family: Tahoma;
+}
+textarea, input, select {
+	font-family: Tahoma;
+}
+h1, h2, h3 {
+	font-family:arial;
+}
+.widefat td {
+	padding: 7px 10px 9px 15px;
+}
+.widefat th {
+	padding: 9px 10px 6px 15px;
+	text-align: right;
+}
+.widefat th input {
+	margin: 0 8px 0 0;
+}
+.widefat .check-column {
+	text-align: left;
+}
+.wrap h2 {
+	font-family:arial;
+	margin: 5px -4px 0 0;
+	padding-right:0;
+	padding-left: 280px;
+}
+.wrap h2.long-header {
+	padding-left: 0;
+}
--- a/wp-admin/css/global-rtl.dev.css
+++ b/wp-admin/css/global-rtl.dev.css
@@ -1,181 +0,0 @@
-
-/* 2 column liquid layout */
-
-#wpcontent {
-	margin-left: 0;
-	margin-right: 165px;
-}
-
-.wp-admin #footer {
-	margin-left: 15px;
-	margin-right: 165px;
-}
-
-.js.folded #wpcontent {
-	margin-left: 0;
-	margin-right: 52px;
-}
-
-.js.folded.wp-admin #footer {
-	margin-left: 15px;
-	margin-right: 52px;
-}
-
-#wpbody-content {
-	float: right;
-}
-
-#adminmenuwrap {
-	float: right;
-}
-
-#adminmenu {
-	clear: right;
-}
-
-/* inner 2 column liquid layout */
-.inner-sidebar {
-	float: left;
-	clear: left;
-}
-
-.has-right-sidebar #post-body {
-	float: right;
-	clear: right;
-	margin-right: 0;
-	margin-left: -340px;
-}
-
-.has-right-sidebar #post-body-content {
-	margin-right: 0;
-	margin-left: 300px;
-}
-
-/* 2 columns main area */
-
-#col-right {
-	float: left;
-	clear: left;
-}
-
-/* utility classes*/
-.alignleft {
-	float: right;
-}
-
-.alignright {
-	float: left;
-}
-
-.textleft {
-	text-align: right;
-}
-
-.textright {
-	text-align: left;
-}
-
-/* Hide visually but not from screen readers */
-.screen-reader-text, .screen-reader-text span {
-	left: auto;
-	right: -1000em;
-}
-
-/* styles for use by people extending the WordPress interface */
-
-body,
-td,
-textarea,
-input,
-select {
-	font-family: Tahoma, Arial, sans-serif;
-}
-
-ul.ul-disc,
-ul.ul-square,
-ol.ol-decimal {
-	margin-left: 0;
-	margin-right: 1.8em;
-}
-
-.subsubsub {
-	float: right;
-}
-
-.widefat thead th:first-of-type {
-	-moz-border-radius-topleft: 0;
-	-moz-border-radius-topright: 3px;
-	-khtml-border-top-left-radius: 0;
-	-khtml-border-top-right-radius: 3px;
-	-webkit-border-top-left-radius: 0;
-	-webkit-border-top-right-radius: 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 3px;
-}
-
-.widefat thead th:last-of-type {
-	-moz-border-radius-topright: 0;
-	-moz-border-radius-topleft: 3px;
-	-khtml-border-top-right-radius: 0;
-	-khtml-border-top-left-radius: 3px;
-	-webkit-border-top-right-radius: 0;
-	-webkit-border-top-left-radius: 3px;
-	border-top-right-radius: 0;
-	border-top-left-radius: 3px;
-}
-.widefat tfoot th:first-of-type {
-	-moz-border-radius-bottomleft: 0;
-	-moz-border-radius-bottomright: 3px;
-	-khtml-border-bottom-left-radius: 0;
-	-khtml-border-bottom-right-radius: 3px;
-	-webkit-border-bottom-left-radius: 0;
-	-webkit-border-bottom-right-radius: 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 3px;
-}
-.widefat tfoot th:last-of-type {
-	-moz-border-radius-bottomright: 0;
-	-moz-border-radius-bottomleft: 3px;
-	-khtml-border-bottom-right-radius: 0;
-	-khtml-border-bottom-left-radius: 3px;
-	-webkit-border-bottom-right-radius: 0;
-	-webkit-border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 3px;
-}
-
-.widefat th {
-	text-align: right;
-}
-
-.widefat th input {
-	margin: 0 8px 0 0;
-}
-
-.wrap {
-	margin: 0 0 0 15px;
-}
-
-
-.wrap h2,
-.subtitle {
-	font-family: Tahoma, Arial, sans-serif;
-}
-.wrap h2 {
-	padding: 9px 0 4px 15px;
-}
-
-.subtitle {
-	padding-left: 0;
-	padding-right: 25px;
-}
-
-.wrap .add-new-h2 {
-	font-family: Tahoma, Arial, sans-serif;
-	margin-left: 0;
-	margin-right: 4px;
-}
-
-.wrap h2.long-header {
-	padding-left: 0;
-}
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
--- a/wp-admin/css/global.dev.css
+++ b/wp-admin/css/global.dev.css
@@ -1,607 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ */
-/* v1.0 | 20080212 */
-
-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;
-/*	font-size: 100%;
-	vertical-align: baseline; */
-	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;
-}
-
-/* remember to define focus styles! */
-/*
-:focus {
-	outline: 0;
-}
-*/
-/* remember to highlight inserts somehow! */
-ins {
-	text-decoration: none;
-}
-del {
-	text-decoration: line-through;
-}
-
-/* tables still need 'cellspacing="0"' in the markup */
-/*
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-*/
-/* end reset css */
-
-
-/* 2 column liquid layout */
-#wpwrap {
-	height: auto;
-	min-height: 100%;
-	width: 100%;
-	position: relative;
-}
-
-#wpcontent {
-	height: 100%;
-}
-
-#wpcontent,
-#footer {
-	margin-left: 165px;
-}
-
-#wpbody-content {
-	padding-bottom: 65px;
-}
-
-.js.folded #wpcontent,
-.js.folded #footer {
-	margin-left: 52px;
-}
-
-#wpbody-content {
-	float: left;
-	width: 100%;
-}
-
-#adminmenuback,
-#adminmenuwrap,
-#adminmenu,
-.js.folded #adminmenu .wp-submenu.sub-open,
-.js.folded #adminmenu .wp-submenu-wrap {
-	width: 145px;
-}
-
-#adminmenuback {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	z-index: -1;
-}
-
-#adminmenuwrap {
-	float: left;
-}
-
-#adminmenu {
-	clear: left;
-	padding: 0;
-	list-style: none;
-}
-
-.js.folded #adminmenuback,
-.js.folded #adminmenuwrap,
-.js.folded #adminmenu,
-.js.folded #adminmenu li.menu-top {
-	width: 32px;
-}
-
-#footer {
-	position: relative;
-}
-
-/* inner 2 column liquid layout */
-.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;
-}
-
-/* 2 columns main area */
-
-#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%;
-}
-
-/* utility classes */
-.alignleft {
-	float: left;
-}
-
-.alignright {
-	float: right;
-}
-
-.textleft {
-	text-align: left;
-}
-
-.textright {
-	text-align: right;
-}
-
-.clear {
-	clear: both;
-}
-
-/* Hide visually but not from screen readers */
-.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;
-}
-
-/* include margin and padding in the width calculation of input and textarea */
-input[type="text"],
-input[type="password"],
-textarea {
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
-	-ms-box-sizing: border-box; /* ie8 only */
-	box-sizing: border-box;
-}
-
-input[type="checkbox"],
-input[type="radio"] {
-	vertical-align: middle;
-}
-
-/* styles for use by people extending the WordPress interface */
-html,
-body {
-	height: 100%;
-}
-
-body,
-td,
-textarea,
-input,
-select {
-	font-family: 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: 0.83em;
-  font-weight: bold;
-  margin: 1.67em 0;
-}
-
-h6 {
-  display: block;
-  font-size: 0.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 0.5em;
-}
-
-.subsubsub {
-	list-style: none;
-	margin: 8px 0 5px;
-	padding: 0;
-	white-space: nowrap;
-	font-size: 12px;
-	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: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.widefat * {
-	word-wrap: break-word;
-}
-
-.widefat a {
-	text-decoration: none;
-}
-
-.widefat thead th:first-of-type {
-	-moz-border-radius-topleft: 3px;
-	-khtml-border-top-left-radius: 3px;
-	-webkit-border-top-left-radius: 3px;
-	border-top-left-radius: 3px;
-}
-.widefat thead th:last-of-type {
-	-moz-border-radius-topright: 3px;
-	-khtml-border-top-right-radius: 3px;
-	-webkit-border-top-right-radius: 3px;
-	border-top-right-radius: 3px;
-}
-.widefat tfoot th:first-of-type {
-	-moz-border-radius-bottomleft: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	border-bottom-left-radius: 3px;
-}
-.widefat tfoot th:last-of-type {
-	-moz-border-radius-bottomright: 3px;
-	-khtml-border-bottom-right-radius: 3px;
-	-webkit-border-bottom-right-radius: 3px;
-	border-bottom-right-radius: 3px;
-}
-
-.widefat td,
-.widefat th {
-	border-width: 1px 0;
-	border-style: solid;
-}
-.widefat tfoot th {
-	border-bottom: none;
-}
-
-.widefat .no-items td {
-	border-bottom-width: 0;
-}
-
-.widefat td {
-	font-size: 12px;
-	padding: 4px 7px 2px;
-	vertical-align: top;
-}
-
-.widefat td p,
-.widefat td ol,
-.widefat td ul {
-	font-size: 12px;
-}
-
-.widefat th {
-	padding: 7px 7px 8px;
-	text-align: left;
-	line-height: 1.3em;
-	font-size: 14px;
-}
-
-.widefat th input {
-	margin: 0 0 0 8px;
-	padding: 0;
-	vertical-align: text-top;
-}
-
-.widefat .check-column {
-	width: 2.2em;
-	padding: 11px 0 0;
-	vertical-align: top;
-}
-
-.widefat tbody th.check-column {
-	padding: 9px 0 22px;
-}
-
-.widefat .num,
-.column-comments,
-.column-links,
-.column-posts {
-	text-align: center;
-}
-
-.widefat th#comments {
-	vertical-align: middle;
-}
-
-.wrap {
-	margin: 0 15px 0 0;
-}
-
-div.updated,
-div.error {
-	border-width: 1px;
-	border-style: solid;
-	padding: 0 0.6em;
-	margin: 5px 15px 2px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-div.updated p,
-div.error p {
-	margin: 0.5em 0;
-	padding: 2px;
-}
-
-.wrap div.updated,
-.wrap div.error {
-	margin: 5px 0 15px;
-}
-
-.wrap h2,
-.subtitle {
-	font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
-	font-weight: normal;
-	margin: 0;
-	text-shadow: rgba(255,255,255,1) 0 1px 0;
-}
-.wrap h2 {
-	font-size: 23px;
-	padding: 9px 15px 4px 0;
-	line-height: 29px;
-}
-.subtitle {
-	font-size: 14px;
-	padding-left: 25px;
-}
-.wrap .add-new-h2 {
-	font-family: sans-serif;
-	margin-left: 4px;
-	padding: 3px 8px;
-	position: relative;
-	top: -3px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	text-decoration: none;
-	font-size: 12px;
-}
-
-.wrap h2.long-header {
-	padding-right: 0;
-}
-
-
-/* =CSS 3 transitions
-------------------------------------------------------------- */
-.fade-1000 {
-	opacity: 0;
-	-moz-transition-property: opacity;
-	-moz-transition-duration: 1s;
-	-webkit-transition-property: opacity;
-	-webkit-transition-duration: 1s;
-	-o-transition-property: opacity;
-	-o-transition-duration: 1s;
-	transition-property: opacity;
-	transition-duration: 1s;
-}
-
-.fade-600 {
-	opacity: 0;
-	-moz-transition-property: opacity;
-	-moz-transition-duration: 0.6s;
-	-webkit-transition-property: opacity;
-	-webkit-transition-duration: 0.6s;
-	-o-transition-property: opacity;
-	-o-transition-duration: 0.6s;
-	transition-property: opacity;
-	transition-duration: 0.6s;
-}
-
-.fade-400 {
-	opacity: 0;
-	-moz-transition-property: opacity;
-	-moz-transition-duration: 0.4s;
-	-webkit-transition-property: opacity;
-	-webkit-transition-duration: 0.4s;
-	-o-transition-property: opacity;
-	-o-transition-duration: 0.4s;
-	transition-property: opacity;
-	transition-duration: 0.4s;
-}
-
-.fade-300 {
-	opacity: 0;
-	-moz-transition-property: opacity;
-	-moz-transition-duration: 0.3s;
-	-webkit-transition-property: opacity;
-	-webkit-transition-duration: 0.3s;
-	-o-transition-property: opacity;
-	-o-transition-duration: 0.3s;
-	transition-property: opacity;
-	transition-duration: 0.3s;
-}
-
-.fade-trigger {
-	opacity: 1;
-}
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -1 +1,73 @@
-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;}
+#poststuff .postbox h3 {
+	padding-left:0;
+	padding-right: 23px;
+}
+* html #poststuff .postarea, * html #poststuff #titlediv {
+	margin-left:0;
+	margin-right: 3%;
+}
+* html #poststuff h2 {
+	margin-right: 0;
+}
+#bh {
+	padding-right:0;
+	padding-left: 15px;
+}
+div#dashboard-widgets {
+	padding-right:0;
+	padding-left: 1px;
+}
+#tagchecklist span a {
+	margin: 4px -9px 0 0;
+}
+#poststuff .togbox {
+	margin-left:0;
+	margin-right: -19px;
+}
+.widefat th input {
+	margin: 0 5px 0 0;
+}
+/* ---------- add by navid */
+#dashmenu { /* fix top right bottom in admin */
+	direction:ltr;
+}
+#sidemenu a { /* fix left admin buttom ex. plugins, options */
+	float:left;
+}
+.wrap h2 {
+	margin:5px 4px 0 0;
+}
+#editor-toolbar {/* fix hover in media uploader icon */
+	direction:ltr;
+}
+#TB_window { /* fix theme preview */
+	left:2%;
+}
+/* fix widget page */
+form#widgets-filter {
+	position:static;
+}
+#widget-search {
+	display:none;
+}
+/* fix manage comment page */
+ul.view-switch li {
+	float:left;
+}
+form#posts-filter {
+	position:static;
+}
+#post-search {
+	display:none;
+}
+#submenu {
+	margin-right: 20px;
+}
+/* Fixes for media-upload window */
+/* Center media-upload panel on screen */
+#TB_window { 
+	width: 670px; 
+	position: absolute; 
+	top: 50%; 
+	left: 50%; 
+	margin-right: 335px !important; }
--- a/wp-admin/css/ie-rtl.dev.css
+++ b/wp-admin/css/ie-rtl.dev.css
@@ -1,156 +0,0 @@
-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
@@ -1,494 +0,0 @@
-/* Fixes for IE bugs */
-
-#wp-fullscreen-title {
-	width: 97%;
-}
-
-#wp_mce_fullscreen_ifr {
-	background-color: #f9f9f9;
-}
-
-#wp-fullscreen-tagline {
-	color: #888;
-	font-size: 14px;
-}
-
-#adminmenuback {
-	left: 0;
-}
-
-#adminmenu li.wp-menu-separator,
-#adminmenu li.wp-menu-separator-last {
-	font-size: 1px;
-	line-height: 1;
-}
-
-#adminmenu a.menu-top {
-	border-bottom: 0 none;
-	border-top: 1px solid #ddd;
-}
-
-#adminmenu .separator {
-	font-size: 1px;
-	line-height: 1px;
-}
-
-#wpbody-content input.button,
-#wpbody-content input.button-primary,
-#wpbody-content input.button-secondary,
-#wpbody-content input.button-highlighted {
-	overflow: visible;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit #publish {
-	float: none;
-}
-
-#dashboard-widgets h3 a {
-	height: 14px;
-	line-height: 14px;
-}
-
-.tablenav-pages .current-page {
-	vertical-align: middle;
-}
-
-#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;
-}
-
-.js.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,
-#template,
-#template div,
-#editcat,
-#addcat,
-* html .stuffbox h3  {
-	zoom: 100%;
-}
-
-#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
-	padding: 3px 4px 4px 10px;
-	zoom: 100%;
-}
-
-.js.folded #adminmenu .menu-top {
-	height: 30px;
-}
-
-.js.folded #adminmenu .wp-submenu {
-	margin: -1px 0 0 0;
-}
-
-.wp-menu-arrow {
-	height: 28px;
-}
-
-.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 */
-
-* html .row-actions {
-	visibility: visible;
-}
-
-#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-top: 2px;
-	padding-bottom: 2px;
-}
-
-.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,
-#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 +1,27 @@
-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;}
+body {
+	font-family: Tahoma;
+}
+/* Half the page disapears on IE6 */
+* html body {
+	width: 700px; 
+	position: absolute; 
+	left: 50%; 
+	margin-right: 350px;
+}
+ul, ol {
+	padding: 5px 22px 5px 5px;
+}
+.step, th {
+	text-align:right;
+}
+.submit input, .button, .button-secondary  {
+	font-family: Tahoma;
+	margin-right:0;
+}
+.form-table th {
+	text-align:right;
+}
+h1 {
+	font-family:arial;
+	margin: 5px -4px 0 0;
+}
--- a/wp-admin/css/install-rtl.dev.css
+++ b/wp-admin/css/install-rtl.dev.css
@@ -1,23 +0,0 @@
-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,142 @@
-html{background:#f9f9f9;}body{background:#fff;color:#333;font-family: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: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:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.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,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;display:none;}#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;}
+html { background: #f1f1f1; }
+
+body {
+	background: #fff;
+	color: #333;
+	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+	margin: 2em auto 0 auto;
+	width: 700px;
+	padding: 1em 2em;
+	-moz-border-radius: 12px;
+	-khtml-border-radius: 12px;
+	-webkit-border-radius: 12px;
+	border-radius: 12px;
+}
+
+a { color: #2583ad; text-decoration: none; }
+
+a:hover { color: #d54e21; }
+
+
+h1 {
+	font-size: 18px;
+	margin-bottom: 0;
+}
+
+h2 { font-size: 16px; }
+
+p, li {
+	padding-bottom: 2px;
+	font-size: 13px;
+	line-height: 18px;
+}
+
+code {
+	font-size: 13px;
+}
+
+ul, ol { padding: 5px 5px 5px 22px; }
+
+#logo { margin: 6px 0 14px 0px; border-bottom: none;}
+
+.step {
+	margin: 20px 0 15px;
+}
+
+.step input {
+	font-size: 18px;
+}
+
+a.button {
+	font-size: 18px;
+}
+
+.step, th { text-align: left; padding: 0; }
+
+.submit input, .button, .button-secondary {
+	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+	padding: 5px 7px 7px;
+	border: 1px solid #a3a3a3;
+	margin-left: 0;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	color: #246;
+	background: #e5e5e5;
+}
+
+.button-secondary {
+	background: #cee1ef;
+}
+
+.submit input:hover, .button:hover, .button-secondary:hover {
+	color: #d54e21;
+	border-color: #535353;
+}
+
+.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: #eaf3fa;
+}
+
+.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;
+}
+
+h1 {
+	border-bottom: 1px solid #dadada;
+	clear: both;
+	color: #666666;
+	font: 24px Georgia, "Times New Roman", Times, serif;
+	margin: 5px 0 0 -4px;
+	padding: 0;
+	padding-bottom: 7px;
+}
+
+#error-page {
+	margin-top: 50px;
+}
+
+#error-page p {
+	font-size: 14px;
+	line-height: 16px;
+	margin: 25px 0 20px;
+}
+
+#error-page code {
+	font-size: 15px;
+}
--- a/wp-admin/css/install.dev.css
+++ b/wp-admin/css/install.dev.css
@@ -1,213 +0,0 @@
-html {
-	background: #f9f9f9;
-}
-
-body {
-	background: #fff;
-	color: #333;
-	font-family: 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: 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: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.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, 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;
-	display: none;
-}
-
-#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 +1,37 @@
-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;}
+body {
+	font-family: Tahoma;
+}
+form {
+	margin-left:0;
+	margin-right: 8px;
+}
+form .forgetmenot {
+	float:right;
+}
+#login form .submit input  {
+	font-family: Tahoma;
+}
+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-right:0;
+	margin-left: 6px;
+}
+h1 a {
+	text-decoration:none;
+}
+/* ltr input */
+#user_login, #user_pass {
+	direction:ltr;
+}
--- a/wp-admin/css/login-rtl.dev.css
+++ b/wp-admin/css/login-rtl.dev.css
@@ -1,29 +0,0 @@
-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,74 @@
-*{margin:0;padding:0;}html{background:#fbfbfb!important;}body{padding-top:30px;font-family:sans-serif;font-size:12px;}form{margin-left:8px;padding:26px 24px 46px;font-weight:normal;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background:#fff;border:1px solid #e5e5e5;-moz-box-shadow:rgba(200,200,200,0.7) 0 4px 10px -1px;-webkit-box-shadow:rgba(200,200,200,0.7) 0 4px 10px -1px;-khtml-box-shadow:rgba(200,200,200,0.7) 0 4px 10px -1px;box-shadow:rgba(200,200,200,0.7) 0 4px 10px -1px;}form .forgetmenot{font-weight:normal;float:left;margin-bottom:0;}.button-primary{font-family:sans-serif;padding:3px 10px;border:none;font-size:13px;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:14px;}form .forgetmenot label{font-size:12px;line-height:19px;}form .submit,.alignright{float:right;}form p{margin-bottom:24px;}h1 a{background:url(../images/logo-login.png) no-repeat top center;width:326px;height:67px;text-indent:-9999px;overflow:hidden;padding-bottom:15px;display:block;}#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,#backtoblog{text-shadow:rgba(255,255,255,1) 0 1px 0;margin:0 0 0 16px;padding:16px 16px 0;}#backtoblog{padding:12px 16px 0;}body form .input{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",sans-serif;font-weight:200;font-size:24px;width:97%;padding:3px;margin-top:2px;margin-right:6px;margin-bottom:16px;border:1px solid #e5e5e5;background:#fbfbfb;outline:none;-moz-box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);-webkit-box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);}input{color:#555;}.clear{clear:both;}#pass-strength-result{font-weight:bold;border-style:solid;border-width:1px;margin:12px 0 6px;padding:6px 5px;text-align:center;}
+* { margin: 0; padding: 0; }
+
+body {
+	border-top-width: 30px;
+	border-top-style: solid;
+	font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+}
+
+form {
+	margin-left: 8px;
+	padding: 16px 16px 40px 16px;
+	font-weight: bold;
+	-moz-border-radius: 5px;
+	-khtml-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0;}
+
+#login form .submit input {
+	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+	padding: 3px 5px;
+	border: none;
+	font-size: 13px;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	cursor: default;
+	text-decoration: none;	
+	margin-top: -6px;
+}
+
+form .submit { float: right; }
+
+form p { margin-bottom: 24px; }
+
+h1 a {
+	background: url(../images/logo-login.gif) no-repeat;
+	width: 292px;
+	height: 66px;
+	text-indent: -9999px;
+	overflow: hidden;
+	padding-bottom: 15px;
+	display: block;
+}
+
+#backtoblog a {
+	position: absolute;
+	top: 7px;
+	left: 15px;
+	text-decoration: none;
+}
+
+#login { width: 292px; margin: 7em auto; }
+
+#login_error, .message {
+	margin: 0 0 16px 8px;
+	border-width: 1px;
+	border-style: solid;
+	padding: 12px;
+}
+
+#nav { margin: 0 0 0 8px; padding: 16px; }
+
+#user_pass, #user_login, #user_email {
+	font-size: 20px;
+	width: 97%;
+	padding: 3px;
+	margin-right: 6px;
+}
--- a/wp-admin/css/login.dev.css
+++ b/wp-admin/css/login.dev.css
@@ -1,144 +0,0 @@
-* { margin: 0; padding: 0; }
-
-html {
-	background: #fbfbfb !important;
-}
-
-body {
-	padding-top: 30px;
-	font-family: sans-serif;
-	font-size: 12px;
-}
-
-form {
-	margin-left: 8px;
-	padding: 26px 24px 46px;
-	font-weight: normal;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	background: #fff;
-	border: 1px solid #e5e5e5;
-	-moz-box-shadow: rgba(200, 200, 200, 0.7) 0px 4px 10px -1px;
-	-webkit-box-shadow: rgba(200, 200, 200, 0.7) 0px 4px 10px -1px;
-	-khtml-box-shadow: rgba(200, 200, 200, 0.7) 0px 4px 10px -1px;
-	box-shadow: rgba(200, 200, 200, 0.7) 0px 4px 10px -1px;
-}
-
-form .forgetmenot {
-	font-weight: normal;
-	float: left;
-	margin-bottom: 0;
-}
-
-.button-primary {
-	font-family: sans-serif;
-	padding: 3px 10px;
-	border: none;
-	font-size: 13px;
-	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: 14px;
-}
-
-form .forgetmenot label {
-	font-size: 12px;
-	line-height: 19px;
-}
-
-form .submit,
-.alignright {
-	float: right;
-}
-
-form p {
-	margin-bottom: 24px;
-}
-
-h1 a {
-	background: url(../images/logo-login.png) no-repeat top center;
-	width: 326px;
-	height: 67px;
-	text-indent: -9999px;
-	overflow: hidden;
-	padding-bottom: 15px;
-	display: block;
-}
-
-#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,
-#backtoblog {
-	text-shadow: rgba(255,255,255,1) 0 1px 0;
-	margin: 0 0 0 16px;
-	padding: 16px 16px 0;
-}
-#backtoblog {
-	padding: 12px 16px 0;
-}
-
-body form .input {
-	font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
-	font-weight: 200;
-	font-size: 24px;
-	width: 97%;
-	padding: 3px;
-	margin-top: 2px;
-	margin-right: 6px;
-	margin-bottom: 16px;
-	border: 1px solid #e5e5e5;
-	background: #fbfbfb;
-	outline: none;
-	-moz-box-shadow: inset 1px 1px 2px rgba(200, 200, 200, 0.2);
-	-webkit-box-shadow: inset 1px 1px 2px rgba(200, 200, 200, 0.2);
-	box-shadow: inset 1px 1px 2px rgba(200, 200, 200, 0.2);
-}
-
-input {
-	color: #555;
-}
-
-.clear {
-	clear: both;
-}
-
-#pass-strength-result {
-	font-weight: bold;
-	border-style: solid;
-	border-width: 1px;
-	margin: 12px 0 6px;
-	padding: 6px 5px;
-	text-align: center;
-}
-
--- a/wp-admin/css/media-rtl.css
+++ b/wp-admin/css/media-rtl.css
@@ -1 +1,66 @@
-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;}.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;}#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;}#sort-buttons{margin:3px 0 -8px 25px;text-align:left;}#sort-buttons #asc,#sort-buttons #showall{padding-left:0;padding-right:5px;}#sort-buttons span{margin-right:0;margin-left:25px;}
+body#media-upload ul#sidemenu {
+	left:auto;
+	right:0;
+	width: 620px;
+}
+#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 label {
+	margin: 0 0 0 1em;
+}
+.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;
+}
+.bar {
+	border-right-width:0;
+	border-left-width: 3px;
+	border-left-style: solid;
+}
+.media-item .pinkynail {
+	float:right;
+}
+.describe-toggle-on, .describe-toggle-off {
+	float: left;
+	margin-right:0;
+	margin-left: 20px;
+}
+/* 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;
+}
--- a/wp-admin/css/media-rtl.dev.css
+++ b/wp-admin/css/media-rtl.dev.css
@@ -1,92 +0,0 @@
-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;
-}
-.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;
-}
-#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;
-}
-#sort-buttons {
-	margin: 3px 0 -8px 25px;
-	text-align: left;
-}
-
-#sort-buttons #asc,
-#sort-buttons #showall {
-	padding-left: 0;
-	padding-right: 5px;
-}
-
-#sort-buttons span {
-	margin-right: 0;
-	margin-left: 25px;
-}
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -1 +1,315 @@
-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: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,.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: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;}
+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: 0px;
+	bottom: -1px;
+}
+
+div#media-upload-error {
+	margin: 1em;
+	font-weight: bold;
+}
+
+form {
+	margin: 1em;
+}
+
+#search-filter {
+	text-align: right;
+}
+
+.media-upload-form label, .media-upload-form legend {
+	display:block;
+	font-weight: bold;
+	font-size: 13px;
+	margin-bottom: 0.5em;
+	margin: 0 0 0.5em 0;
+}
+
+th { position: relative; }
+
+.media-upload-form label.form-help, td.help {
+	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;
+}
+
+/* specific to the image upload form */
+.align .field label {
+	display: inline;
+	padding: 0 0 0 28px;
+	margin: 0 1em 0 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;
+}
+
+#flash-upload-ui, .insert-gallery {
+	display: none;
+}
+
+tr.image-size label {
+	display: inline;
+	margin: 0 1em 0 0;
+}
+.pinkynail {
+	max-width: 40px;
+	max-height: 40px;
+}
+
+.filename.original {
+	float: left;
+}
+.crunching {
+	display: block;
+	line-height: 32px;
+	text-align: right;
+	margin-right: 5px;
+}
+button.dismiss {
+	position: absolute;
+	top: 5px;
+	right: 5px;
+	z-index: 4;
+}
+.file-error {
+	margin: 0 0 5px 50px;
+	font-weight: bold;
+}
+
+.progress {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	width: 623px;
+	height: 36px;
+}
+.bar {
+	width: 0px;
+	height: 100%;
+	border-right-width: 3px;
+	border-right-style: solid;
+}
+
+#library-form .progress, #gallery-form .progress {
+	display: none;
+}
+
+.media-item .thumbnail {
+	max-width: 128px;
+	max-height: 128px;
+}
+.media-item .pinkynail {
+	float: left;
+	margin: 2px;
+	height: 32px;
+	max-width: 40px;
+}
+
+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;
+}
+
+.describe.startopen, .describe.startclosed {
+	display: none;
+}
+abbr.required {
+	text-decoration: none;
+	border: none;
+}
+.describe label {
+	display: inline;
+}
+.describe td {
+	vertical-align: middle;
+}
+.describe td.A1 {
+	width: 132px;
+}
+.describe input[type="text"], .describe textarea {
+	width: 460px;
+}
+.describe-toggle-on, .describe-toggle-off {
+	display: block;
+	line-height: 36px;
+	float: right;
+	margin-right: 20px;
+}
+.describe-toggle-off {
+	display: none;
+}
+
+.clickmask {
+}
+
+.hidden {
+	height: 0px;
+	width: 0px;
+	overflow: hidden;
+	border: none;
+}
+
+/* Specific to Uploader */
+
+#media-upload .media-upload-form p {
+	margin: 0 1em 1em 0;
+}
+
+#media-upload .media-upload-form p.ml-submit {
+	padding: 1em 0;
+}
+
+#media-upload p.help {
+	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 {
+	position: relative;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	min-height: 36px;
+	width: 100%;
+}
+
+#media-upload .ui-sortable .media-item {
+	cursor: move;
+}
+
+.filename {
+	float: left;
+	line-height: 36px;
+	margin-left: 10px;
+	overflow: hidden;
+	max-width: 430px;
+}
+#media-upload .describe {
+	border-top-width: 1px;
+	border-top-style: solid;
+	padding: 5px;
+	width: 100%;
+	clear: both;
+	cursor: default;
+}
+#media-upload .describe th.label {
+	padding-top: .5em;
+	text-align: left;
+}
+#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;
+}
+
+#media-upload a.delete,
+#media-upload a.del-link {
+	padding: 0 3px 1px;
+}
+
+#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 #DDDDDD;
+	font-size: 10px;
+	padding: 1px;
+	width: 23px;
+}
+
+.ui-sortable-helper {
+	background-color: #fff;
+	border: 1px solid #aaa;
+	opacity: 0.6;
+	filter: alpha(opacity=60);
+}
+
+#media-upload th.order-head {
+	 width: 25%;
+	 text-align: center;
+}
+
+#media-upload .widefat {
+	width: 626px;
+	border-style: solid solid none;
+}
+
+.sorthelper {
+	z-index: -1;
+}
--- a/wp-admin/css/media.dev.css
+++ b/wp-admin/css/media.dev.css
@@ -1,382 +0,0 @@
-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: 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;
-}
-
-/* specific to the image upload form */
-
-
-.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,
-.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;
-}
-
-/* Specific to Uploader */
-
-#media-upload p.ml-submit {
-	padding: 1em 0;
-}
-
-#media-upload p.help,
-#media-upload label.help {
-	font-family: 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: 0.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: 0.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/ms.css
+++ b/wp-admin/css/ms.css
@@ -1 +0,0 @@
-#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;padding-left:16px;position:static;}.rtl #dashboard_right_now p.musub{padding-left:0;padding-right:16px;}#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;}.wp-list-table .site-deleted{background:#ff8573;}.wp-list-table .site-spammed{background:#faafaa;}.wp-list-table .site-archived{background:#ffebe8;}.wp-list-table .site-mature{background:#fecac2;}
--- a/wp-admin/css/ms.dev.css
+++ b/wp-admin/css/ms.dev.css
@@ -1,38 +0,0 @@
-/* Dashboard: MS Specific Data */
-#dashboard_right_now p.musub {
-	margin-top: 12px;
-	border-top: 1px solid #ececec;
-	padding-left: 16px;
-	position: static;
-}
-
-.rtl #dashboard_right_now p.musub {
-	padding-left: 0;
-	padding-right: 16px;
-}
-
-#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;
-}
-
-/* Background Color for Site Status */
-.wp-list-table .site-deleted {
-	background: #ff8573;
-}
-.wp-list-table .site-spammed {
-	background: #faafaa;
-}
-.wp-list-table .site-archived {
-	background: #ffebe8;
-}
-.wp-list-table .site-mature {
-	background: #fecac2;
-}
--- a/wp-admin/css/nav-menu-rtl.css
+++ b/wp-admin/css/nav-menu-rtl.css
@@ -1 +0,0 @@
-#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;font-family:Tahoma,Arial,sans-serif;}#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-left:0;margin-right:20px;}.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:3px 3px 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{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
@@ -1,210 +0,0 @@
-#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;
-		font-family: Tahoma, Arial, sans-serif;
-	}
-
-#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-left: 0;
-	margin-right: 20px;
-}
-
-/* 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: 3px 3px 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 {
-	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
@@ -1,705 +0,0 @@
-/**
- * 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;
-}
-
-.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 {
-	border: 1px solid;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	border-radius: 3px;
-	margin-bottom: 20px;
-}
-
-#post-body {
-	padding: 10px;
-	border-width: 1px 0;
-	border-style: solid;
-}
-
-#nav-menu-header,
-#nav-menu-footer {
-	padding: 0 10px;
-}
-
-#nav-menu-header {
-	border-bottom: 1px solid;
-}
-
-#nav-menu-footer {
-	border-top: 1px solid;
-}
-
-#post-body div.updated, #post-body div.error {
-	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:hover{
-}
-
-#menu-management .nav-tabs-arrow a:active {
-}
-
-#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;
-	font-size: 14px;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-}
-
-
-#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 {
-	font-style: italic;
-}
-
-#menu-management .inside {
-	padding: 0 10px;
-}
-
-/* Add Menu Item Boxes */
-.postbox .howto input {
-	width: 180px;
-	float: right;
-}
-
-.customlinkdiv .howto input {
-	width: 200px;
-}
-
-#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: 12px;
-	margin: 4px 0;
-	line-height: 15px;
-}
-
-.meta-sep {
-	padding: 0 2px;
-}
-
-#cancel-save {
-	text-decoration: underline;
-	font-size: 12px;
-	margin-left: 20px;
-	margin-top: 5px;
-}
-
-/* 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: 12px;
-}
-
-#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;
-	-moz-border-radius: 3px;
-}
-
-.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 #dfdfdf;
-	position: relative;
-	padding-left: 10px;
-	height: auto;
-	width: 400px;
-	line-height: 35px;
-	text-shadow: 0 1px 0 #FFFFFF;
-	overflow: hidden;
-	word-wrap: break-word;
-	border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-}
-
-#menu-to-edit .menu-item-invalid .menu-item-handle {
-	background-color: #f6c9cc; /* Fallback */
-	background-image: -ms-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* IE10 */
-	background-image: -moz-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* Firefox */
-	background-image: -o-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* Opera */
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#f6c9cc), to(#fdf8ff)); /* old Webkit  */
-	background-image: -webkit-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* new Webkit */
-	background-image: linear-gradient(bottom, #f6c9cc, #fdf8ff); /* proposed W3C Markup */
-}
-
-.menu-item-edit-active .menu-item-handle {
-	-moz-border-radius: 3px 3px 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-image: none;
-	text-shadow: 0 0 0;
-}
-
-.menu-item-handle .item-title {
-	font-size: 12px;
-	font-weight: bold;
-	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 {
-	font-size: 12px;
-	padding-right: 10px;
-}
-
-.item-controls {
-	font-size: 12px;
-	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 {
-}
-
-.item-edit {
-	position: absolute;
-	right: -20px;
-	top: 0;
-	display: block;
-	width:30px;
-	height: 36px;
-	overflow: hidden;
-	text-indent:-999em;
-	border-bottom: 1px solid;
-	-moz-border-radius-bottomleft: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	border-bottom-left-radius: 3px;
-}
-
-.item-edit:hover {
-}
-
-/* Menu editing */
-.menu-instructions-inactive {
-	display: none;
-}
-
-.menu-item-settings {
-	display:block;
-	width: 400px;
-	padding: 10px 0 10px 10px;
-	border: solid;
-	border-width: 0 1px 1px 1px;
-	-moz-border-radius: 0 0 3px 3px;
-	-webkit-border-bottom-right-radius: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-right-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-}
-
-.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: 12px;
-	font-style: italic;
-	border: 1px solid;
-	border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-}
-
-.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 {
-}
-
-#update-menu-item {
-}
-
-#update-menu-item:hover,
-#update-menu-item:active,
-#update-menu-item:focus {
-}
-
-/* Major/minor publishing actions (classes) */
-.major-publishing-actions {
-	clear:both;
-	padding: 3px 0 5px;
-}
-
-.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: 12px;
-	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 {
-	border-bottom: 1px solid;
-	padding: 1px 2px;
-	text-decoration: none;
-}
-
-.submitbox .submitcancel:hover {
-}
-
-.major-publishing-actions .form-invalid {
-	padding-left: 4px;
-	margin-left: -4px;
-	border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-}
-
-/* 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 +0,0 @@
-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
@@ -1,43 +0,0 @@
-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 +0,0 @@
-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;}#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
@@ -1,150 +0,0 @@
-/* NOTE: the following CSS rules(.star*) are taken more or less straight from the bbPress rating plugin. */
-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;
-}
-
-/* Header on thickbox */
-#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;
-}
-
-/* Install sidemenu */
-#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: 0.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/press-this-ie-rtl.css
+++ b/wp-admin/css/press-this-ie-rtl.css
@@ -0,0 +1,3 @@
+.ui-tabs-nav {
+ 	margin-right: 0;
+}
--- a/wp-admin/css/press-this-ie.css
+++ b/wp-admin/css/press-this-ie.css
@@ -0,0 +1,7 @@
+#posting {
+ 	position: static !important;
+}
+ .ui-tabs-nav {
+ 	margin-left: 0;
+ 	border: 0 !important;
+}
--- a/wp-admin/css/press-this-rtl.css
+++ b/wp-admin/css/press-this-rtl.css
@@ -1 +1,98 @@
-body{font-family:Tahoma,Arial;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{float:left;}#poststuff #edButtonHTML{margin-left:15px;margin-right:5px;}#header-logo,#wphead h1{float:right;}div#poststuff{padding-left:0;padding-right:10px;}.posting{margin-left:212px;margin-right:0;position:relative;}#side-info-column{float:left;right:auto;left:0;}h3.tb{margin-left:0;margin-right:5px;}#publish{float:left;}.postbox .handlediv{float:left;}.actions{float:left;}.actions li{float:right;margin-right:0;margin-left:10px;}#extra-fields .actions{margin:-23px 0 0 -7px;}#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;}.category-tabs li{padding-left:0;padding-right:8px;}#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;}
+body {
+	font-family: Tahoma;
+}
+.ui-tabs-nav {
+	padding-left:0;
+	padding-right:8px;
+}
+.ui-tabs-nav li {
+	float: right;
+}
+.button {
+	font-family: Tahoma;
+	margin-left:0;
+	margin-right: 5px;
+}
+#wphead #viewsite {
+	margin-left:0;
+	margin-right: 10px;
+}
+#viewsite {
+	right:auto;
+	left: 8px;
+}
+#wphead #viewsite a {
+	font-family: Tahoma;
+}
+h1 {
+	right:auto;
+	left:0;
+}
+div#posting {
+	padding-left:0;
+	padding-right: 16px;
+}
+#photo_directions span {
+	right:auto;
+	left:3px;
+}
+#img_container a {
+	float:right;
+}
+#img_container a, #img_container a:link, #img_container a:visited {
+	margin:0 0 4px 4px;
+}
+div#categories {
+	right:auto;
+	left:16px;
+}
+div#categories h2 {
+	margin: .5em 1em .5em 0;
+}
+#tagsdiv #newtag {
+	margin-right:0;	
+	margin-left: 5px;	
+}
+#jaxtag {
+	padding-left:0;
+	padding-right: 1em;
+}
+#tagchecklist {
+	padding-left:0;
+	padding-right: 1em;
+}
+#tagchecklist span {
+	margin-right: 10px;
+	margin-left: .5em;
+	float: right;
+}
+#tagchecklist span a {
+	margin: 6px -9px 0pt 0;
+	float: right;
+}
+.submitbox {
+	float: left;
+}
+.submitbox .submit input {
+	text-align:right;
+}
+.video_split #extra_fields {
+	float:right;
+}
+.video_split .editor_area {
+	float: left;
+}
+.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
@@ -1,140 +0,0 @@
-body {
-	font-family: Tahoma, Arial;
-}
-
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
-	float: left;
-}
-
-#poststuff #edButtonHTML {
-	margin-left: 15px;
-	margin-right: 5px;
-}
-
-#header-logo,
-#wphead h1 {
-	float: right;
-}
-
-/* Editor/Main Column */
-div#poststuff {
-	padding-left: 0;
-	padding-right: 10px;
-}
-
-.posting {
-	margin-left: 212px;
-	margin-right: 0;
-	position: relative;
-}
-
-#side-info-column {
-	float: left;
-	right: auto;
-	left: 0;
-}
-
-h3.tb {
-	margin-left: 0;
-	margin-right: 5px;
-}
-
-#publish {
-	float: left;
-}
-
-.postbox .handlediv {
-	float: left;
-}
-
-.actions {
-	float: left;
-}
-
-.actions li {
-	float: right;
-	margin-right: 0;
-	margin-left: 10px;
-}
-
-#extra-fields .actions {
-    margin: -23px 0 0 -7px;
-}
-
-/* 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;
-}
-
-/* Categories */
-.category-tabs li {
-	padding-left: 0;
-	padding-right: 8px;
-}
-
-/* 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,678 +0,0 @@
-body {
-	font-size: 13px;
-	font-family: sans-serif;
-	color: #333;
-	margin: 0;
-	padding: 0;
-	min-width: 675px;
-	min-height: 400px;
-}
-
-img {
-	border: none;
-}
-
-/* Header */
-#wphead {
-	height: 32px;
-	margin-right: 5px;
-	margin-bottom: 5px;
-}
-
-#header-logo {
-	float: left;
-	margin: 7px 7px 0;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	user-select: none;
-}
-
-#wphead h1 {
-	font: normal 16px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	padding: 6px 0 0;
-	margin: 0;
-	float: left;
-}
-
-#wphead h1 a {
-	text-decoration: none;
-}
-#wphead h1 a:hover {
-	text-decoration: underline;
-}
-
-.tagchecklist span a {
-	background: transparent url(../images/xit.gif) no-repeat 0 0;
-}
-
-#edButtonPreview,
-#edButtonHTML {
-	height: 18px;
-	margin: 5px 5px 0 0;
-	padding: 4px 5px 2px;
-	float: right;
-	cursor: pointer;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 3px 3px 0 0;
-	-webkit-border-top-right-radius: 3px;
-	-webkit-border-top-left-radius: 3px;
-	-khtml-border-top-right-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	border-top-right-radius: 3px;
-	border-top-left-radius: 3px;
-}
-
-#poststuff #edButtonHTML {
-	margin-right: 15px;
-}
-
-#media-buttons {
-	cursor: default;
-	padding: 8px 8px 0;
-}
-
-#media-buttons a {
-	cursor: pointer;
-	padding: 0 0 5px 10px;
-}
-
-#media-buttons img,
-#submitpost #ajax-loading,
-#submitpost .ajax-loading {
-	vertical-align: middle;
-}
-
-.howto {
-	margin-top: 2px;
-	margin-bottom: 3px;
-	font-size: 12px;
-	font-style: italic;
-	display: block;
-}
-
-input.text {
-	outline-color: -moz-use-text-color;
-	outline-style: none;
-	outline-width: medium;
-	width: 100%;
-}
-
-#message {
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-/* Editor/Main Column */
-div#poststuff {
-	margin: 0 10px 10px;
-}
-
-#poststuff #editor-toolbar {
-	height: 30px;
-}
-
-div.zerosize {
-	border: 0 none;
-	height: 0;
-	margin: 0;
-	overflow: hidden;
-	padding: 0;
-	width: 0;
-}
-
-.posting {
-	margin-right: 212px;
-	position: relative;
-}
-
-#side-info-column {
-	float: right;
-	width: 200px;
-	position: relative;
-	right: 0;
-}
-
-#side-info-column .sleeve {
-	padding-top: 5px;
-}
-
-#poststuff .inside {
-	font-size: 12px;
-	margin: 8px;
-}
-
-#submitdiv .inside {
-	margin: 0;
-}
-
-#submitdiv .inside p {
-	padding: 5px 8px;
-	margin: 0;
-}
-
-#submitdiv #publishing-actions {
-	padding-left: 6px;
-	border-bottom: 1px solid #dfdfdf;
-	-webkit-box-shadow: 0 1px 0 #fff;
-	-moz-box-shadow: 0 1px 0 #fff;
-	box-shadow: 0 1px 0 #fff;
-}
-
-#publish {
-	float: right;
-}
-
-#poststuff h2,#poststuff h3 {
-	font-size: 13px;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-weight: normal;
-	line-height: 1;
-	margin: 0;
-	padding: 7px 9px;
-	border-width: 0 0 1px 0;
-	border-style: solid;
-}
-
-#poststuff h2 {
-	border-color: #dfdfdf;
-}
-
-#tagsdiv-post_tag h3,
-#categorydiv h3 {
-	cursor: pointer;
-}
-
-h3.tb {
-	text-shadow: 0 1px 0 #fff;
-	font-weight: bold;
-	font-size: 12px;
-	margin-left: 5px;
-}
-
-#TB_window {
-	border: 1px solid #333;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.postbox,
-.stuffbox {
-	margin-bottom: 10px;
-	border-width: 1px;
-	border-style: solid;
-	line-height: 1;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.postbox:hover .handlediv,
-.stuffbox:hover .handlediv {
-	background: transparent url(../images/arrows.png) no-repeat 6px 7px;
-}
-
-.postbox .handlediv {
-	float: right;
-	width: 27px;
-	height: 30px;
-	cursor: pointer;
-}
-
-#title,
-.tbtitle {
-	font-family: sans-serif;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	font-size: 1.7em;
-	outline: none;
-	padding: 3px 4px;
-	border-color: #dfdfdf;
-}
-
-.tbtitle {
-	font-size: 12px;
-	padding: 3px;
-}
-
-#title {
-	width: 97%;
-}
-
-.editor-container {
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	border: 1px solid #ccc;
-	background-color: #fff;
-}
-
-.actions {
-	float: right;
-	margin: -19px 0 0;
-}
-
-#extra-fields .actions {
-	margin: -23px -7px 0 0;
-}
-
-.actions li {
-	float: left;
-	list-style: none;
-	margin-right: 10px;
-}
-
-#extra-fields .button {
-	margin-right: 5px;
-	padding: 3px 6px;
-	border-radius: 10px;
-	-webkit-border-radius: 10px;
-	-khtml-border-radius: 10px;
-	-moz-border-radius: 10px;
-}
-
-/* Photo Styles */
-#photo_saving {
-	margin: 0 8px 8px;
-	vertical-align: middle;
-}
-
-#img_container_container {
-	overflow: auto;
-}
-
-#extra-fields {
-	margin-top: 10px;
-	position: relative;
-}
-
-#waiting {
-	margin-top: 10px;
-}
-
-#extra-fields .postbox {
-	margin-bottom: 5px;
-}
-
-#extra-fields .titlewrap {
-	padding: 0;
-	overflow: auto;
-	height: 100px;
-}
-
-#img_container a {
-	display: block;
-	float: left;
-	overflow: hidden;
-	vertical-align: center;
-}
-
-#img_container img,
-#img_container a {
-	width: 68px;
-	height: 68px;
-}
-
-#img_container img {
-	border: none;
-	background-color: #f4f4f4;
-	cursor: pointer;
-}
-
-#img_container a,
-#img_container a:link,
-#img_container a:visited {
-	border: 1px solid #ccc;
-	display: block;
-	position: relative;
-}
-
-#img_container a:hover,
-#img_container a:active {
-	border-color: #000;
-	z-index: 1000;
-	border-width: 2px;
-	margin: -1px;
-}
-
-/* Video */
-#embed-code {
-	width: 100%;
-	height: 98px;
-}
-
-/* Submit Column */
-.wp-hidden-children
-.wp-hidden-child {
-	display: none;
-}
-
-/* Categories */
-
-.category-add input {
-	width: 94%;
-	font-family: sans-serif;
-	font-size: 12px;
-	margin: 1px;
-}
-
-select {
-	width: 100%;
-	-x-system-font: none;
-	border-style: solid;
-	border-width: 1px;
-	font-family: sans-serif;
-	font-size: 12px;
-	height: 2em;
-	line-height: 20px;
-	padding: 2px;
-	margin: 1px;
-	vertical-align: top;
-}
-
-.category-add input.category-add-sumbit {
-	width: auto;
-}
-
-.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;
-}
-
-.inline-editor ul.cat-checklist ul,
-.categorydiv ul.categorychecklist ul,
-#linkcategorydiv ul.categorychecklist ul {
-	margin-left: 18px;
-}
-
-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: 5px;
-}
-
-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;
-}
-
-.tagsdiv .newtag {
-	margin-right: 5px;
-}
-
-.jaxtag {
-	clear: both;
-	margin: 0;
-}
-
-.tagadd {
-	margin-left: 3px;
-}
-
-.tagchecklist {
-	margin-top: 3px;
-	margin-bottom: 1em;
-	font-size: 12px;
-	overflow: auto;
-}
-
-.tagchecklist strong {
-	position: absolute;
-	font-size: .75em;
-}
-
-.tagchecklist span {
-	margin-right: .5em;
-	margin-left: 10px;
-	display: block;
-	float: left;
-	font-size: 12px;
-	line-height: 1.8em;
-	white-space: nowrap;
-	cursor: default;
-}
-
-.tagchecklist span a {
-	margin: 6px 0 0 -9px;
-	cursor: pointer;
-	width: 10px;
-	height: 10px;
-	display: block;
-	float: left;
-	text-indent: -9999px;
-	overflow: hidden;
-	position: absolute;
-}
-
-#content {
-	margin: 5px 0;
-	padding: 0 5px;
-	border: 0 none;
-	height: 365px;
-	width: 97% !important;
-	font-family: Consolas, Monaco, monospace;
-	font-size: 13px;
-	line-height: 19px;
-	background: transparent;
-}
-
-* html .postdivrich {
-	zoom: 1;
-}
-
-/* Submit */
-#saving {
-	display: inline;
-	vertical-align: middle;
-}
-
-.submit input,
-.button,
-.button-primary,
-.button-secondary,
-.button-highlighted,
-#postcustomstuff .submit input {
-	font-family: sans-serif;
-	text-decoration: none;
-	font-size: 12px !important;
-	line-height: 16px;
-	padding: 2px 8px;
-	margin: 2px;
-	cursor: pointer;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 11px;
-	-khtml-border-radius: 11px;
-	-webkit-border-radius: 11px;
-	border-radius: 11px;
-}
-
-.button-primary {
-	background: #21759B url(../images/button-grad.png) repeat-x scroll left top;
-	border-color: #21759B;
-	color: #fff;
-}
-
-.ac_results {
-	padding: 0;
-	margin: 0;
-	list-style: none;
-	position: absolute;
-	z-index: 10000;
-	display: none;
-	border-width: 1px;
-	border-style: solid;
-}
-
-.ac_results li {
-	padding: 2px 5px;
-	white-space: nowrap;
-	text-align: left;
-}
-
-.ac_over {
-	cursor: pointer;
-}
-
-.ac_match {
-	text-decoration: underline;
-}
-
-#TB_ajaxContent #options {
-	position: absolute;
-	top: 20px;
-	right: 25px;
-	padding: 5px;
-}
-
-#TB_ajaxContent h3 {
-	margin-bottom: .25em;
-}
-
-.updated {
-	margin: 10px 0;
-	padding: 0;
-	border-width: 1px;
-	border-style: solid;
-	width: 99%;
-}
-
-.updated p,
-.error p {
-	margin: 0.6em 0;
-	padding: 0 0.6em;
-}
-
-.error a {
-	text-decoration: underline;
-}
-
-.updated a {
-	text-decoration: none;
-	padding-bottom: 2px;
-}
-
-#post_status {
-	margin-left: 10px;
-	margin-bottom: 1em;
-	display: block;
-}
-
-/* Footer */
-#footer {
-	height: 65px;
-	display: block;
-	width: 640px;
-	padding: 10px 0 0 60px;
-	margin: 0;
-	position: absolute;
-	bottom: 0;
-	font-size: 12px;
-}
-
-#footer p {
-	margin: 0;
-	padding: 7px 0;
-}
-
-#footer p a {
-	text-decoration: none;
-}
-
-#footer p a:hover {
-	text-decoration: underline;
-}
-
-/* Utility Classes */
-.centered {
-	text-align: center;
-}
-
-.hidden {
-	display: none;
-}
-
-.postbox input[type="text"],
-.postbox textarea,
-.stuffbox input[type="text"],
-.stuffbox textarea {
-	border-width: 1px;
-	border-style: solid;
-}
-
-/* tag hints */
-.taghint {
-	color: #aaa;
-	margin: -17px 0 0 7px;
-	visibility: hidden;
-}
-
-input.newtag ~ div.taghint {
-	visibility: visible;
-}
-
-input.newtag:focus ~ div.taghint {
-	visibility: hidden;
-}
-
-/* TinyMCE */
-#mce_fullscreen_container {
-	background: #fff;
-}
--- a/wp-admin/css/theme-editor-rtl.css
+++ b/wp-admin/css/theme-editor-rtl.css
@@ -1 +1,15 @@
-#templateside{float: left;}
+#template textarea {
+	font-family:monospace;
+}
+#templateside {
+	float:left;
+}
+#themeselector {
+	padding-right:0;
+	padding-left: 5px;
+	float: left;
+}
+div.tablenav {
+	margin-right:0;
+	margin-left: 210px;
+}
--- a/wp-admin/css/theme-editor-rtl.dev.css
+++ b/wp-admin/css/theme-editor-rtl.dev.css
@@ -1,3 +0,0 @@
-#templateside {
-	float: left;
-}
--- a/wp-admin/css/theme-editor.css
+++ b/wp-admin/css/theme-editor.css
@@ -1 +1,66 @@
-.alignleft h3{margin:0;}h3 span{font-weight:normal;}#template textarea{font-family:Consolas,Monaco,monospace;font-size:12px;width:97%;background:#f9f9f9;outline:none;}#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:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}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: 'Courier New', Courier, monospace;
+	font-size: 12px;
+	width: 97%;
+}
+
+#template p {
+	width: 97%;
+}
+
+#templateside {
+	float: right;
+	width: 190px;
+	margin-top:-3.4em;
+}
+
+#templateside h3, #postcustomstuff p.submit {
+	margin: 0;
+}
+
+h3#bordertitle {
+	margin-bottom: 10px;
+}
+
+#templateside h4 {
+	margin-bottom: 0px;
+}
+
+#templateside ol, #templateside ul {
+	list-style: none;
+	margin: .5em;
+	padding: 0;
+}
+
+#templateside ol li, #templateside ul li {
+	margin: 1px 0px;
+}
+
+#themeselector {
+	padding-right: 5px;
+	float: right;
+	position: relative;
+	bottom: 25px;
+}
+
+#themeselector select {
+	margin: 0;
+	padding: 0;
+}
+
+.nonessential {
+	font-size: small;
+}
+
+.highlight {
+	padding: 1px;
+}
+
+div.bordertitle h2 {
+	border: none;
+	padding-bottom: 0px;
+}
+
+div.tablenav {
+	margin-right: 210px;
+}
--- a/wp-admin/css/theme-editor.dev.css
+++ b/wp-admin/css/theme-editor.dev.css
@@ -1,82 +0,0 @@
-.alignleft h3 {
-	margin: 0;
-}
-
-h3 span {
-	font-weight: normal;
-}
-
-#template textarea {
-	font-family: Consolas, Monaco, monospace;
-	font-size: 12px;
-	width: 97%;
-	background: #f9f9f9;
-	outline: none;
-}
-
-#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: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-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-install-rtl.css
+++ b/wp-admin/css/theme-install-rtl.css
@@ -1 +0,0 @@
-div.star{left:auto;right:0;}.star img,div.star a,div.star a:hover,div.star a:visited{right:auto;left:0;}.theme-listing .theme-item h3{font-style:normal;}#theme-information .theme-preview-img{float:right;margin:5px 15px 10px 25px;}#theme-information .action-button #cancel{float:right;}#theme-information .action-button #install{float:left;}.feature-filter .feature-group{float:right;}.feature-filter .feature-name{float:right;text-align:left;}.feature-filter .feature-group li{float:right;padding-right:0;padding-left:25px;}
--- a/wp-admin/css/theme-install-rtl.dev.css
+++ b/wp-admin/css/theme-install-rtl.dev.css
@@ -1,41 +0,0 @@
-div.star {
-	left:auto;
-	right: 0;
-}
-
-.star img, div.star a, div.star a:hover, div.star a:visited {
-	right: auto;
-	left: 0;
-}
-
-.theme-listing .theme-item h3 {
-	font-style: normal;
-}
-
-#theme-information .theme-preview-img {
-	float: right;
-	margin: 5px 15px 10px 25px;
-}
-
-#theme-information .action-button #cancel {
-	float: right;
-}
-
-#theme-information .action-button #install {
-	float: left;
-}
-
-.feature-filter .feature-group {
-	float: right;
-}
-
-.feature-filter .feature-name {
-	float: right;
-	text-align: left;
-}
-
-.feature-filter .feature-group li {
-	float: right;
-	padding-right: 0;
-	padding-left: 25px;
-}
--- a/wp-admin/css/theme-install.css
+++ b/wp-admin/css/theme-install.css
@@ -1 +0,0 @@
-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:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;border-width:1px;border-style:solid;padding:8px 12px 0;}.feature-filter .feature-group{float:left;margin-bottom:20px;width:725px;}.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;}.feature-container{width:100%;overflow:auto;margin-bottom:10px;}.feature-group{margin-bottom:0!important;}
--- a/wp-admin/css/theme-install.dev.css
+++ b/wp-admin/css/theme-install.dev.css
@@ -1,155 +0,0 @@
-/* NOTE: the following CSS rules(.star*) are taken more or less straight from the bbPress rating plugin. */
-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: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-	padding: 8px 12px 0;
-}
-
-.feature-filter .feature-group {
-	float: left;
-	margin-bottom: 20px;
-	width: 725px;
-}
-
-.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;
-}
-
-.feature-container {
-width: 100%;
-overflow: auto;
-margin-bottom: 10px;
-}
-
-.feature-group {
-	margin-bottom: 0px !important;
-}
--- a/wp-admin/css/upload-rtl.css
+++ b/wp-admin/css/upload-rtl.css
@@ -0,0 +1,12 @@
+html {
+	direction: ltr;
+	}
+#uploadoptions, table {
+	direction: rtl;
+	}
+td {
+	padding: 1px 6px 0;
+	}
+.submit {
+	text-align: left;
+	}
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -1 +1,45 @@
-div.widget-liquid-left{float:right;clear:right;margin-right:0;margin-left:-325px;}div#widgets-left{margin-right:5px;margin-left:325px;}div.widget-liquid-right{float:left;clear:left;}#wp_inactive_widgets .widget{float:right;}div.sidebar-name h3{font-family:Tahoma,Arial,sans-serif;}#widget-list .widget{float:right;}#wp_inactive_widgets .widget-placeholder{float:right;}.widget-top .widget-title-action{float:left;}.widget-control-edit{padding:0 0 0 8px;}.sidebar-name-arrow{float:left;}
+/* 2 column liquid layout */
+div.widget-liquid-left-holder {
+	float: right;
+	clear: right;
+	margin-right:0;
+	margin-left: -310px;
+}
+div.widget-liquid-left {
+	margin-right:0;
+	margin-left: 320px;
+}
+div.widget-liquid-right {
+	float: left;
+	clear: left;
+}
+p#widget-search {
+	right:auto;
+	left:0;
+}
+h4.widget-title span {
+	float: right;
+}
+h4.widget-title a {
+	float: left;
+	margin-left:0;
+	margin-right: 1em;
+}
+ul#widget-list li.widget-list-item h4.widget-title {
+	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;
+}
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
+	right:auto;
+	left: 1em;
+}
--- a/wp-admin/css/widgets-rtl.dev.css
+++ b/wp-admin/css/widgets-rtl.dev.css
@@ -1,47 +0,0 @@
-/* 2 column liquid layout */
-div.widget-liquid-left {
-	float: right;
-	clear: right;
-	margin-right: 0;
-	margin-left: -325px;
-}
-
-div#widgets-left {
-	margin-right: 5px;
-	margin-left: 325px;
-}
-
-div.widget-liquid-right {
-	float: left;
-	clear: left;
-}
-
-#wp_inactive_widgets .widget {
-	float: right;
-}
-
-div.sidebar-name h3 {
-	font-family: Tahoma, Arial, sans-serif;
-}
-
-#widget-list .widget {
-	float: right;
-}
-
-#wp_inactive_widgets .widget-placeholder {
-	float: right;
-}
-
-.widget-top .widget-title-action {
-	float: left;
-}
-
-.widget-control-edit {
-	padding: 0 0 0 8px;
-}
-
-
-.sidebar-name-arrow {
-	float: left;
-}
-
--- 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
@@ -1,382 +0,0 @@
-html,
-body {
-	min-width: 950px;
-}
-
-/* 2 column liquid layout */
-div.widget-liquid-left {
-	float: left;
-	clear: left;
-	width: 100%;
-	margin-right: -325px;
-}
-
-div#widgets-left {
-	margin-left: 5px;
-	margin-right: 325px;
-}
-
-div#widgets-right {
-	width: 285px;
-	margin: 0 auto;
-}
-
-div.widget-liquid-right {
-	float: right;
-	clear: right;
-	width: 300px;
-}
-
-.widget-liquid-right .widget,
-#wp_inactive_widgets .widget,
-.widget-liquid-right .sidebar-description {
-	width: 250px;
-	margin: 0 auto 20px;
-	overflow: hidden;
-}
-
-.widget-liquid-right .sidebar-description {
-	margin-bottom: 10px;
-}
-
-#wp_inactive_widgets .widget {
-	margin: 0 10px 20px;
-	float: left;
-}
-
-div.sidebar-name h3 {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-weight: normal;
-	font-size: 15px;
-	margin: 0;
-	padding: 8px 10px;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-div.sidebar-name {
-	cursor: pointer;
-	font-size: 13px;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius-topleft: 3px;
-	-moz-border-radius-topright: 3px;
-	-webkit-border-top-right-radius: 3px;
-	-webkit-border-top-left-radius: 3px;
-	-khtml-border-top-right-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	border-top-right-radius: 3px;
-	border-top-left-radius: 3px;
-}
-
-.js .closed .sidebar-name {
-	-moz-border-radius-bottomleft: 3px;
-	-moz-border-radius-bottomright: 3px;
-	-webkit-border-bottom-right-radius: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-right-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-	border-bottom-left-radius: 3px;
-}
-
-.widget-liquid-right .widgets-sortables,
-#widgets-left .widget-holder {
-	border-width: 0 1px 1px;
-	border-style: none solid solid;
-    -moz-border-radius-bottomleft: 3px;
-	-moz-border-radius-bottomright: 3px;
-	-webkit-border-bottom-right-radius: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-right-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-	border-bottom-left-radius: 3px;
-}
-
-.js .closed .widgets-sortables,
-.js .closed .widget-holder {
-	display: none;
-}
-
-.widget-liquid-right .widgets-sortables {
-	padding: 15px 0 0;
-}
-
-#available-widgets .widget-holder {
-	padding: 7px 5px 0;
-}
-
-#available-widgets .widget {
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-
-#wp_inactive_widgets {
-	padding: 5px 5px 0;
-}
-
-#widget-list .widget {
-	width: 250px;
-	margin: 0 10px 15px;
-	border: 0 none;
-	background: transparent;
-	float: left;
-}
-
-#widget-list .widget-description {
-	padding: 5px 8px;
-}
-
-#widget-list .widget-top {
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.widget-placeholder {
-	border-width: 1px;
-	border-style: dashed;
-	margin: 0 auto 20px;
-	height: 26px;
-	width: 250px;
-}
-
-#wp_inactive_widgets .widget-placeholder {
-	margin: 0 10px 20px;
-	float: left;
-}
-
-div.widgets-holder-wrap {
-	padding: 0;
-	margin: 10px 0 20px;
-}
-
-#widgets-left #available-widgets {
-	background-color: transparent;
-	border: 0 none;
-}
-
-ul#widget-list {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	min-height: 100px;
-}
-
-.widget .widget-top {
-	margin-bottom: -1px;
-	font-size: 12px;
-	font-weight: bold;
-	height: 26px;
-	overflow: hidden;
-}
-
-.widget-top .widget-title {
-	padding: 7px 9px;
-}
-
-.widget-top .widget-title-action {
-	float: right;
-}
-
-a.widget-action {
-	display: block;
-	width: 24px;
-	height: 26px;
-}
-
-#available-widgets a.widget-action {
-	display: none;
-}
-
-.widget-top a.widget-action {
-	background: transparent url(../images/arrows.png) no-repeat 4px 6px;
-}
-
-.widget-top a.widget-action:hover {
-	background: transparent url(../images/arrows-dark.png) no-repeat 4px 6px;
-}
-
-.widget .widget-inside,
-.widget .widget-description {
-	padding: 12px 12px 10px;
-	font-size: 12px;
-	line-height: 16px;
-}
-
-.widget-inside,
-.widget-description {
-	display: none;
-}
-
-#available-widgets .widget-description {
-	display: block;
-}
-
-.widget .widget-inside p {
-	margin: 0 0 1em;
-	padding: 0;
-}
-
-.widget-title h4 {
-	margin: 0;
-	line-height: 1;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.widgets-sortables {
-	min-height: 90px;
-}
-
-.widget-control-actions {
-	margin-top: 8px;
-}
-
-.widget-control-actions a {
-	text-decoration: none;
-}
-
-.widget-control-actions a:hover {
-	text-decoration: underline;
-}
-
-.widget-control-actions .ajax-feedback {
-	padding-bottom: 3px;
-}
-
-.widget-control-actions div.alignleft {
-	margin-top: 6px;
-}
-
-div#sidebar-info {
-	padding: 0 1em;
-	margin-bottom: 1em;
-	font-size: 12px;
-}
-
-.widget-title a,
-.widget-title a:hover {
-	text-decoration: none;
-	border-bottom: none;
-}
-
-.widget-control-edit {
-	display: block;
-	font-size: 12px;
-	font-weight: normal;
-	line-height: 26px;
-	padding: 0 8px 0 0;
-}
-
-a.widget-control-edit {
-	text-decoration: none;
-}
-
-.widget-control-edit .add,
-.widget-control-edit .edit {
-	display: none;
-}
-
-#available-widgets .widget-control-edit .add,
-#widgets-right .widget-control-edit .edit,
-#wp_inactive_widgets .widget-control-edit .edit {
-	display: inline;
-}
-
-.editwidget {
-	margin: 0 auto 15px;
-}
-
-.editwidget .widget-inside {
-	display: block;
-	border-width: 1px;
-	border-style: solid;
-	padding: 10px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.inactive p.description {
-	margin: 5px 15px 8px;
-}
-
-#available-widgets p.description {
-	margin: 0 12px 12px;
-}
-
-.widget-position {
-	margin-top: 8px;
-}
-
-.inactive {
-	padding-top: 2px;
-}
-
-.sidebar-name-arrow {
-	float: right;
-	height: 29px;
-	width: 26px;
-}
-
-.widget-title .in-widget-title {
-	font-size: 12px;
-	white-space: nowrap;
-}
-
-#removing-widget {
-	display: none;
-	font-weight: normal;
-	padding-left: 15px;
-	font-size: 12px;
-	line-height: 1;
-}
-
-.widget-control-noform,
-#access-off,
-.widgets_access .widget-action,
-.widgets_access .sidebar-name-arrow,
-.widgets_access #access-on,
-.widgets_access .widget-holder .description {
-	display: none;
-}
-
-.widgets_access .widget-holder,
-.widgets_access #widget-list {
-	padding-top: 10px;
-}
-
-.widgets_access #access-off {
-	display: inline;
-}
-
-.widgets_access #wpbody-content .widget-title-action,
-.widgets_access #wpbody-content .widget-control-edit,
-.widgets_access .closed .widgets-sortables,
-.widgets_access .closed .widget-holder {
-	display: block;
-}
-
-.widgets_access .closed .sidebar-name {
-	-moz-border-radius-bottomleft: 0;
-	-moz-border-radius-bottomright: 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;
-}
-
-.widgets_access .sidebar-name,
-.widgets_access .widget .widget-top {
-	cursor: default;
-}
-
--- 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
--- 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
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -1,361 +0,0 @@
-<?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 3.0.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 the page menu hook.
-	 *
-	 * @var string
-	 * @since 3.0.0
-	 * @access private
-	 */
-	var $page = '';
-
-	/**
-	 * 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 __construct($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_Screen" 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'); ?>
-<?php submit_button( __( 'Remove Background Image' ), 'button', 'remove-background', false ); ?><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'); ?>
-<?php submit_button( __( 'Restore Original Image' ), 'button', 'reset-background', false ); ?><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') ?>
-<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
-</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'); ?></label>
-	<label><input type="radio" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile'); ?></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'); ?></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'); ?></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>
-<?php $show_clear = get_background_color() ? '' : ' style="display:none"'; ?>
-<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> <span <?php echo $show_clear; ?>class="hide-if-no-js" id="clearcolor"> (<a href="#"><?php _e( 'Clear' ); ?></a>)</span>
-<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'); ?>
-<?php submit_button( null, 'primary', 'save-background-options' ); ?>
-</form>
-
-</div>
-<?php
-	}
-
-	/**
-	 * Handle an 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,
-			'context' => 'custom-background'
-		);
-
-		// Save the data
-		$id = wp_insert_attachment($object, $file);
-
-		// Add the meta-data
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-		update_post_meta( $id, '_wp_attachment_is_custom_background', get_option('stylesheet' ) );
-
-		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
@@ -1,639 +1,238 @@
 <?php
-/**
- * The custom header image script.
- *
- * @package WordPress
- * @subpackage Administration
- */

-/**
- * The custom header image class.
- *
- * @since 2.1.0
- * @package WordPress
- * @subpackage Administration
- */
 class Custom_Image_Header {
-
-	/**
-	 * Callback for administration header.
-	 *
-	 * @var callback
-	 * @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 custom headers uploaded by the user
-	 *
-	 * @var array
-	 * @since 3.2.0
-	 * @access private
-	 */
-	var $uploaded_headers = array();
-
-	/**
-	 * Holds the page menu hook.
-	 *
-	 * @var string
-	 * @since 3.0.0
-	 * @access private
-	 */
-	var $page = '';
-
-	/**
-	 * Constructor - Register administration header callback.
-	 *
-	 * @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 __construct($admin_header_callback, $admin_image_div_callback = '') {
+	function Custom_Image_Header($admin_header_callback) {
 		$this->admin_header_callback = $admin_header_callback;
-		$this->admin_image_div_callback = $admin_image_div_callback;
 	}

-	/**
-	 * Set up the hooks for the Custom Header admin page.
-	 *
-	 * @since 2.1.0
-	 */
 	function init() {
-		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'));
+		$page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', '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_Screen" 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 2.6.0
-	 *
-	 * @return int Current step
-	 */
 	function step() {
-		if ( ! isset( $_GET['step'] ) )
-			return 1;
-
-		$step = (int) $_GET['step'];
+		$step = (int) @$_GET['step'];
 		if ( $step < 1 || 3 < $step )
 			$step = 1;
-
 		return $step;
 	}

-	/**
-	 * Set up the enqueue for the JavaScript files.
-	 *
-	 * @since 2.1.0
-	 */
 	function js_includes() {
 		$step = $this->step();
-
-		if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
-			wp_enqueue_script('farbtastic');
-		elseif ( 2 == $step )
-			wp_enqueue_script('imgareaselect');
+		if ( 1 == $step )
+			wp_enqueue_script('colorpicker');
+		elseif ( 2 == $step )	
+			wp_enqueue_script('cropper');
 	}

-	/**
-	 * Set up the enqueue for the CSS files
-	 *
-	 * @since 2.7
-	 */
-	function css_includes() {
-		$step = $this->step();
-
-		if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
-			wp_enqueue_style('farbtastic');
-		elseif ( 2 == $step )
-			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 2.6.0
-	 */
 	function take_action() {
-		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', 'remove-header' );
-			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' );
+		if ( isset( $_POST['textcolor'] ) ) {
+			check_admin_referer('custom-header');
+			if ( 'blank' == $_POST['textcolor'] ) {
+				set_theme_mod('header_textcolor', 'blank');
 			} else {
-				$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
+				$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['textcolor']);
 				if ( strlen($color) == 6 || strlen($color) == 3 )
 					set_theme_mod('header_textcolor', $color);
 			}
 		}
-
-		if ( isset( $_POST['default-header'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			if ( 'random-default-image' == $_POST['default-header'] ) {
-				set_theme_mod( 'header_image', 'random-default-image' );
-			} elseif ( 'random-uploaded-image' == $_POST['default-header'] ) {
-				set_theme_mod( 'header_image', 'random-uploaded-image' );
-			} else {
-				$this->process_default_headers();
-				$uploaded = get_uploaded_header_images();
-				if ( isset( $uploaded[$_POST['default-header']] ) )
-					set_theme_mod( 'header_image', esc_url( $uploaded[$_POST['default-header']]['url'] ) );
-				elseif ( isset( $this->default_headers[$_POST['default-header']] ) )
-					set_theme_mod( 'header_image', esc_url( $this->default_headers[$_POST['default-header']]['url'] ) );
-			}
+		if ( isset($_POST['resetheader']) ) {
+			check_admin_referer('custom-header');
+			remove_theme_mods();
 		}
 	}

-	/**
-	 * 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.
-	 *
-	 * Show the random image option if this theme has multiple header images.
-	 * Random image option is on by default if no header has been set.
-	 *
-	 * @since 3.0.0
-	 */
-	function show_header_selector( $type = 'default' ) {
-		if ( 'default' == $type ) {
-			$headers = $this->default_headers;
-		} else {
-			$headers = get_uploaded_header_images();
-			$type = 'uploaded';
-		}
-
-		if ( 1 < count( $headers ) ) {
-			echo '<div class="random-header">';
-			echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked( is_random_header_image( $type ), true, false ) . ' />';
-			echo __( '<strong>Random:</strong> Show a different image on each page.' );
-			echo '</label>';
-			echo '</div>';
-		}
-
-		echo '<div class="available-headers">';
-		foreach ( $headers as $header_key => $header ) {
-			$header_thumbnail = $header['thumbnail_url'];
-			$header_url = $header['url'];
-			$header_desc = empty( $header['description'] ) ? '' : $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 ) . ' />';
-			$width = '';
-			if ( !empty( $header['uploaded'] ) )
-				$width = ' width="230"';
-			echo '<img src="' . $header_thumbnail . '" alt="' . esc_attr( $header_desc ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
-			echo '</div>';
-		}
-		echo '<div class="clear"></div></div>';
-	}
-
-	/**
-	 * Execute Javascript depending on step.
-	 *
-	 * @since 2.1.0
-	 */
 	function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
+		if ( 1 == $step )
 			$this->js_1();
 		elseif ( 2 == $step )
 			$this->js_2();
 	}

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

 	function pickColor(color) {
-		jQuery('#name').css('color', color);
-		jQuery('#desc').css('color', color);
-		jQuery('#text-color').val(color);
-		farbtastic.setColor(color);
+		$('name').style.color = color;
+		$('desc').style.color = color;
+		$('textcolor').value = 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);
+	function PopupWindow_hidePopup(magicword) {
+		if ( magicword != 'prettyplease' )
+			return false;
+		if (this.divName != null) {
+			if (this.use_gebi) {
+				document.getElementById(this.divName).style.visibility = "hidden";
+			}
+			else if (this.use_css) {
+				document.all[this.divName].style.visibility = "hidden";
+			}
+			else if (this.use_layers) {
+				document.layers[this.divName].visibility = "hidden";
+			}
+		}
+		else {
+			if (this.popupWindow && !this.popupWindow.closed) {
+				this.popupWindow.close();
+				this.popupWindow = null;
+			}
+		}
+		return false;
+	}
+	function colorSelect(t,p) {
+		if ( cp.p == p && document.getElementById(cp.divName).style.visibility != "hidden" ) {
+			cp.hidePopup('prettyplease');
 		} else {
-			//Hide text
-			jQuery( text_objects.toString() ).hide();
-			old_color = jQuery('#text-color').val();
-			jQuery('#text-color').val('blank');
+			cp.p = p;
+			cp.select(t,p);
 		}
 	}
+	function colorDefault() {
+		pickColor('#<?php echo HEADER_TEXTCOLOR; ?>');
+	}

-	jQuery(document).ready(function() {
-		jQuery('#pickcolor').click(function() {
-			jQuery('#color-picker').show();
-		});
+	function hide_text() {
+		$('name').style.display = 'none';
+		$('desc').style.display = 'none';
+		$('pickcolor').style.display = 'none';
+		$('defaultcolor').style.display = 'none';
+		$('textcolor').value = 'blank';
+		$('hidetext').value = '<?php _e('Show Text'); ?>';
+//		$('hidetext').onclick = 'show_text()';
+		Event.observe( $('hidetext'), 'click', show_text );
+	}

-		jQuery('input[name="hidetext"]').click(function() {
-			toggle_text(this);
-		});
+	function show_text() {
+		$('name').style.display = 'block';
+		$('desc').style.display = 'block';
+		$('pickcolor').style.display = 'inline';
+		$('defaultcolor').style.display = 'inline';
+		$('textcolor').value = '<?php echo HEADER_TEXTCOLOR; ?>';
+		$('hidetext').value = '<?php _e('Hide Text'); ?>';
+		Event.stopObserving( $('hidetext'), 'click', show_text );
+		Event.observe( $('hidetext'), 'click', hide_text );
+	}

-		jQuery('#defaultcolor').click(function() {
-			pickColor(default_color);
-			jQuery('#text-color').val(default_color)
-		});
+	<?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?>
+Event.observe( window, 'load', hide_text );
+	<?php } ?>

-		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 } ?>
-	});
-/* ]]> */
 </script>
 <?php
 	}

-	/**
-	 * Display Javascript based on Step 2.
-	 *
-	 * @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( '#width' ).val(coords.w);
-		jQuery( '#height' ).val(coords.h);
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
 	}

-	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('img#upload').width();
-		var yimg = jQuery('img#upload').height();
-
-		if ( yimg < yinit || ximg < xinit ) {
-			if ( ximg / yimg > ratio ) {
-				yinit = yimg;
-				xinit = yinit * ratio;
-			} else {
-				xinit = ximg;
-				yinit = xinit / ratio;
+	// with a supplied ratio
+	Event.observe(
+		window,
+		'load',
+		function() {
+			var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>;
+			var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>;
+			var ratio = xinit / yinit;
+			var ximg = $('upload').width;
+			var yimg = $('upload').height;
+			if ( yimg < yinit || ximg < xinit ) {
+				if ( ximg / yimg > ratio ) {
+					yinit = yimg;
+					xinit = yinit * ratio;
+				} else {
+					xinit = ximg;
+					yinit = xinit / ratio;
+				}
 			}
+			new Cropper.Img(
+				'upload',
+				{
+					ratioDim: { x: xinit, y: yinit },
+					displayOnInit: true,
+					onEndCrop: 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
 	}

-	/**
-	 * Display first step of custom header image page.
-	 *
-	 * @since 2.1.0
-	 */
 	function step_1() {
-		$this->process_default_headers();
-?>
+		if ( $_GET['updated'] ) { ?>
+<div id="message" class="updated fade">
+<p><?php _e('Header updated.') ?></p>
+</div>
+		<?php } ?>

 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e('Custom Header'); ?></h2>
+<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>

-<?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 id="headimg" style="background-image: url(<?php clean_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>
 </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" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
+<input type="button" value="<?php _e('Select a Text Color'); ?>" onclick="colorSelect($('textcolor'), 'pickcolor')" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
+<?php wp_nonce_field('custom-header') ?>
+<input type="hidden" name="textcolor" id="textcolor" value="#<?php attribute_escape(header_textcolor()) ?>" /><input name="submit" type="submit" value="<?php _e('Save Changes'); ?>" /></form>
 <?php } ?>

-<table class="form-table">
-<tbody>
+<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </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>

-
-<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 ( current_theme_supports( 'custom-header-uploads' ) ) : ?>
-<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' ) ?>
-		<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
-	</p>
-	</form>
-</td>
-</tr>
-<?php endif; ?>
-</tbody>
-</table>
-
-<form method="post" action="<?php echo esc_attr( add_query_arg( 'step', 1 ) ) ?>">
-<table class="form-table">
-<tbody>
-	<?php if ( get_uploaded_header_images() ) : ?>
-<tr valign="top">
-<th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
-<td>
-	<p><?php _e( 'You can choose one of your previously uploaded headers, or show a random one.' ) ?></p>
-	<?php
-		$this->show_header_selector( 'uploaded' );
-	?>
-</td>
-</tr>
-	<?php endif;
-	if ( ! empty( $this->default_headers ) ) : ?>
-<tr valign="top">
-<th scope="row"><?php _e( 'Default Images' ); ?></th>
-<td>
-<?php if ( current_theme_supports( 'custom-header-uploads' ) ) : ?>
-	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ) ?></p>
-<?php else: ?>
-	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
-<?php endif; ?>
-	<?php
-		$this->show_header_selector( 'default' );
-	?>
-</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>
-	<?php submit_button( __( 'Remove Header Image' ), 'button', 'removeheader', false ); ?>
-</td>
-</tr>
-	<?php endif;
-
-	if ( defined( 'HEADER_IMAGE' ) && '' != 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>
-	<?php submit_button( __( 'Restore Original Header Image' ), 'button', 'resetheader', false ); ?>
-</td>
-</tr>
-	<?php endif; ?>
-</tbody>
-</table>
-
-	<?php if ( $this->header_text() ) : ?>
-<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>
-	<?php submit_button( __( 'Restore Original Header Text' ), 'button', 'resettext', false ); ?>
-</td>
-</tr>
-	<?php } ?>
-
-</tbody>
-</table>
-	<?php endif;
-
-do_action( 'custom_header_options' );
-
-wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
-
-<?php submit_button( null, 'primary', 'save-header-options' ); ?>
+<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo attribute_escape(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 _e('Upload'); ?>" />
+</p>
 </form>
+
 </div>

-<?php }
+		<?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 attribute_escape(add_query_arg('step', 1)) ?>">
+<?php wp_nonce_field('custom-header'); ?>
+<input type="submit" name="resetheader" value="<?php _e('Restore Original Header'); ?>" />
+</form>
+</div>
+		<?php endif;
+
+	}

-	/**
-	 * Display second step of custom header image page.
-	 *
-	 * @since 2.1.0
-	 */
 	function step_2() {
-		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
-		if ( ! current_theme_supports( 'custom-header-uploads' ) )
-			wp_die( 'Cheatin&#8217; uh?' );
-
+		check_admin_referer('custom-header');
 		$overrides = array('test_form' => false);
 		$file = wp_handle_upload($_FILES['import'], $overrides);

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

 		$url = $file['url'];
 		$type = $file['type'];
@@ -645,9 +244,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		'post_title' => $filename,
 		'post_content' => $url,
 		'post_mime_type' => $type,
-		'guid' => $url,
-		'context' => 'custom-header'
-		);
+		'guid' => $url);

 		// Save the data
 		$id = wp_insert_attachment($object, $file);
@@ -657,17 +254,13 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {
 			// Add the meta-data
 			wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-			update_post_meta( $id, '_wp_attachment_is_custom_header', get_option('stylesheet' ) );

-			set_theme_mod('header_image', esc_url($url));
+			set_theme_mod('header_image', clean_url($url));
 			do_action('wp_create_file_in_uploads', $file, $id); // For replication
 			return $this->finished();
 		} 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);
@@ -679,42 +272,34 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		?>

 <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)); ?>">
-	<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>
+<form method="POST" action="<?php echo attribute_escape(add_query_arg('step', 3)) ?>">

-	<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><?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>

-	<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' ) ?>
+<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 $id; ?>" />
+<input type="hidden" name="oitar" id="oitar" value="<?php echo $oitar; ?>" />
+<?php wp_nonce_field('custom-header') ?>
+<input type="submit" value="<?php _e('Crop Header'); ?>" />
+</p>

-	<?php submit_button( __( 'Crop and Publish' ) ); ?>
-	</p>
 </form>
 </div>
 		<?php
 	}

-	/**
-	 * Display third step of custom header image page.
-	 *
-	 * @since 2.1.0
-	 */
 	function step_3() {
-		check_admin_referer('custom-header-crop-image');
-		if ( ! current_theme_supports( 'custom-header-uploads' ) )
-			wp_die( 'Cheatin&#8217; uh?' );
-
+		check_admin_referer('custom-header');
 		if ( $_POST['oitar'] > 1 ) {
 			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
 			$_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
@@ -722,33 +307,27 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 			$_POST['height'] = $_POST['height'] * $_POST['oitar'];
 		}

-		$attachment_id = absint( $_POST['attachment_id'] );
-		$original = get_attached_file($attachment_id);
+		$original = get_attached_file( $_POST['attachment_id'] );

-		$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_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 = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT);
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $_POST['attachment_id']); // For replication

-		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
-
-		$parent = get_post($attachment_id);
+		$parent = get_post($_POST['attachment_id']);
 		$parent_url = $parent->guid;
 		$url = str_replace(basename($parent_url), basename($cropped), $parent_url);

 		// Construct the object array
 		$object = array(
-			'ID' => $attachment_id,
+			'ID' => $_POST['attachment_id'],
 			'post_title' => basename($cropped),
 			'post_content' => $url,
 			'post_mime_type' => 'image/jpeg',
-			'guid' => $url,
-			'context' => 'custom-header'
+			'guid' => $url
 		);

 		// Update the attachment
 		wp_insert_attachment($object, $cropped);
-		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $cropped ) );
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_option('stylesheet' ) );
+		wp_update_attachment_metadata( $_POST['attachment_id'], wp_generate_attachment_metadata( $_POST['attachment_id'], $cropped ) );

 		set_theme_mod('header_image', $url);

@@ -760,24 +339,18 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		return $this->finished();
 	}

-	/**
-	 * Display last step of custom header image page.
-	 *
-	 * @since 2.1.0
-	 */
 	function finished() {
-		$this->updated = true;
-		$this->step_1();
+		?>
+<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
 	}

-	/**
-	 * Display the page based on the current step.
-	 *
-	 * @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
@@ -0,0 +1,152 @@
+<?php if ( ! defined('ABSPATH') ) die(); ?>
+<table class="widefat">
+	<thead>
+	<tr>
+
+<?php $posts_columns = wp_manage_media_columns(); ?>
+<?php foreach($posts_columns as $post_column_key => $column_display_name) {
+	if ( 'cb' === $post_column_key )
+		$class = ' class="check-column"';
+	elseif ( 'comments' === $post_column_key )
+		$class = ' class="num"';
+	else
+		$class = '';
+?>
+	<th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th>
+<?php } ?>
+
+	</tr>
+	</thead>
+	<tbody id="the-list" class="list:post">
+<?php
+if ( have_posts() ) {
+$bgcolor = '';
+add_filter('the_title','wp_specialchars');
+while (have_posts()) : the_post();
+$class = 'alternate' == $class ? '' : 'alternate';
+global $current_user;
+$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
+$att_title = get_the_title();
+if ( empty($att_title) )
+	$att_title = __('(no title)');
+
+?>
+	<tr id='post-<?php echo $id; ?>' class='<?php echo trim( $class . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top">
+
+<?php
+
+foreach($posts_columns as $column_name=>$column_display_name) {
+
+	switch($column_name) {
+
+	case 'cb':
+		?>
+		<th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /></th>
+		<?php
+		break;
+
+	case 'icon':
+		?>
+		<td class="media-icon"><?php echo wp_get_attachment_link($post->ID, array(80, 60), false, true); ?></td>
+		<?php
+		// TODO
+		break;
+
+	case 'media':
+		?>
+		<td><strong><a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br />
+		<?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
+		<?php do_action('manage_media_media_column', $post->ID); ?>
+		</td>
+		<?php
+		break;
+
+	case 'desc':
+		?>
+		<td><?php echo has_excerpt() ? $post->post_excerpt : ''; ?></td>
+		<?php
+		break;
+
+	case 'date':
+		if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
+			$t_time = $h_time = __('Unpublished');
+		} else {
+			$t_time = get_the_time(__('Y/m/d g:i:s A'));
+			$m_time = $post->post_date;
+			$time = get_post_time( 'G', true );
+			if ( ( abs($t_diff = time() - $time) ) < 86400 ) {
+				if ( $t_diff < 0 )
+					$h_time = sprintf( __('%s from now'), human_time_diff( $time ) );
+				else
+					$h_time = sprintf( __('%s ago'), human_time_diff( $time ) );
+			} else {
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
+			}
+		}
+		?>
+		<td><?php echo $h_time ?></td>
+		<?php
+		break;
+
+	case 'parent':
+		$title = __('(no title)'); // override below
+		if ( $post->post_parent > 0 ) {
+			if ( get_post($post->post_parent) ) {
+				$parent_title = get_the_title($post->post_parent);
+				if ( !empty($parent_title) )
+					$title = $parent_title;
+			}
+			?>
+			<td><strong><a href="post.php?action=edit&amp;post=<?php echo $post->post_parent; ?>"><?php echo $title ?></a></strong></td>
+			<?php
+		} else {
+			?>
+			<td>&nbsp;</td>
+			<?php
+		}
+
+		break;
+
+	case 'comments':
+		?>
+		<td class="num"><div class="post-com-count-wrapper">
+		<?php
+		$left = get_pending_comments_num( $post->ID );
+		$pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
+		if ( $left )
+			echo '<strong>';
+		comments_number("<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>');
+		if ( $left )
+			echo '</strong>';
+		?>
+		</div></td>
+		<?php
+		break;
+
+	case 'location':
+		?>
+		<td><a href="<?php the_permalink(); ?>"><?php _e('Permalink'); ?></a></td>
+		<?php
+		break;
+
+	default:
+		?>
+		<td><?php do_action('manage_media_custom_column', $column_name, $id); ?></td>
+		<?php
+		break;
+	}
+}
+?>
+	</tr>
+<?php
+endwhile;
+} else {
+?>
+  <tr style='background-color: <?php echo $bgcolor; ?>'>
+    <td colspan="8"><?php _e('No posts found.') ?></td>
+  </tr>
+<?php
+} // end if ( have_posts() )
+?>
+	</tbody>
+</table>
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -0,0 +1,53 @@
+<?php
+if ( ! empty($cat_ID) ) {
+	$heading = __('Edit Category');
+	$submit_text = __('Edit Category');
+	$form = '<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">';
+	$action = 'editedcat';
+	$nonce_action = 'update-category_' . $cat_ID;
+	do_action('edit_category_form_pre', $category);
+} else {
+	$heading = __('Add Category');
+	$submit_text = __('Add Category');
+	$form = '<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">';
+	$action = 'addcat';
+	$nonce_action = 'add-category';
+	do_action('add_category_form_pre', $category);
+}
+?>
+
+<div class="wrap">
+<h2><?php echo $heading ?></h2>
+<div id="ajax-response"></div>
+<?php echo $form ?>
+<input type="hidden" name="action" value="<?php echo $action ?>" />
+<input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
+<?php wp_nonce_field($nonce_action); ?>
+	<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 attribute_escape($category->name); ?>" size="40" aria-required="true" /><br />
+            <?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></td>
+		</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 attribute_escape(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>
+		<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, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
+                <?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.'); ?>
+	  		</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 wp_specialchars($category->description); ?></textarea><br />
+            <?php _e('The description is not prominent by default, however some themes may show it.'); ?></td>
+		</tr>
+	</table>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
+<?php do_action('edit_category_form', $category); ?>
+</form>
+</div>
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -1,242 +1,252 @@
 <?php
-/**
- * Edit Comments Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- */
+require_once('admin.php');

-/** WordPress Administration Bootstrap */
-require_once('./admin.php');
-if ( !current_user_can('edit_posts') )
-	wp_die(__('Cheatin&#8217; uh?'));
+$title = __('Edit Comments');
+$parent_file = 'edit-comments.php';
+wp_enqueue_script( 'admin-comments' );
+wp_enqueue_script('admin-forms');

-$wp_list_table = _get_list_table('WP_Comments_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+if ( !empty( $_REQUEST['delete_comments'] ) ) {
+	check_admin_referer('bulk-comments');

-$doaction = $wp_list_table->current_action();
-
-if ( $doaction ) {
-	check_admin_referer( 'bulk-comments' );
-
-	if ( 'delete_all' == $doaction && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
-		$comment_status = $wpdb->escape( $_REQUEST['comment_status'] );
-		$delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] );
-		$comment_ids = $wpdb->get_col( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = '$comment_status' AND '$delete_time' > comment_date_gmt" );
-		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['delete_comments'] ) ) {
-		$comment_ids = $_REQUEST['delete_comments'];
-		$doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
-	} elseif ( wp_get_referer() ) {
-		wp_redirect( wp_get_referer() );
-		exit;
-	}
-
-	$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() );
-	$redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
-
-	foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
-		if ( !current_user_can( 'edit_comment', $comment_id ) )
+	$comments_deleted = $comments_approved = $comments_unapproved = $comments_spammed = 0;
+	foreach ($_REQUEST['delete_comments'] as $comment) : // Check the permissions on each
+		$comment = (int) $comment;
+		$post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment) );
+		if ( !current_user_can('edit_post', $post_id) )
 			continue;
-
-		switch ( $doaction ) {
-			case 'approve' :
-				wp_set_comment_status( $comment_id, 'approve' );
-				$approved++;
-				break;
-			case 'unapprove' :
-				wp_set_comment_status( $comment_id, 'hold' );
-				$unapproved++;
-				break;
-			case 'spam' :
-				wp_spam_comment( $comment_id );
-				$spammed++;
-				break;
-			case 'unspam' :
-				wp_unspam_comment( $comment_id );
-				$unspammed++;
-				break;
-			case 'trash' :
-				wp_trash_comment( $comment_id );
-				$trashed++;
-				break;
-			case 'untrash' :
-				wp_untrash_comment( $comment_id );
-				$untrashed++;
-				break;
-			case 'delete' :
-				wp_delete_comment( $comment_id );
-				$deleted++;
-				break;
+		if ( !empty( $_REQUEST['spamit'] ) ) {
+			wp_set_comment_status($comment, 'spam');
+			$comments_spammed++;
+		} elseif ( !empty( $_REQUEST['deleteit'] ) ) {
+			wp_set_comment_status($comment, 'delete');
+			$comments_deleted++;
+		} elseif ( !empty( $_REQUEST['approveit'] ) ) {
+			wp_set_comment_status($comment, 'approve');
+			$comments_approved++;
+		} elseif ( !empty( $_REQUEST['unapproveit'] ) ) {
+			wp_set_comment_status($comment, 'hold');
+			$comments_unapproved++;
 		}
-	}
-
-	if ( $approved )
-		$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
-	if ( $unapproved )
-		$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
-	if ( $spammed )
-		$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
-	if ( $unspammed )
-		$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
-	if ( $trashed )
-		$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
-	if ( $untrashed )
-		$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
-	if ( $deleted )
-		$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
-	if ( $trashed || $spammed )
-		$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
-
+	endforeach;
+	$redirect_to = basename( __FILE__ ) . '?deleted=' . $comments_deleted . '&approved=' . $comments_approved . '&spam=' . $comments_spammed . '&unapproved=' . $comments_unapproved;
+	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 );
-	exit;
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( !empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
 	 exit;
 }

-$wp_list_table->prepare_items();
+require_once('admin-header.php');

-wp_enqueue_script('admin-comments');
-enqueue_comment_hotkeys_js();
-
-if ( $post_id )
-	$title = sprintf(__('Comments on &#8220;%s&#8221;'), wp_html_excerpt(_draft_or_post_title($post_id), 50));
+if ( empty($_GET['mode']) )
+	$mode = 'detail';
 else
-	$title = __('Comments');
+	$mode = attribute_escape($_GET['mode']);

-add_screen_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) );
+if ( isset($_GET['comment_status']) )
+	$comment_status = attribute_escape($_GET['comment_status']);
+else
+	$comment_status = '';

-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. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</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_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="http://codex.wordpress.org/Comment_Spam" target="_blank">Documentation on Comment Spam</a>' ) . '</p>' .
-	'<p>' . __( '<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">Documentation on Keyboard Shortcuts</a>' ) . '</p>' .
-	'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
-);
-require_once('./admin-header.php');
+if ( isset($_GET['s']) )
+	$search_dirty = $_GET['s'];
+else
+	$search_dirty = '';
+$search = attribute_escape( $search_dirty );
 ?>
+<?php
+if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
+	$approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0;
+	$deleted = isset( $_GET['deleted'] ) ? (int) $_GET['deleted'] : 0;
+	$spam = isset( $_GET['spam'] ) ? (int) $_GET['spam'] : 0;

+	if ( $approved > 0 || $deleted > 0 || $spam > 0 ) {
+		echo '<div id="moderated" class="updated fade"><p>';
+
+		if ( $approved > 0 ) {
+			printf( __ngettext( '%s comment approved', '%s comments approved', $approved ), $approved );
+			echo '<br />';
+		}
+
+		if ( $deleted > 0 ) {
+			printf( __ngettext( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
+			echo '<br />';
+		}
+
+		if ( $spam > 0 ) {
+			printf( __ngettext( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
+			echo '<br />';
+		}
+
+		echo '</p></div>';
+	}
+}
+?>
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php
-if ( $post_id )
-	echo sprintf(__('Comments on &#8220;%s&#8221;'),
-		sprintf('<a href="%s">%s</a>',
-			get_edit_post_link($post_id),
-			wp_html_excerpt(_draft_or_post_title($post_id), 50)
-		)
-	);
-else
-	echo __('Comments');
+<form id="posts-filter" action="" method="get">
+<h2><?php _e('Manage Comments'); ?></h2>

-if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
-	printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( stripslashes( $_REQUEST['s'] ) ), 50 ) ) . '</span>' ); ?>
-</h2>
+<ul class="subsubsub">
+<?php
+$status_links = array();
+$num_comments = wp_count_comments();
+$stati = array('moderated' => sprintf(__ngettext('Awaiting Moderation (%s)', 'Awaiting Moderation (%s)', number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"), 'approved' => _c('Approved|plural'));
+$class = ( '' === $comment_status ) ? ' class="current"' : '';
+$status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('Show All Comments')."</a>";
+foreach ( $stati as $status => $label ) {
+	$class = '';
+
+	if ( $status == $comment_status )
+		$class = ' class="current"';
+
+	$status_links[] = "<li><a href=\"edit-comments.php?comment_status=$status\"$class>" . $label . '</a>';
+}
+
+$status_links = apply_filters( 'comment_status_links', $status_links );
+
+echo implode(' | </li>', $status_links) . '</li>';
+unset($status_links);
+?>
+</ul>
+
+<p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label>
+	<input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" />
+	<input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
+</p>
+
+<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
+</form>
+
+<ul class="view-switch">
+	<li <?php if ( 'detail' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'detail', $_SERVER['REQUEST_URI'])) ?>"><?php _e('Detail View') ?></a></li>
+	<li <?php if ( 'list' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><?php _e('List View') ?></a></li>
+</ul>

 <?php
-if ( isset( $_REQUEST['error'] ) ) {
-	$error = (int) $_REQUEST['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 ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) {
-	$approved  = isset( $_REQUEST['approved']  ) ? (int) $_REQUEST['approved']  : 0;
-	$deleted   = isset( $_REQUEST['deleted']   ) ? (int) $_REQUEST['deleted']   : 0;
-	$trashed   = isset( $_REQUEST['trashed']   ) ? (int) $_REQUEST['trashed']   : 0;
-	$untrashed = isset( $_REQUEST['untrashed'] ) ? (int) $_REQUEST['untrashed'] : 0;
-	$spammed   = isset( $_REQUEST['spammed']   ) ? (int) $_REQUEST['spammed']   : 0;
-	$unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
-	$same      = isset( $_REQUEST['same'] )      ? (int) $_REQUEST['same']      : 0;
+$comments_per_page = apply_filters('comments_per_page', 20, $comment_status);

-	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 ( isset( $_GET['apage'] ) )
+	$page = abs( (int) $_GET['apage'] );
+else
+	$page = 1;

-		if ( $spammed > 0 ) {
-			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
-			$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 />';
-		}
+$start = $offset = ( $page - 1 ) * $comments_per_page;

-		if ( $unspammed > 0 )
-			$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
+list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5 ); // Grab a few extra

-		if ( $trashed > 0 ) {
-			$ids = isset($_REQUEST['ids']) ? $_REQUEST['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 />';
-		}
+$comments = array_slice($_comments, 0, $comments_per_page);
+$extra_comments = array_slice($_comments, $comments_per_page);

-		if ( $untrashed > 0 )
-			$messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'apage', '%#%' ),
+	'format' => '',
+	'total' => ceil($total / $comments_per_page),
+	'current' => $page
+));

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

-<?php $wp_list_table->views(); ?>
+<form id="comments-form" action="" method="post">

-<form id="comments-form" action="" method="get">
+<div class="tablenav">

-<?php $wp_list_table->search_box( __( 'Search Comments' ), 'comment' ); ?>
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>

-<?php if ( $post_id ) : ?>
-<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
+<div class="alignleft">
+<?php if ( 'approved' != $comment_status ): ?>
+<input type="submit" value="<?php _e('Approve'); ?>" name="approveit" class="button-secondary" />
 <?php endif; ?>
-<input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
-<input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
-
-<input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />
-<input type="hidden" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('per_page') ); ?>" />
-<input type="hidden" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('page') ); ?>" />
-
-<?php if ( isset($_REQUEST['paged']) ) { ?>
-	<input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />
+<input type="submit" value="<?php _e('Mark as Spam'); ?>" name="spamit" class="button-secondary" />
+<?php if ( 'moderated' != $comment_status ): ?>
+<input type="submit" value="<?php _e('Unapprove'); ?>" name="unapproveit" class="button-secondary" />
+<?php endif; ?>
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
+<?php do_action('manage_comments_nav', $comment_status); ?>
+<?php wp_nonce_field('bulk-comments'); ?>
+<?php if ( isset($_GET['apage']) ) { ?>
+	<input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" />
 <?php } ?>
-
-<?php $wp_list_table->display(); ?>
-</form>
 </div>

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

+</div>
+
+<br class="clear" />
 <?php
-wp_comment_reply('-1', true, 'detail');
-wp_comment_trashnotice();
-include('./admin-footer.php'); ?>
+if ($comments) {
+?>
+<table class="widefat">
+<thead>
+  <tr>
+    <th scope="col" class="check-column"><input type="checkbox" /></th>
+    <th scope="col"><?php _e('Comment') ?></th>
+    <th scope="col"><?php _e('Date') ?></th>
+    <th scope="col" class="action-links"><?php _e('Actions') ?></th>
+  </tr>
+</thead>
+<tbody id="the-comment-list" class="list:comment">
+<?php
+	foreach ($comments as $comment)
+		_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
+?>
+</tbody>
+<tbody id="the-extra-comment-list" class="list:comment" style="display: none;">
+<?php
+	foreach ($extra_comments as $comment)
+		_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
+?>
+</tbody>
+</table>
+
+</form>
+
+<form id="get-extra-comments" method="post" action="" class="add:the-extra-comment-list:" style="display: none;">
+	<input type="hidden" name="s" value="<?php echo $search; ?>" />
+	<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+	<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
+	<input type="hidden" name="page" value="<?php echo isset($_REQUEST['page']) ? absint( $_REQUEST['page'] ) : 1; ?>" />
+	<?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
+</form>
+
+<div id="ajax-response"></div>
+<?php
+} elseif ( 'moderated' == $_GET['comment_status'] ) {
+?>
+<p>
+<?php _e('No comments awaiting moderation&hellip; yet.') ?>
+</p>
+<?php
+} else  {
+?>
+<p>
+<?php _e('No results found.') ?>
+</p>
+<?php
+}
+?>
+<div class="tablenav">
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+<br class="clear" />
+</div>
+
+</div>
+
+<?php include('admin-footer.php'); ?>
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -1,312 +1,386 @@
 <?php
-/**
- * Post advanced form for inclusion in the administration panels.
- *
- * @package WordPress
- * @subpackage Administration
- */

-// don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
-
-wp_enqueue_script('post');
-
-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']) ) {
+if ( isset($_GET['message']) )
 	$_GET['message'] = absint( $_GET['message'] );
-	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']];
-}
+$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
+$messages[2] = __('Custom field updated.');
+$messages[3] = __('Custom field deleted.');
+$messages[4] = __('Post updated.');
+
+if ( isset($_GET['revision']) )
+	$messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );

 $notice = false;
-$form_extra = '';
-if ( 'auto-draft' == $post->post_status ) {
-	if ( 'edit' == $action )
-		$post->post_title = '';
+$notices[1] = __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>.' );
+
+if ( !isset($post_ID) || 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='$temp_ID' />";
 	$autosave = false;
-	$form_extra .= "<input type='hidden' id='auto_draft' name='auto_draft' value='1' />";
 } else {
-	$autosave = wp_get_post_autosave( $post_ID );
-}
+	$post_ID = (int) $post_ID;
+	$form_action = 'editpost';
+	$form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+	$autosave = wp_get_post_autosave( $post_id );

-$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;
+	// 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 ) > mysql2date( 'U', $post->post_modified_gmt ) ) {
+		foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
+			if ( wp_text_diff( $autosave->$autosave_field, $post->$autosave_field ) ) {
+				$notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
+				break;
+			}
 		}
+		unset($autosave_field, $_autosave_field);
 	}
-	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');
-
-add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');
-
-if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
-	add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', $post_type, 'side', 'core' );
-
-// all taxonomies
-foreach ( get_object_taxonomies($post_type) as $tax_name ) {
-	$taxonomy = get_taxonomy($tax_name);
-	if ( ! $taxonomy->show_ui )
-		continue;
-
-	$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 ));
-}
-
-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');
-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) && 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( $post_type_object->cap->publish_posts ) ) )
-	add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', $post_type, 'normal', 'core');
-
-if ( post_type_supports($post_type, 'author') ) {
-	if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
-		add_meta_box('authordiv', __('Author'), 'post_author_meta_box', $post_type, '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('add_meta_boxes', $post_type, $post);
-do_action('add_meta_boxes_' . $post_type, $post);
-
-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);
-
-add_screen_option('layout_columns', array('max' => 2) );
-
-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 using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to 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. You can go the distraction-free writing screen, new in 3.2, via the Fullscreen icon in Visual mode (second to last in the top row) or the Fullscreen button in HTML mode (last in the row). Once there, you can make buttons visible by hovering over the top area. Exit Fullscreen back to the regular post editor.') . '</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>' .
-	( ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) ? '<p>' . __( '<strong>Post Format</strong> - This designates how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Please refer to the Codex for <a href="http://codex.wordpress.org/Post_Formats#Supported_Formats">descriptions of each post format</a>. Your theme could enable all or some of 10 possible formats.' ) . '</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/Posts_Add_New_Screen" target="_blank">Documentation on Writing and Editing 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. This screen also has the new in 3.2 distraction-free writing space, available in both the Visual and HTML modes via the Fullscreen buttons. The Page editor mostly works the same as the 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_Screen" target="_blank">Documentation on Adding New Pages</a>') . '</p>' .
-	'<p>' . __('<a href="http://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages" target="_blank">Documentation on Editing Pages</a>') . '</p>' .
-	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-	);
-}
-
-require_once('./admin-header.php');
 ?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?><?php if ( isset( $post_new_file ) ) : ?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php endif; ?></h2>
 <?php if ( $notice ) : ?>
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
 <?php endif; ?>
-<?php if ( $message ) : ?>
-<div id="message" class="updated"><p><?php echo $message; ?></p></div>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
-<form name="post" action="post.php" method="post" id="post"<?php do_action('post_edit_form_tag'); ?>>
-<?php wp_nonce_field($nonce_action); ?>
+
+<form name="post" action="post.php" method="post" id="post">
+<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
+<input type="hidden" name="mode" value="bookmarklet" />
+<?php endif; ?>
+
+<div class="wrap">
+<h2><?php _e('Write Post') ?></h2>
+<?php
+
+if ( !isset($post_ID) || 0 == $post_ID)
+	wp_nonce_field('add-post');
+else
+	wp_nonce_field('update-post_' .  $post_ID);
+
+$form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />';
+
+$form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />';
+
+$saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
+
+?>
+
 <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_type ) ?>" />
-<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr( $post->post_status) ?>" />
-<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');
+<input type="hidden" id="hiddenaction" name="action" value="<?php echo $form_action ?>" />
+<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
+<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
+<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
+<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>

-echo $form_extra;
+<?php 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">
+
+<div class="submitbox" id="submitpost">
+
+<div id="previewview">
+<?php if ( 'publish' == $post->post_status ) { ?>
+<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Post'); ?></a>
+<?php } elseif ( 'edit' == $action ) { ?>
+<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank"  tabindex="4"><?php _e('Preview this Post'); ?></a>
+<?php } ?>
+</div>
+
+<div class="inside">
+
+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
+<p>
+<select name='post_status' id='post_status' tabindex='4'>
+<?php 
+// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability) 
+if ( current_user_can('publish_posts') OR ( $post->post_status == 'publish' AND current_user_can('edit_post', $post->ID) ) ) :
 ?>
+<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
+<?php if ( 'future' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
+<?php endif; ?>
+<?php endif; ?>
+<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
+<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option>
+</select>
+</p>

-<div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
-<div id="side-info-column" class="inner-sidebar">
-
+<?php if ( current_user_can( 'publish_posts' ) ) : ?>
+<p id="private-checkbox"><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label></p>
+<?php endif; ?>
 <?php
-('page' == $post_type) ? do_action('submitpage_box') : do_action('submitpost_box');
-$side_meta_boxes = do_meta_boxes($post_type, 'side', $post);
+if ($post_ID) {
+	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+		$stamp = __('Scheduled for:<br />%1$s at %2$s');
+	} else if ( 'publish' == $post->post_status ) { // already published
+		$stamp = __('Published on:<br />%1$s at %2$s');
+	} else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified
+		$stamp = __('Publish immediately');
+	} else { // draft, 1 or more saves, date specified
+		$stamp = __('Publish on:<br />%1$s at %2$s');
+	}
+	$date = mysql2date(get_option('date_format'), $post->post_date);
+	$time = mysql2date(get_option('time_format'), $post->post_date);
+} else { // draft (no saves, and thus no date specified)
+	$stamp = __('Publish immediately');
+	$date = mysql2date(get_option('date_format'), current_time('mysql'));
+	$time = mysql2date(get_option('time_format'), current_time('mysql'));
+}
 ?>
+<?php if ( current_user_can( 'publish_posts' ) ) : // Contributors don't get to choose the date of publish ?>
+<p class="curtime"><?php printf($stamp, $date, $time); ?>
+&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p>
+
+<div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div>
+<?php endif; ?>
+
+</div>
+
+<p class="submit">
+<input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
+<?php
+if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
+?>
+<?php if ( current_user_can('publish_posts') ) : ?>
+	<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
+<?php else : ?>
+	<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
+<?php endif; ?>
+<?php
+}
+
+if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )
+	echo "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post_ID", 'delete-post_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;post') . "</a>";
+?>
+<br class="clear" />
+<?php if ($post_ID): ?>
+<?php 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'), wp_specialchars( $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));
+}
+?>
+<br class="clear" />
+<?php endif; ?>
+<span id="autosave"></span>
+<span id="wp-word-count"></span>
+</p>
+
+<div class="side-info">
+<h5><?php _e('Related') ?></h5>
+
+<ul>
+<?php if ($post_ID): ?>
+<li><a href="edit.php?p=<?php echo $post_ID ?>"><?php _e('See Comments on this Post') ?></a></li>
+<?php endif; ?>
+<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
+<li><a href="edit.php"><?php _e('Manage All Posts') ?></a></li>
+<li><a href="categories.php"><?php _e('Manage All Categories') ?></a></li>
+<li><a href="edit-tags.php"><?php _e('Manage All Tags') ?></a></li>
+<li><a href="edit.php?post_status=draft"><?php _e('View Drafts'); ?></a></li>
+<?php do_action('post_relatedlinks_list'); ?>
+</ul>
+
+<h5><?php _e('Shortcuts') ?></h5>
+<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?>  <a href="<?php echo get_shortcut_link(); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
+</div>
+
+<?php do_action('submitpost_box'); ?>
 </div>

 <div id="post-body">
-<div id="post-body-content">
-<?php if ( post_type_supports($post_type, 'title') ) { ?>
 <div id="titlediv">
+<h3><label for="title"><?php _e('Title') ?></label></h3>
 <div id="titlewrap">
-	<label class="hide-if-no-js" style="visibility:hidden" id="title-prompt-text" for="title"><?php echo apply_filters( 'enter_title_here', __( 'Enter title here' ), $post ); ?></label>
-	<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo esc_attr( htmlspecialchars( $post->post_title ) ); ?>" id="title" autocomplete="off" />
+	<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" />
 </div>
 <div class="inside">
-<?php
-$sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
-$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 ( $post_type_object->public && ! ( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) ) { ?>
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
 	<div id="edit-slug-box">
-	<?php
-		if ( ! empty($post->ID) && ! empty($sample_permalink_html) && 'auto-draft' != $post->post_status )
-			echo $sample_permalink_html;
-	?>
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
+	echo $sample_permalink_html;
+endif; ?>
 	</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">
-
+<h3><label for="content"><?php _e('Post') ?></label></h3>
 <?php the_editor($post->post_content); ?>
-
-<table id="post-status-info" cellspacing="0"><tbody><tr>
-	<td id="wp-word-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
-	<td class="autosave-info">
-	<span class="autosave-message">&nbsp;</span>
-<?php
-	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);
-			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));
-		}
-		echo '</span>';
-	} ?>
-	</td>
-</tr></tbody></table>
-
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
 </div>

+<?php echo $form_pingback ?>
+<?php echo $form_prevstatus ?>
+
+<?php
+function post_tags_meta_box($post) {
+?>
+<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
+<div id="tagchecklist"></div>
 <?php
 }
+add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'normal', 'core');

-do_meta_boxes($post_type, 'normal', $post);
+function post_categories_meta_box($post) {
+?>
+<div id="category-adder" class="wp-hidden-children">
+	<h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
+	<p id="category-add" class="wp-hidden-child">
+		<label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/>
+		<label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
+		<input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
+		<?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
+		<span id="category-ajax-response"></span>
+	</p>
+</div>

-( 'page' == $post_type ) ? do_action('edit_page_form') : do_action('edit_form_advanced');
+<ul id="category-tabs">
+	<li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
+	<li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
+</ul>

-do_meta_boxes($post_type, 'advanced', $post);
+<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
+	<ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
+		<?php $popular_ids = wp_popular_terms_checklist('category'); ?>
+	</ul>
+</div>

-do_action('dbx_post_sidebar'); ?>
+<div id="categories-all" class="ui-tabs-panel">
+	<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+		<?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
+	</ul>
+</div>
+<?php
+}
+add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'normal', 'core');
+?>

+<?php do_meta_boxes('post', 'normal', $post); ?>
+
+<?php do_action('edit_form_advanced'); ?>
+
+<h2><?php _e('Advanced Options'); ?></h2>
+
+<?php
+function post_excerpt_meta_box($post) {
+?>
+<label class="hidden" for="excerpt"><?php _e('Excerpt') ?></label><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea>
+<p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p>
+<?php
+}
+add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'advanced', 'core');
+
+function post_trackback_meta_box($post) {
+	$form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />';
+	if ('' != $post->pinged) {
+		$pings = '<p>'. __('Already pinged:') . '</p><ul>';
+		$already_pinged = explode("\n", trim($post->pinged));
+		foreach ($already_pinged as $pinged_url) {
+			$pings .= "\n\t<li>" . wp_specialchars($pinged_url) . "</li>";
+		}
+		$pings .= '</ul>';
+	}
+
+?>
+<p><label for="trackback"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
+<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
+<?php
+if ( ! empty($pings) )
+	echo $pings;
+}
+add_meta_box('trackbacksdiv', __('Trackbacks'), 'post_trackback_meta_box', 'post', 'advanced', 'core');
+
+function post_custom_meta_box($post) {
+?>
+<div id="postcustomstuff">
+<table cellpadding="3">
+<?php
+$metadata = has_meta($post->ID);
+list_meta($metadata);
+?>
+
+</table>
+<?php
+	meta_form();
+?>
+<div id="ajax-response"></div>
+</div>
+<p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
+<?php
+}
+add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'advanced', 'core');
+
+do_action('dbx_post_advanced');
+
+function post_comment_status_meta_box($post) {
+?>
+<input name="advanced_view" type="hidden" value="1" />
+<p><label for="comment_status" class="selectit">
+<input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
+<?php _e('Allow Comments') ?></label></p>
+<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
+<p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
+<?php
+}
+add_meta_box('commentstatusdiv', __('Comments &amp; Pings'), 'post_comment_status_meta_box', 'post', 'advanced', 'core');
+
+function post_password_meta_box($post) {
+?>
+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
+<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
+<?php
+}
+add_meta_box('passworddiv', __('Password Protect This Post'), 'post_password_meta_box', 'post', 'advanced', 'core');
+
+function post_slug_meta_box($post) {
+?>
+<label class="hidden" for="post_name"><?php _e('Post Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
+<?php
+}
+add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'advanced', '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 ) :
+function post_author_meta_box($post) {
+	global $current_user, $user_ID;
+	$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;
+?>
+<label class="hidden" for="post_author_override"><?php _e('Post Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?>
+<?php
+}
+add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'advanced', 'core');
+endif;
+
+if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
+function post_revisions_meta_box($post) {
+	wp_list_post_revisions();
+}
+add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'advanced', 'core');
+endif;
+
+do_meta_boxes('post', 'advanced', $post);
+
+do_action('dbx_post_sidebar');
+?>
 </div>
 </div>
-<br class="clear" />
-</div><!-- /poststuff -->
+
+</div>
+
 </form>
-</div>
-
-<?php wp_comment_reply(); ?>

 <?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
 <script type="text/javascript">
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -1,145 +1,106 @@
 <?php
-/**
- * Edit comment form for inclusion in another file.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-// don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
-
-/**
- * @var string
- */
 $submitbutton_text = __('Edit Comment');
 $toprow_title = sprintf(__('Editing Comment # %s'), $comment->comment_ID);
 $form_action = 'editedcomment';
-$form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . esc_attr($comment->comment_ID) . "' />\n<input type='hidden' name='comment_post_ID' value='" . esc_attr($comment->comment_post_ID);
-$comment->comment_author_email = esc_attr($comment->comment_author_email);
+$form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment->comment_ID . "' />\n<input type='hidden' name='comment_post_ID' value='" . $comment->comment_post_ID;
 ?>

 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e('Edit Comment'); ?></h2>
-
-<div id="poststuff" class="metabox-holder has-right-sidebar">
+<h2><?php echo $toprow_title; ?></h2>
 <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
 <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />

-<div id="side-info-column" class="inner-sidebar">
-<div id="submitdiv" class="stuffbox" >
-<h3><span class='hndle'><?php _e('Status') ?></span></h3>
-<div class="inside">
+<div id="poststuff">
+
 <div class="submitbox" id="submitcomment">
-<div id="minor-publishing">

-<div id="minor-publishing-actions">
-<div id="preview-action">
-<a class="preview button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View Comment'); ?></a>
-</div>
-<div class="clear"></div>
+<div id="previewview">
+<a href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a>
 </div>

-<div id="misc-publishing-actions">
+<div class="inside">

-<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 */ _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>
+<p><strong><label for='comment_status'><?php _e('Approval Status') ?></label></strong></p>
+<p>
+<select name='comment_status' id='comment_status'>
+<option<?php selected( $comment->comment_approved, '1' ); ?> value='1'><?php _e('Approved') ?></option>
+<option<?php selected( $comment->comment_approved, '0' ); ?> value='0'><?php _e('Moderated') ?></option>
+<option<?php selected( $comment->comment_approved, 'spam' ); ?> value='spam'><?php _e('Spam') ?></option>
+</select>
+</p>

-<div class="misc-pub-section curtime misc-pub-section-last">
 <?php
-// translators: Publish box date formt, see http://php.net/date
-$datef = __( 'M j, Y @ G:i' );
-$stamp = __('Submitted on: <b>%1$s</b>');
-$date = date_i18n( $datef, strtotime( $comment->comment_date ) );
+$stamp = __('%1$s at %2$s');
+$date = mysql2date(get_option('date_format'), $comment->comment_date);
+$time = mysql2date(get_option('time_format'), $comment->comment_date);
 ?>
-<span id="timestamp"><?php printf($stamp, $date); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
+<p class="curtime"><?php printf($stamp, $date, $time); ?>
+&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a></p>
+
 <div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
-</div>
-</div> <!-- misc actions -->
-<div class="clear"></div>
+
 </div>

-<div id="major-publishing-actions">
-<div id="delete-action">
-<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=" . ( !EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . ( !EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash') ) . "</a>\n"; ?>
-</div>
-<div id="publishing-action">
-<?php submit_button( __( 'Update Comment' ), 'primary', 'save', false, array( 'tabindex' => '4' ) ); ?>
-</div>
-<div class="clear"></div>
-</div>
-</div>
-</div>
+<p class="submit">
+<input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
+<?php
+echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>";
+?>
+</p>
+
+<div class="side-info">
+<h5><?php _e('Related') ?></h5>
+
+<ul>
+<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
+<li><a href="edit-comments.php?comment_status=moderated"><?php _e('Moderate Comments') ?></a></li>
+<?php do_action('comment_relatedlinks_list'); ?>
+</ul>
 </div>
+<?php do_action('submitcomment_box'); ?>
 </div>

 <div id="post-body">
-<div id="post-body-content">
 <div id="namediv" class="stuffbox">
-<h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
+<h3><label for="name"><?php _e('Name') ?></label></h3>
 <div class="inside">
-<table class="form-table editcomment">
-<tbody>
-<tr valign="top">
-	<td class="first"><?php _e( 'Name:' ); ?></td>
-	<td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" tabindex="1" id="name" /></td>
-</tr>
-<tr valign="top">
-	<td class="first">
-	<?php
-		if ( $comment->comment_author_email ) {
-			printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) );
-		} else {
-			_e( 'E-mail:' );
-		}
-?></td>
-	<td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" tabindex="2" id="email" /></td>
-</tr>
-<tr valign="top">
-	<td class="first">
-	<?php
-		if ( ! empty( $comment->comment_author_url ) && 'http://' != $comment->comment_author_url ) {
-			$link = '<a href="' . $comment->comment_author_url . '" rel="external nofollow" target="_blank">' . __('visit site') . '</a>';
-			printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) );
-		} else {
-			_e( 'URL:' );
-		} ?></td>
-	<td><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" tabindex="3" /></td>
-</tr>
-</tbody>
-</table>
-<br />
+<input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
+</div>
+</div>
+
+<div id="emaildiv" class="stuffbox">
+<h3><label for="email"><?php _e('E-mail') ?></label></h3>
+<div class="inside">
+<input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
+</div>
+</div>
+
+<div id="uridiv" class="stuffbox">
+<h3><label for="newcomment_author_url"><?php _e('URL') ?></label></h3>
+<div class="inside">
+<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" />
 </div>
 </div>

 <div id="postdiv" class="postarea">
-<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4, false); ?>
+<h3><label for="content"><?php _e('Comment') ?></label></h3>
+<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>

-<?php
-do_action('add_meta_boxes', 'comment', $comment);
-do_action('add_meta_boxes_comment', $comment);
+<?php do_meta_boxes('comment', 'normal', $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())); ?>" />
+<input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" />
+<input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" />
 <?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />
+</div>
+</div>
+</div>

-</div>
-</div>
-</div>
-</div>
 </form>

 <script type="text/javascript">
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -0,0 +1,69 @@
+
+<div class="wrap">
+<h2><?php _e('Write Post'); ?></h2>
+<form name="post" action="post.php" method="post" id="simple">
+
+<?php if (isset($mode) && 'bookmarklet' == $mode) : ?>
+<input type="hidden" name="mode" value="bookmarklet" />
+<?php endif; ?>
+<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
+<input type="hidden" name="action" value='post' />
+
+<div id="poststuff">
+    <fieldset id="titlediv">
+      <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend>
+	  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" /></div>
+    </fieldset>
+
+    <fieldset id="categorydiv">
+      <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend>
+	  <div><?php dropdown_categories($post->post_category); ?></div>
+    </fieldset>
+
+<br />
+<fieldset id="postdiv">
+    <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php _e('Post') ?></a></legend>
+<?php
+ $rows = get_option('default_post_edit_rows');
+ if (($rows < 3) || ($rows > 100)) {
+     $rows = 10;
+ }
+?>
+<div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content"><?php echo $post->post_content ?></textarea></div>
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+</fieldset>
+
+
+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+//-->
+</script>
+
+<input type="hidden" name="post_pingback" value="<?php echo (int) get_option('default_pingback_flag') ?>" id="post_pingback" />
+
+<p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Locator">URL</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Locator">URL</abbr>s with spaces.)'), 'http://wordpress.org/docs/reference/post/#trackback'); echo '<br />'; ?>
+	<input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>
+
+<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" />
+	<input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />
+
+	 <?php if ( current_user_can('edit_posts') ) : ?>
+	<input name="publish" type="submit" id="publish" tabindex="6" value="<?php _e('Publish') ?>" class="button button-highlighted" />
+<?php endif; ?>
+
+<?php if ('bookmarklet' != $mode) {
+		echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing') . '" />';
+	} ?>
+	<input name="referredby" type="hidden" id="referredby" value="<?php if ( $refby = wp_get_referer() ) echo urlencode($refby); ?>" />
+</p>
+
+<?php do_action('simple_edit_form', ''); ?>
+
+</div>
+</form>
+
+<script type="text/javascript">
+try{document.getElementById('title').focus();}catch(e){}
+</script>
+</div>
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -0,0 +1,157 @@
+<?php
+require_once('admin.php');
+
+// Handle bulk deletes
+if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) {
+	check_admin_referer('bulk-link-categories');
+
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));
+
+	foreach( (array) $_GET['delete'] as $cat_ID ) {
+		$cat_name = get_term_field('name', $cat_ID, 'link_category');
+		$default_cat_id = get_option('default_link_category');
+		
+		// Don't delete the default cats.
+		if ( $cat_ID == $default_cat_id )
+			wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+
+		wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
+	}
+
+	$location = 'edit-link-categories.php';
+	if ( $referer = wp_get_referer() ) {
+		if ( false !== strpos($referer, 'edit-link-categories.php') )
+			$location = $referer;
+	}
+
+	$location = add_query_arg('message', 6, $location);
+	wp_redirect($location);
+	exit();
+} elseif ( !empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
+	 exit;
+}
+
+$title = __('Link Categories');
+$parent_file = 'edit.php';
+
+wp_enqueue_script( 'admin-categories' );
+wp_enqueue_script('admin-forms');
+
+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.');
+$messages[6] = __('Categories deleted.');
+
+if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+endif; ?>
+
+<div class="wrap">
+
+<form id="posts-filter" action="" method="get">
+<?php if ( current_user_can('manage_categories') ) : ?>
+	<h2><?php printf(__('Manage Link Categories (<a href="%s">add new</a>)'), '#addcat') ?> </h2>
+<?php else : ?>
+	<h2><?php _e('Manage Link Categories') ?> </h2>
+<?php endif; ?>
+
+<p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label>
+	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
+</p>
+
+<br class="clear" />
+
+<div class="tablenav">
+
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+	$pagenum = 1;
+if( !$catsperpage || $catsperpage < 0 )
+	$catsperpage = 20;
+
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'pagenum', '%#%' ),
+	'format' => '',
+	'total' => ceil(wp_count_terms('link_category') / $catsperpage),
+	'current' => $pagenum
+));
+
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft">
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
+<?php wp_nonce_field('bulk-link-categories'); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+<br class="clear" />
+
+<table class="widefat">
+	<thead>
+	<tr>
+        <th scope="col" class="check-column"><input type="checkbox" /></th>
+        <th scope="col"><?php _e('Name') ?></th>
+        <th scope="col"><?php _e('Description') ?></th>
+        <th scope="col" class="num" style="width: 90px;"><?php _e('Links') ?></th>
+	</tr>
+	</thead>
+	<tbody id="the-list" class="list:link-cat">
+<?php
+$start = ($pagenum - 1) * $catsperpage;
+$args = array('offset' => $start, 'number' => $catsperpage, 'hide_empty' => 0);
+if ( !empty( $_GET['s'] ) )
+	$args['search'] = $_GET['s'];
+
+$categories = get_terms( 'link_category', $args );
+if ( $categories ) {
+	$output = '';
+	foreach ( $categories as $category ) {
+		$category = sanitize_term($category, 'link_category', 'display');
+		$output .= link_cat_row($category);
+	}
+	$output = apply_filters('cat_rows', $output);
+	echo $output;
+	unset($category);
+}
+
+?>
+	</tbody>
+</table>
+</form>
+
+<div class="tablenav">
+
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+<br class="clear" />
+</div>
+<br class="clear" />
+
+</div>
+
+<?php if ( current_user_can('manage_categories') ) : ?>
+<div class="wrap">
+<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the links in that category. Instead, links that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), get_term_field('name', get_option('default_link_category'), 'link_category')) ?></p>
+</div>
+
+<?php include('edit-link-category-form.php'); ?>
+
+<?php endif; ?>
+
+<?php include('admin-footer.php'); ?>
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -0,0 +1,44 @@
+<?php
+if ( ! empty($cat_ID) ) {
+	$heading = __('Edit Category');
+	$submit_text = __('Edit Category');
+	$form = '<form name="editcat" id="editcat" method="post" action="link-category.php" class="validate">';
+	$action = 'editedcat';
+	$nonce_action = 'update-link-category_' . $cat_ID;
+	do_action('edit_link_category_form_pre', $category);
+} else {
+	$heading = __('Add Category');
+	$submit_text = __('Add Category');
+	$form = '<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">';
+	$action = 'addcat';
+	$nonce_action = 'add-link-category';
+	do_action('add_link_category_form_pre', $category);
+}
+?>
+
+<div class="wrap">
+<h2><?php echo $heading ?></h2>
+<div id="ajax-response"></div>
+<?php echo $form ?>
+<input type="hidden" name="action" value="<?php echo $action ?>" />
+<input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?>
+	<table class="form-table">
+		<tr class="form-field form-required">
+			<th scope="row" valign="top"><label for="name"><?php _e('Category name') ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php echo $category->name; ?>" size="40" aria-required="true" /></td>
+		</tr>
+		<tr class="form-field">
+			<th scope="row" valign="top"><label for="slug"><?php _e('Category slug') ?></label></th>
+			<td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $category->slug)); ?>" size="40" />
+            <?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>
+		<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></td>
+		</tr>
+	</table>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
+<?php do_action('edit_link_category_form', $category); ?>
+</form>
+</div>
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -1,121 +1,308 @@
 <?php
-/**
- * Edit links form for inclusion in administration panels.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-// don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
-
 if ( ! empty($link_id) ) {
-	$heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
-	$submit_text = __('Update Link');
+	$heading = __('Edit Link');
+	$submit_text = __('Save Changes');
 	$form = '<form name="editlink" id="editlink" method="post" action="link.php">';
 	$nonce_action = 'update-bookmark_' . $link_id;
 } else {
-	$heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
+	$heading = __('Add Link');
 	$submit_text = __('Add Link');
 	$form = '<form name="addlink" id="addlink" method="post" action="link.php">';
 	$nonce_action = 'add-bookmark';
 }

-require_once('./includes/meta-boxes.php');
+function xfn_check($class, $value = '', $deprecated = '') {
+	global $link;

-add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core');
-add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');
-add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'normal', 'core');
-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');
+	$link_rel = $link->link_rel;
+	$rels = preg_split('/\s+/', $link_rel);

-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_screen_option('layout_columns', array('max' => 2) );
-
-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_Screen" 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');
+	if ('' != $value && in_array($value, $rels) ) {
+		echo ' checked="checked"';
+	}

+	if ('' == $value) {
+		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
+		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
+		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
+		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+	}
+}
 ?>
+
+<?php echo $form ?>
+<?php wp_nonce_field($nonce_action); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a></h2>
+<h2><?php echo $heading; ?></h2>

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

+<div class="submitbox" id="submitlink">
+
+<div id="previewview">
+<?php if ( !empty($link_id) ) { ?>
+<a href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
+<?php } ?>
+</div>
+
+<div class="inside">
+<p><label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label></p>
+</div>
+
+<p class="submit">
+<input type="submit" class="button button-highlighted" name="save" value="<?php _e('Save'); ?>" tabindex="4" />
 <?php
-if ( !empty($form) )
-	echo $form;
-if ( !empty($link_added) )
-	echo $link_added;
-
-wp_nonce_field( $nonce_action );
-wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', 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('submitlink_box');
-$side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
-
+if ( ( 'edit' == $action) && current_user_can('manage_links') )
+	echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link_id", 'delete-bookmark_' . $link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>";
 ?>
+</p>
+
+<div class="side-info">
+<h5><?php _e('Related') ?></h5>
+
+<ul>
+<li><a href="link-manager.php"><?php _e('Manage All Links') ?></a></li>
+<li><a href="edit-link-categories.php"><?php _e('Manage All Link Categories') ?></a></li>
+<li><a href="link-import.php"><?php _e('Import Links') ?></a></li>
+<?php do_action('link_relatedlinks_list'); ?>
+</ul>
+</div>
+<?php do_action('submitlink_box'); ?>
 </div>

 <div id="post-body">
-<div id="post-body-content">
 <div id="namediv" class="stuffbox">
-<h3><label for="link_name"><?php _ex('Name', 'link name') ?></label></h3>
+<h3><label for="link_name"><?php _e('Name') ?></label></h3>
 <div class="inside">
-	<input type="text" name="link_name" size="30" tabindex="1" value="<?php echo esc_attr($link->link_name); ?>" id="link_name" />
-    <p><?php _e('Example: Nifty blogging software'); ?></p>
+	<input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br />
+    <?php _e('Example: Nifty blogging software'); ?>
 </div>
 </div>

 <div id="addressdiv" class="stuffbox">
 <h3><label for="link_url"><?php _e('Web Address') ?></label></h3>
 <div class="inside">
-	<input type="text" name="link_url" size="30" class="code" tabindex="1" value="<?php echo esc_attr($link->link_url); ?>" id="link_url" />
-    <p><?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?></p>
+	<input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br />
+    <?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?>
 </div>
 </div>

 <div id="descriptiondiv" class="stuffbox">
 <h3><label for="link_description"><?php _e('Description') ?></label></h3>
 <div class="inside">
-	<input type="text" name="link_description" size="30" tabindex="1" value="<?php echo isset($link->link_description) ? esc_attr($link->link_description) : ''; ?>" id="link_description" />
-    <p><?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?></p>
+	<input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br />
+    <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
 </div>
 </div>

+<?php function link_categories_meta_box($link) { ?>
+<div id="category-adder" class="wp-hidden-children">
+	<h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
+	<p id="link-category-add" class="wp-hidden-child">
+		<label class="hidden" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
+		<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" aria-required="true" />
+		<input type="button" id="category-add-sumbit" class="add:categorychecklist:linkcategorydiv button" value="<?php _e( 'Add' ); ?>" />
+		<?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
+		<span id="category-ajax-response"></span>
+	</p>
+</div>
+
+<ul id="category-tabs">
+	<li class="ui-tabs-selected"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
+	<li class="wp-no-js-hidden"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+</ul>
+
+<div id="categories-all" class="ui-tabs-panel">
+	<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+		<?php wp_link_category_checklist($link->link_id); ?>
+	</ul>
+</div>
+
+<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
+	<ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
+		<?php wp_popular_terms_checklist('link_category'); ?>
+	</ul>
+</div>
 <?php
+}
+add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');
+?>

-do_meta_boxes('link', 'normal', $link);
+<?php do_meta_boxes('link', 'normal', $link); ?>
+
+<h2><?php _e('Advanced Options'); ?></h2>
+
+<?php function link_target_meta_box($link) { ?>
+<fieldset><legend class="hidden"><?php _e('Target') ?></legend>
+<label for="link_target_blank" class="selectit">
+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+<code>_blank</code></label><br />
+<label for="link_target_top" class="selectit">
+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo(($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<code>_top</code></label><br />
+<label for="link_target_none" class="selectit">
+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
+<?php _e('none') ?></label>
+</fieldset>
+<p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p>
+<?php
+}
+add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'advanced', 'core');
+
+function link_xfn_meta_box($link) {
+?>
+<table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
+	<tr>
+		<th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th>
+		<td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
+	</tr>
+	<tr>
+		<td colspan="2">
+			<table cellpadding="3" cellspacing="5" class="form-table">
+				<tr>
+					<th scope="row"> <?php _e('identity') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('identity') ?> </legend>
+						<label for="me">
+						<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
+						<?php _e('another web address of mine') ?></label>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('friendship') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('friendship') ?> </legend>
+						<label for="contact">
+						<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
+						<label for="acquaintance">
+						<input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
+						<label for="friend">
+						<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
+						<label for="friendship">
+						<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('physical') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('physical') ?> </legend>
+						<label for="met">
+						<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
+						<?php _e('met') ?></label>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('professional') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('professional') ?> </legend>
+						<label for="co-worker">
+						<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
+						<?php _e('co-worker') ?></label>
+						<label for="colleague">
+						<input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
+						<?php _e('colleague') ?></label>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('geographical') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('geographical') ?> </legend>
+						<label for="co-resident">
+						<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
+						<?php _e('co-resident') ?></label>
+						<label for="neighbor">
+						<input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
+						<?php _e('neighbor') ?></label>
+						<label for="geographical">
+						<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
+						<?php _e('none') ?></label>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('family') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('family') ?> </legend>
+						<label for="child">
+						<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
+						<?php _e('child') ?></label>
+						<label for="kin">
+						<input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?>  />
+						<?php _e('kin') ?></label>
+						<label for="parent">
+						<input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
+						<?php _e('parent') ?></label>
+						<label for="sibling">
+						<input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
+						<?php _e('sibling') ?></label>
+						<label for="spouse">
+						<input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
+						<?php _e('spouse') ?></label>
+						<label for="family">
+						<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
+						<?php _e('none') ?></label>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('romantic') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('romantic') ?> </legend>
+						<label for="muse">
+						<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
+						<?php _e('muse') ?></label>
+						<label for="crush">
+						<input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
+						<?php _e('crush') ?></label>
+						<label for="date">
+						<input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
+						<?php _e('date') ?></label>
+						<label for="romantic">
+						<input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
+						<?php _e('sweetheart') ?></label>
+					</fieldset></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p>
+<?php
+}
+add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'advanced', 'core');
+
+function link_advanced_meta_box($link) {
+?>
+<table class="form-table" style="width: 100%;" cellspacing="2" cellpadding="5">
+	<tr class="form-field">
+		<th valign="top"  scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
+		<td><input type="text" name="link_image" id="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td>
+	</tr>
+	<tr class="form-field">
+		<th valign="top"  scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
+		<td><input name="link_rss" type="text" id="rss_uri" value="<?php echo $link->link_rss; ?>" size="50" style="width: 95%" /></td>
+	</tr>
+	<tr class="form-field">
+		<th valign="top"  scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
+		<td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo $link->link_notes; ?></textarea></td>
+	</tr>
+	<tr class="form-field">
+		<th valign="top"  scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
+		<td><select name="link_rating" id="link_rating" size="1">
+		<?php
+			for ($r = 0; $r < 10; $r++) {
+				echo('            <option value="'.$r.'" ');
+				if ($link->link_rating == $r)
+					echo 'selected="selected"';
+				echo('>'.$r.'</option>');
+			}
+		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
+		</td>
+	</tr>
+</table>
+<?php
+}
+add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'advanced', 'core');

 do_meta_boxes('link', 'advanced', $link);

 if ( $link_id ) : ?>
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
-<input type="hidden" name="order_by" value="<?php echo esc_attr($order_by); ?>" />
+<input type="hidden" name="order_by" value="<?php echo attribute_escape($order_by); ?>" />
 <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
 <?php else: ?>
 <input type="hidden" name="action" value="add" />
@@ -123,7 +310,7 @@ if ( $link_id ) : ?>

 </div>
 </div>
+
 </div>

 </form>
-</div>
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -0,0 +1,317 @@
+<?php
+if ( isset($_GET['message']) )
+	$_GET['message'] = absint( $_GET['message'] );
+$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
+$messages[2] = __('Custom field updated.');
+$messages[3] = __('Custom field deleted.');
+$messages[4] = __('Page updated.');
+
+if ( isset($_GET['revision']) )
+	$messages[5] = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
+
+$notice = false;
+$notices[1] = __( 'There is an autosave of this page that is more recent than the version below.  <a href="%s">View the autosave</a>.' );
+
+if (!isset($post_ID) || 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 ) > mysql2date( 'U', $post->post_modified_gmt ) )
+		$notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
+}
+
+$temp_ID = (int) $temp_ID;
+$user_ID = (int) $user_ID;
+
+?>
+
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif; ?>
+
+<form name="post" action="page.php" method="post" id="post">
+<div class="wrap">
+<h2><?php _e('Write Page') ?></h2>
+
+<?php
+wp_nonce_field($nonce_action);
+
+if (isset($mode) && 'bookmarklet' == $mode)
+	echo '<input type="hidden" name="mode" value="bookmarklet" />';
+?>
+<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
+<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
+<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
+<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
+<?php echo $form_extra ?>
+<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
+<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
+
+<div id="poststuff">
+
+<div class="submitbox" id="submitpage">
+
+<div id="previewview">
+<?php if ( 'publish' == $post->post_status ) { ?>
+<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank"  tabindex="4"><?php _e('View this Page'); ?></a>
+<?php } elseif ( 'edit' == $action ) { ?>
+<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview this Page'); ?></a>
+<?php } ?>
+</div>
+
+<div class="inside">
+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
+<p>
+<select name='post_status' tabindex='4' id='post_status'>
+<?php // Show publish in dropdown if user can publish or if they can re-publish this page ('edit_published_pages')
+// 'publish' option will be selected for published AND private posts (checkbox overrides dropdown)
+if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) : 
+?>
+<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
+<?php endif; ?>
+<?php if ( 'future' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Pending') ?></option>
+<?php endif; ?>
+<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
+<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option>
+</select>
+</p>
+<?php if ( current_user_can( 'publish_posts' ) ) : ?> 
+<p id="private-checkbox"><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
+<?php endif; ?>
+
+<?php
+if ($post_ID) {
+	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+		$stamp = __('Scheduled for:<br />%1$s at %2$s');
+	} else if ( 'publish' == $post->post_status ) { // already published
+		$stamp = __('Published on:<br />%1$s at %2$s');
+	} else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified
+		$stamp = __('Publish immediately');
+	} else { // draft, 1 or more saves, date specified
+		$stamp = __('Publish on:<br />%1$s at %2$s');
+	}
+	$date = mysql2date(get_option('date_format'), $post->post_date);
+	$time = mysql2date(get_option('time_format'), $post->post_date);
+} else { // draft (no saves, and thus no date specified)
+	$stamp = __('Publish immediately');
+	$date = mysql2date(get_option('date_format'), current_time('mysql'));
+	$time = mysql2date(get_option('time_format'), current_time('mysql'));
+}
+?>
+<p class="curtime"><?php printf($stamp, $date, $time); ?>
+&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p>
+
+<div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div>
+
+</div>
+
+<p class="submit">
+<input type="submit" name="save" class="button button-highlighted" value="<?php _e('Save'); ?>" tabindex="4" />
+<?php
+if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
+?>
+<?php if ( current_user_can('publish_pages') ) : ?>
+	<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
+<?php else : ?>
+	<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
+<?php endif; ?>
+<?php
+}
+
+if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
+	echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$post_ID", 'delete-page_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;page') . "</a>";
+?>
+<br class="clear" />
+<?php if ($post_ID): ?>
+<?php 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'), wp_specialchars( $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));
+}
+?>
+<br class="clear" />
+<?php endif; ?>
+<span id="autosave"></span>
+<span id="wp-word-count"></span>
+</p>
+
+<div class="side-info">
+<h5><?php _e('Related') ?></h5>
+
+<ul>
+<?php if ($post_ID): ?>
+<li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li>
+<?php endif; ?>
+<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
+<li><a href="edit-pages.php"><?php _e('Manage All Pages') ?></a></li>
+<?php do_action('page_relatedlinks_list'); ?>
+</ul>
+</div>
+<?php do_action('submitpage_box'); ?>
+</div>
+
+<div id="post-body">
+<div id="titlediv">
+<h3><label for="title"><?php _e('Title') ?></label></h3>
+<div id="titlewrap">
+  <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $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">
+<h3><label for="content"><?php _e('Page') ?></label></h3>
+<?php the_editor($post->post_content); ?>
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+</div>
+
+<?php do_meta_boxes('page', 'normal', $post); ?>
+
+<?php do_action('edit_page_form'); ?>
+
+<h2><?php _e('Advanced Options'); ?></h2>
+
+
+<?php 
+function page_custom_meta_box($post){
+?>
+<div id="postcustomstuff">
+<table cellpadding="3">
+<?php
+$metadata = has_meta($post->ID);
+list_meta($metadata);
+?>
+
+</table>
+<?php
+	meta_form();
+?>
+<div id="ajax-response"></div>
+</div>
+<p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
+<?php
+}
+add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'advanced', 'core');
+
+function page_comments_status_meta_box($post){
+?>
+<input name="advanced_view" type="hidden" value="1" />
+<p><label for="comment_status" class="selectit">
+<input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
+<?php _e('Allow Comments') ?></label></p>
+<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
+<p><?php _e('These settings apply to this page only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
+<?php 
+}
+add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core');
+
+function page_password_meta_box($post){
+?>
+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
+<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
+<?php
+}
+add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'advanced', 'core');
+
+function page_slug_meta_box($post){
+?>
+<label class="hidden" for="post_name"><?php _e('Page Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
+<?php
+}
+add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'advanced', 'core');
+
+function page_parent_meta_box($post){
+?>
+<label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label>
+<select name="parent_id" id="parent_id">
+<option value='0'><?php _e('Main Page (no parent)'); ?></option>
+<?php parent_dropdown($post->post_parent); ?>
+</select>
+<p><?php _e('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 deeply nested you can make pages.'); ?></p>
+<?php
+}
+add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'advanced', 'core');
+
+if ( 0 != count( get_page_templates() ) ) {
+	function page_template_meta_box($post){
+?>
+<label class="hidden" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
+<option value='default'><?php _e('Default Template'); ?></option>
+<?php page_template_dropdown($post->page_template); ?>
+</select>
+<p><?php _e('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 above.'); ?></p>
+<?php
+	}
+	add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'advanced', 'core');
+}
+
+function page_order_meta_box($post){
+?>
+<p><label class="hidden" for="menu_order"><?php _e('Page Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p>
+<p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p>
+<?php
+}
+add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'advanced', '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 ) {
+	function page_author_meta_box($post){
+		global $current_user, $user_ID;
+		$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;
+?>
+<label class="hidden" for="post_author_override"><?php _e('Page Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?>
+<?php
+	}
+	add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'advanced', 'core');
+}
+
+
+if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
+function page_revisions_meta_box($post) {
+	wp_list_post_revisions();
+}
+add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'advanced', 'core');
+endif;
+
+do_meta_boxes('page', 'advanced', $post);
+?>
+
+</div>
+</div>
+
+</div>
+
+</form>
+
+<script type="text/javascript">
+try{document.post.title.focus();}catch(e){}
+</script>
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -0,0 +1,237 @@
+<?php
+require_once('admin.php');
+
+// Handle bulk deletes
+if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) {
+	check_admin_referer('bulk-pages');
+	foreach( (array) $_GET['delete'] as $post_id_del ) {
+		$post_del = & get_post($post_id_del);
+
+		if ( !current_user_can('delete_page', $post_id_del) )
+			wp_die( __('You are not allowed to delete this page.') );
+
+		if ( $post_del->post_type == 'attachment' ) {
+			if ( ! wp_delete_attachment($post_id_del) )
+				wp_die( __('Error in deleting...') );
+		} else {
+			if ( !wp_delete_post($post_id_del) )
+				wp_die( __('Error in deleting...') );
+		}
+	}
+
+	$sendback = wp_get_referer();
+	if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php');
+	elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
+	$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
+
+	wp_redirect($sendback);
+	exit();
+} elseif ( !empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
+	 exit;
+}
+
+$title = __('Pages');
+$parent_file = 'edit.php';
+wp_enqueue_script('admin-forms');
+
+$post_stati  = array(	//	array( adj, noun )
+		'publish' => array(__('Published'), __('Published pages'), __ngettext_noop('Published (%s)', 'Published (%s)')),
+		'future' => array(__('Scheduled'), __('Scheduled pages'), __ngettext_noop('Scheduled (%s)', 'Scheduled (%s)')),
+		'pending' => array(__('Pending Review'), __('Pending pages'), __ngettext_noop('Pending Review (%s)', 'Pending Review (%s)')),
+		'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft (%s)', 'Drafts (%s)')),
+		'private' => array(__('Private'), __('Private pages'), __ngettext_noop('Private (%s)', 'Private (%s)'))
+	);
+
+$post_status_label = __('Manage Pages');
+$post_status_q = '';
+if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) {
+	$post_status_label = $post_stati[$_GET['post_status']][1];
+	$post_status_q = '&post_status=' . $_GET['post_status'];
+	$post_status_q .= '&perm=readable';
+}
+
+$query_str = "post_type=page&orderby=menu_order title&what_to_show=posts$post_status_q&posts_per_page=-1&posts_per_archive_page=-1&order=asc";
+
+$query_str = apply_filters('manage_pages_query', $query_str);
+wp($query_str);
+
+if ( is_singular() )
+	wp_enqueue_script( 'admin-comments' );
+require_once('admin-header.php');
+
+?>
+<div class="wrap">
+<form id="posts-filter" action="" method="get">
+<h2><?php
+// Use $_GET instead of is_ since they can override each other
+$h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes( $_GET['s'] ) ) ) : '';
+$h2_author = '';
+if ( isset($_GET['author']) && $_GET['author'] ) {
+	$author_user = get_userdata( (int) $_GET['author'] );
+	$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
+}
+printf( _c( '%1$s%2$s%3$s|You can reorder these: 1: Pages, 2: by {s}, 3: matching {s}' ), $post_status_label, $h2_author, $h2_search );
+?></h2>
+
+<ul class="subsubsub">
+<?php
+
+$avail_post_stati = get_available_post_statuses('page');
+
+$status_links = array();
+$num_posts = wp_count_posts('page', 'readable');
+$class = empty($_GET['post_status']) ? ' class="current"' : '';
+$status_links[] = "<li><a href=\"edit-pages.php\"$class>".__('All Pages')."</a>";
+foreach ( $post_stati as $status => $label ) {
+	$class = '';
+
+	if ( !in_array($status, $avail_post_stati) )
+		continue;
+
+	if ( $status == $_GET['post_status'] )
+		$class = ' class="current"';
+
+	$status_links[] = "<li><a href=\"edit-pages.php?post_status=$status\"$class>" .
+	sprintf(__ngettext($label[2][0], $label[2][1], $num_posts->$status), number_format_i18n( $num_posts->$status ) ) . '</a>';
+}
+echo implode(' |</li>', $status_links) . '</li>';
+unset($status_links);
+?>
+</ul>
+
+<?php if ( isset($_GET['post_status'] ) ) : ?>
+<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
+<?php
+endif;
+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="page.php?action=edit&amp;post=<?php echo $_GET['posted']; ?>"><?php _e('Edit page'); ?></a></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+endif;
+?>
+
+<p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label>
+	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
+</p>
+
+<div class="tablenav">
+
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+	$pagenum = 1;
+if( !$per_page || $per_page < 0 )
+	$per_page = 20;
+
+$num_pages = ceil(count($posts) / $per_page);
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'pagenum', '%#%' ),
+	'format' => '',
+	'total' => $num_pages,
+	'current' => $pagenum
+));
+
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft">
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
+<?php wp_nonce_field('bulk-pages'); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+<br class="clear" />
+
+<?php
+
+$all = !( $h2_search || $post_status_q );
+
+if ($posts) {
+?>
+<table class="widefat">
+  <thead>
+  <tr>
+<?php $posts_columns = wp_manage_pages_columns(); ?>
+<?php foreach($posts_columns as $post_column_key => $column_display_name) {
+	if ( 'cb' === $post_column_key )
+		$class = ' class="check-column"';
+	elseif ( 'comments' === $post_column_key )
+		$class = ' class="num"';
+	else
+		$class = '';
+?>
+	<th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th>
+<?php } ?>
+  </tr>
+  </thead>
+  <tbody>
+  <?php page_rows($posts, $pagenum, $per_page); ?>
+  </tbody>
+</table>
+
+</form>
+
+<div id="ajax-response"></div>
+
+<?php
+} else {
+?>
+</form>
+<p><?php _e('No pages found.') ?></p>
+<?php
+} // end if ($posts)
+?>
+
+<div class="tablenav">
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+<br class="clear" />
+</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" style="margin-top: .5em">
+<thead>
+  <tr>
+    <th scope="col"><?php _e('Comment') ?></th>
+    <th scope="col"><?php _e('Date') ?></th>
+    <th scope="col"><?php _e('Actions') ?></th>
+  </tr>
+</thead>
+<tbody id="the-comment-list" class="list:comment">
+<?php
+	foreach ($comments as $comment)
+		_wp_comment_row( $comment->comment_ID, 'detail', false, false );
+?>
+</tbody>
+</table>
+
+<?php
+
+endif; // comments
+endif; // posts;
+
+?>
+
+</div>
+
+<?php include('admin-footer.php'); ?>
--- a/wp-admin/edit-post-rows.php
+++ b/wp-admin/edit-post-rows.php
@@ -0,0 +1,206 @@
+<?php if ( ! defined('ABSPATH') ) die(); ?>
+<table class="widefat">
+	<thead>
+	<tr>
+
+<?php $posts_columns = wp_manage_posts_columns(); ?>
+<?php foreach($posts_columns as $post_column_key => $column_display_name) {
+	if ( 'cb' === $post_column_key )
+		$class = ' class="check-column"';
+	elseif ( 'comments' === $post_column_key )
+		$class = ' class="num"';
+	else
+		$class = '';
+?>
+	<th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th>
+<?php } ?>
+
+	</tr>
+	</thead>
+	<tbody>
+<?php
+if ( have_posts() ) {
+$bgcolor = '';
+add_filter('the_title','wp_specialchars');
+
+// Create array of post IDs.
+$post_ids = array();
+foreach ( $wp_query->posts as $a_post )
+	$post_ids[] = $a_post->ID;
+
+$comment_pending_count = get_pending_comments_num($post_ids);
+
+while (have_posts()) : the_post();
+$class = 'alternate' == $class ? '' : 'alternate';
+global $current_user;
+$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
+$title = get_the_title();
+if ( empty($title) )
+	$title = __('(no title)');
+?>
+	<tr id='post-<?php echo $id; ?>' class='<?php echo trim( $class . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top">
+
+<?php
+
+foreach($posts_columns as $column_name=>$column_display_name) {
+
+	switch($column_name) {
+
+	case 'cb':
+		?>
+		<th scope="row" class="check-column"><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /><?php } ?></th>
+		<?php
+		break;
+	case 'modified':
+	case 'date':
+		if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
+			$t_time = $h_time = __('Unpublished');
+		} else {
+			if ( 'modified' == $column_name ) {
+				$t_time = get_the_modified_time(__('Y/m/d g:i:s A'));
+				$m_time = $post->post_modified;
+				$time = get_post_modified_time('G', true);
+			} else {
+				$t_time = get_the_time(__('Y/m/d g:i:s A'));
+				$m_time = $post->post_date;
+				$time = get_post_time('G', true);
+			}
+			if ( ( abs(time() - $time) ) < 86400 ) {
+				if ( ( 'future' == $post->post_status) )
+					$h_time = sprintf( __('%s from now'), human_time_diff( $time ) );
+				else
+					$h_time = sprintf( __('%s ago'), human_time_diff( $time ) );
+			} else {
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
+			}
+		}
+		?>
+		<td><abbr title="<?php echo $t_time ?>"><?php echo apply_filters('post_date_column_time', $h_time, $post, $column_name) ?></abbr></td>
+		<?php
+		break;
+	case 'title':
+		?>
+		<td><strong><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><a class="row-title" href="post.php?action=edit&amp;post=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; } ?></strong>
+		<?php if ( !empty($post->post_password) ) { _e(' &#8212; <strong>Protected</strong>'); } elseif ('private' == $post->post_status) { _e(' &#8212; <strong>Private</strong>'); } ?></td>
+		<?php
+		break;
+
+	case 'categories':
+		?>
+		<td><?php
+		$categories = get_the_category();
+		if ( !empty( $categories ) ) {
+			$out = array();
+			foreach ( $categories as $c )
+				$out[] = "<a href='edit.php?category_name=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>";
+			echo join( ', ', $out );
+		} else {
+			_e('Uncategorized');
+		}
+		?></td>
+		<?php
+		break;
+
+	case 'tags':
+		?>
+		<td><?php
+		$tags = get_the_tags();
+		if ( !empty( $tags ) ) {
+			$out = array();
+			foreach ( $tags as $c )
+				$out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>";
+			echo join( ', ', $out );
+		} else {
+			_e('No Tags');
+		}
+		?></td>
+		<?php
+		break;
+
+	case 'comments':
+		?>
+		<td class="num"><div class="post-com-count-wrapper">
+		<?php
+		$left = isset($comment_pending_count) ? $comment_pending_count[$post->ID] : 0;
+		$pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
+		if ( $left )
+			echo '<strong>';
+		comments_number("<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>');
+		if ( $left )
+			echo '</strong>';
+		?>
+		</div></td>
+		<?php
+		break;
+
+	case 'author':
+		?>
+		<td><a href="edit.php?author=<?php the_author_ID(); ?>"><?php the_author() ?></a></td>
+		<?php
+		break;
+
+	case 'status':
+		?>
+		<td>
+		<a href="<?php the_permalink(); ?>" title="<?php echo attribute_escape(sprintf(__('View "%s"'), $title)); ?>" rel="permalink">
+		<?php
+		switch ( $post->post_status ) {
+			case 'publish' :
+			case 'private' :
+				_e('Published');
+				break;
+			case 'future' :
+				_e('Scheduled');
+				break;
+			case 'pending' :
+				_e('Pending Review');
+				break;
+			case 'draft' :
+				_e('Unpublished');
+				break;
+		}
+		?>
+		</a>
+		</td>
+		<?php
+		break;
+
+	case 'control_view':
+		?>
+		<td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td>
+		<?php
+		break;
+
+	case 'control_edit':
+		?>
+		<td><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
+		<?php
+		break;
+
+	case 'control_delete':
+		?>
+		<td><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td>
+		<?php
+		break;
+
+	default:
+		?>
+		<td><?php do_action('manage_posts_custom_column', $column_name, $id); ?></td>
+		<?php
+		break;
+	}
+}
+?>
+	</tr>
+<?php
+endwhile;
+} else {
+?>
+  <tr style='background-color: <?php echo $bgcolor; ?>'>
+    <td colspan="8"><?php _e('No posts found.') ?></td>
+  </tr>
+<?php
+} // end if ( have_posts() )
+?>
+	</tbody>
+</table>
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -1,93 +1,41 @@
 <?php
-/**
- * Edit tag form for inclusion in administration panels.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-// don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
-
-if ( empty($tag_ID) ) { ?>
-	<div id="message" class="updated"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
-<?php
-	return;
-}
-
-// Back compat hooks
-if ( 'category' == $taxonomy )
-	do_action('edit_category_form_pre', $tag );
-elseif ( 'link_category' == $taxonomy )
-	do_action('edit_link_category_form_pre', $tag );
-else
+if ( ! empty($tag_ID) ) {
+	$heading = __('Edit Tag');
+	$submit_text = __('Edit Tag');
+	$form = '<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">';
+	$action = 'editedtag';
+	$nonce_action = 'update-tag_' . $tag_ID;
 	do_action('edit_tag_form_pre', $tag);
-
-do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy);  ?>
+} else {
+	$heading = __('Add Tag');
+	$submit_text = __('Add Tag');
+	$form = '<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">';
+	$action = 'addtag';
+	$nonce_action = 'add-tag';
+	do_action('add_tag_form_pre', $tag);
+}
+?>

 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo $tax->labels->edit_item; ?></h2>
+<h2><?php echo $heading ?></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" />
-<input type="hidden" name="tag_ID" value="<?php echo esc_attr($tag->term_id) ?>" />
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy) ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
+<?php echo $form ?>
+<input type="hidden" name="action" value="<?php echo $action ?>" />
+<input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" />
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<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>
+			<th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" aria-required="true" />
+            <p><?php _e('The name is how the tag 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 _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>
+			<th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
+			<td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" 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></td>
 		</tr>
-<?php } ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
-		<tr class="form-field">
-			<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_tree' => $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 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 $tag->description; // textarea_escaped ?></textarea><br />
-			<span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
-		</tr>
-		<?php
-		// Back compat hooks
-		if ( 'category' == $taxonomy )
-			do_action('edit_category_form_fields', $tag);
-		elseif ( 'link_category' == $taxonomy )
-			do_action('edit_link_category_form_fields', $tag);
-		else
-			do_action('edit_tag_form_fields', $tag);
-
-		do_action($taxonomy . '_edit_form_fields', $tag, $taxonomy);
-		?>
 	</table>
-<?php
-// Back compat hooks
-if ( 'category' == $taxonomy )
-	do_action('edit_category_form', $tag);
-elseif ( 'link_category' == $taxonomy )
-	do_action('edit_link_category_form', $tag);
-else
-	do_action('edit_tag_form', $tag);
-
-do_action($taxonomy . '_edit_form', $tag, $taxonomy);
-
-submit_button( __('Update') );
-?>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
+<?php do_action('edit_tag_form', $tag); ?>
 </form>
 </div>
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -1,394 +1,217 @@
 <?php
-/**
- * Edit Tags Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- */
+require_once('admin.php');

-/** WordPress Administration Bootstrap */
-require_once('./admin.php');
-$tax = get_taxonomy( $taxnow );
-if ( !current_user_can( $tax->cap->manage_terms ) )
-	wp_die( __( 'Cheatin&#8217; uh?' ) );
+$title = __('Tags');
+$parent_file = 'edit.php';

-$wp_list_table = _get_list_table('WP_Terms_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+wp_reset_vars(array('action', 'tag'));

-$title = $tax->labels->name;
+if ( isset($_GET['deleteit']) && isset($_GET['delete_tags']) )
+	$action = 'bulk-delete';

-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 if ( 'link_category' == $tax->name ) {
-	$parent_file = 'link-manager.php';
-	$submenu_file = 'edit-tags.php?taxonomy=link_category';
-} else {
-	$parent_file = 'edit.php';
-	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
-}
+switch($action) {

-add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') );
+case 'addtag':

-switch ( $wp_list_table->current_action() ) {
+	check_admin_referer('add-tag');

-case 'add-tag':
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));

-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
-
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin&#8217; uh?' ) );
-
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	$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;
+	$ret = wp_insert_term($_POST['name'], 'post_tag', $_POST);
+	if ( $ret && !is_wp_error( $ret ) ) {
+		wp_redirect('edit-tags.php?message=1#addtag');
+	} else {
+		wp_redirect('edit-tags.php?message=4#addtag');
 	}
-
-	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;
-	}
+	$tag_ID = (int) $_GET['tag_ID'];
+	check_admin_referer('delete-tag_' .  $tag_ID);

-	if ( !isset( $_REQUEST['tag_ID'] ) ) {
-		wp_redirect( $location );
-		exit;
-	}
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));

-	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' .  $tag_ID );
+	wp_delete_term( $tag_ID, 'post_tag');

-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin&#8217; uh?' ) );
-
-	wp_delete_term( $tag_ID, $taxonomy );
-
-	$location = add_query_arg( 'message', 2, $location );
-	wp_redirect( $location );
+	wp_redirect('edit-tags.php?message=2');
 	exit;

 break;

 case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
+	check_admin_referer('bulk-tags');

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

-	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy );
+	$tags = $_GET['delete_tags'];
+	foreach( (array) $tags as $tag_ID ) {
+		wp_delete_term( $tag_ID, 'post_tag');
 	}

-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+	$location = 'edit-tags.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
+		if ( false !== strpos($referer, 'edit-tags.php') )
 			$location = $referer;
 	}

-	$location = add_query_arg( 'message', 6, $location );
-	wp_redirect( $location );
+	$location = add_query_arg('message', 6, $location);
+	wp_redirect($location);
 	exit;

 break;

 case 'edit':
-	$title = $tax->labels->edit_item;

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

-	$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-	include( './edit-tag-form.php' );
+	$tag = get_term($tag_ID, 'post_tag', OBJECT, 'edit');
+	include('edit-tag-form.php');

 break;

 case 'editedtag':
 	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+	check_admin_referer('update-tag_' . $tag_ID);

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

-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
-
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+	$ret = wp_update_term($tag_ID, 'post_tag', $_POST);

+	$location = 'edit-tags.php';
 	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
+		if ( false !== strpos($referer, 'edit-tags.php') )
 			$location = $referer;
 	}

 	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 3, $location );
+		$location = add_query_arg('message', 3, $location);
 	else
-		$location = add_query_arg( 'message', 5, $location );
+		$location = add_query_arg('message', 5, $location);

-	wp_redirect( $location );
+	wp_redirect($location);
 	exit;
 break;

 default:
-if ( ! empty($_REQUEST['_wp_http_referer']) ) {
-	$location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) );

-	if ( ! empty( $_REQUEST['paged'] ) )
-		$location = add_query_arg( 'paged', (int) $_REQUEST['paged'] );
-
-	wp_redirect( $location );
-	exit;
+if ( !empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
+	 exit;
 }

-$wp_list_table->prepare_items();
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}
-
-wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->cap->edit_terms) )
-	wp_enqueue_script('inline-edit-tax');
-
-if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
-	$help ='';
-	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>';
-	elseif ( 'link_category' == $taxonomy )
-		$help = '<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>';
-	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>';
-
-	if ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( 'You can delete link categories in the Bulk Action pulldown, but that action does not delete the links within the category. Instead, it moves them to the default link category.' ) . '</p>';
-	else
-		$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>';
-	elseif ( 'post_tag' == $taxonomy )
-		$help .= '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
-
-	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy  )
-
-		$help .= '<ul>' .
-		'<li>' . __( '<strong>Name</strong> - The name is how it appears on your site.' ) . '</li>';
-
-	if ( ! global_terms_enabled()  )
-	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy  )
-		$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>';
-
-	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy  )
-		$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/Posts_Categories_Screen" target="_blank">Documentation on Categories</a>' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="http://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
-	else
-		$help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Post_Tags_Screen" target="_blank">Documentation on Post Tags</a>' ) . '</p>';
-
-	$help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
-
-	add_contextual_help($current_screen, $help);
-	unset($help);
-}
+wp_enqueue_script( 'admin-tags' );
+wp_enqueue_script('admin-forms');

 require_once ('admin-header.php');

-if ( !current_user_can($tax->cap->edit_terms) )
-	wp_die( __('You are not allowed to edit this item.') );
-
-$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.');
-
+$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.');
 ?>

-<div class="wrap nosubsub">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title );
-if ( !empty($_REQUEST['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
-</h2>
-
-<?php if ( isset($_REQUEST['message']) && ( $msg = (int) $_REQUEST['message'] ) ) : ?>
-<div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></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); ?>" />
+<div class="wrap">

-<?php $wp_list_table->search_box( $tax->labels->search_items, 'tag' ); ?>
-
-</form>
-<br class="clear" />
-
-<div id="col-container">
-
-<div id="col-right">
-<div class="col-wrap">
-<form id="posts-filter" action="" method="post">
-<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_list_table->display(); ?>
-
-<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>
+<form id="posts-filter" action="" method="get">
+<?php if ( current_user_can('manage_categories') ) : ?>
+	<h2><?php printf(__('Manage Tags (<a href="%s">add new</a>)'), '#addtag') ?> </h2>
+<?php else : ?>
+	<h2><?php _e('Manage Tags') ?> </h2>
 <?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 -->
+<p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label>
+	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
+</p>

-<div id="col-left">
-<div class="col-wrap">
+<br class="clear" />
+
+<div class="tablenav">

 <?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+	$pagenum = 1;
+if( !$tagsperpage || $tagsperpage < 0 )
+	$tagsperpage = 20;

-if ( !is_null( $tax->labels->popular_items ) ) {
-	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 ) );
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'pagenum', '%#%' ),
+	'format' => '',
+	'total' => ceil(wp_count_terms('post_tag') / $tagsperpage),
+	'current' => $pagenum
+));

-	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) ) {
-	// Back compat hooks. Deprecated in preference to {$taxonomy}_pre_add_form
-	if ( 'category' == $taxonomy )
-		do_action('add_category_form_pre', (object)array('parent' => 0) );
-	elseif ( 'link_category' == $taxonomy )
-		do_action('add_link_category_form_pre', (object)array('parent' => 0) );
-	else
-		do_action('add_tag_form_pre', $taxonomy);
-
-	do_action($taxonomy . '_pre_add_form', $taxonomy);
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>

-<div class="form-wrap">
-<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', '_wpnonce_add-tag'); ?>
+<div class="alignleft">
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
+<?php wp_nonce_field('bulk-tags'); ?>
+</div>

-<div class="form-field form-required">
-	<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 it appears on your site.'); ?></p>
-</div>
-<?php if ( ! global_terms_enabled() ) : ?>
-<div class="form-field">
-	<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; // global_terms_enabled() ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
-<div class="form-field">
-	<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>
+<br class="clear" />
 </div>

+<br class="clear" />
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" class="check-column"><input type="checkbox" /></th>
+        <th scope="col"><?php _e('Name') ?></th>
+        <th scope="col" class="num" style="width: 90px"><?php _e('Posts') ?></th>
+	</tr>
+	</thead>
+	<tbody id="the-list" class="list:tag">
+<?php
+
+$searchterms = trim( $_GET['s'] );
+
+$count = tag_rows( $pagenum, $tagsperpage, $searchterms );
+?>
+	</tbody>
+</table>
+</form>
+
+<div class="tablenav">
+
 <?php
-if ( ! is_taxonomy_hierarchical($taxonomy) )
-	do_action('add_tag_form_fields', $taxonomy);
-do_action($taxonomy . '_add_form_fields', $taxonomy);
-
-submit_button( $tax->labels->add_new_item, 'button' );
-
-// Back compat hooks. Deprecated in preference to {$taxonomy}_add_form
-if ( 'category' == $taxonomy )
-	do_action('edit_category_form', (object)array('parent' => 0) );
-elseif ( 'link_category' == $taxonomy )
-	do_action('edit_link_category_form', (object)array('parent' => 0) );
-else
-	do_action('add_tag_form', $taxonomy);
-
-do_action($taxonomy . '_add_form', $taxonomy);
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
-</form></div>
-<?php } ?>
+<br class="clear" />
+</div>
+<br class="clear" />

 </div>
-</div><!-- /col-left -->

-</div><!-- /col-container -->
-</div><!-- /wrap -->
+<?php if ( current_user_can('manage_categories') ) : ?>

-<?php $wp_list_table->inline_edit(); ?>
+<br />
+<?php include('edit-tag-form.php'); ?>
+
+<?php endif; ?>

 <?php
 break;
 }

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

 ?>
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -1,263 +1,244 @@
 <?php
-/**
- * Edit Posts Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- */
+require_once('admin.php');

-/** WordPress Administration Bootstrap */
-require_once( './admin.php' );
-
-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?'));
-
-$wp_list_table = _get_list_table('WP_Posts_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
-
-// Back-compat for viewing comments of an entry
-foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
-	if ( ! empty( $_REQUEST[ $_redirect ] ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?p=' . absint( $_REQUEST[ $_redirect ] ) ) );
-		exit;
-	}
-}
-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';
-}
-
-$doaction = $wp_list_table->current_action();
-
-if ( $doaction ) {
+// Handle bulk deletes
+if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) {
 	check_admin_referer('bulk-posts');
+	foreach( (array) $_GET['delete'] as $post_id_del ) {
+		$post_del = & get_post($post_id_del);

-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
-	$sendback = add_query_arg( 'paged', $pagenum, $sendback );
-	if ( strpos($sendback, 'post.php') !== false )
-		$sendback = admin_url($post_new_file);
+		if ( !current_user_can('delete_post', $post_id_del) )
+			wp_die( __('You are not allowed to delete this post.') );

-	if ( 'delete_all' == $doaction ) {
-		$post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['post_status']);
-		if ( get_post_status_object($post_status) ) // Check the post status exists first
-			$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 ( isset( $_REQUEST['media'] ) ) {
-		$post_ids = $_REQUEST['media'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$post_ids = explode( ',', $_REQUEST['ids'] );
-	} elseif ( !empty( $_REQUEST['post'] ) ) {
-		$post_ids = array_map('intval', $_REQUEST['post']);
+		if ( $post_del->post_type == 'attachment' ) {
+			if ( ! wp_delete_attachment($post_id_del) )
+				wp_die( __('Error in deleting...') );
+		} else {
+			if ( !wp_delete_post($post_id_del) )
+				wp_die( __('Error in deleting...') );
+		}
 	}

-	if ( !isset( $post_ids ) ) {
-		wp_redirect( $sendback );
-		exit;
-	}
-
-	switch ( $doaction ) {
-		case 'trash':
-			$trashed = 0;
-			foreach( (array) $post_ids as $post_id ) {
-				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.') );
-
-				$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($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.') );
-
-				$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($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) )
-						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':
-			if ( isset($_REQUEST['bulk_edit']) ) {
-				$done = bulk_edit_posts($_REQUEST);
-
-				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;
-	}
-
-	$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status',  'post', 'bulk_edit', 'post_view'), $sendback );
+	$sendback = wp_get_referer();
+	if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('post-new.php');
+	elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
+	$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);

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

-$wp_list_table->prepare_items();
+$title = __('Posts');
+$parent_file = 'edit.php';
+wp_enqueue_script('admin-forms');

-wp_enqueue_script('inline-edit-post');
+list($post_stati, $avail_post_stati) = wp_edit_posts_query();

-$title = $post_type_object->labels->name;
+if ( 1 == count($posts) && is_singular() )
+	wp_enqueue_script( 'admin-comments' );
+require_once('admin-header.php');

-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_Screen" target="_blank">Documentation on Managing 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>' . __('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_Screen" target="_blank">Documentation on Managing Pages</a>') . '</p>' .
-	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-	);
-}
+if ( !isset( $_GET['paged'] ) )
+	$_GET['paged'] = 1;

-add_screen_option( 'per_page', array('label' => $title, 'default' => 20) );
-
-require_once('./admin-header.php');
 ?>
+
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
-if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
-</h2>
-
-<?php
-if ( isset($_REQUEST['posted']) && $_REQUEST['posted'] ) : $_REQUEST['posted'] = (int) $_REQUEST['posted']; ?>
-<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_REQUEST['posted'] ); ?>"><?php _e('View Post'); ?></a> | <a href="<?php echo get_edit_post_link( $_REQUEST['posted'] ); ?>"><?php _e('Edit Post'); ?></a></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
-endif; ?>
-
-<?php if ( isset($_REQUEST['locked']) || isset($_REQUEST['skipped']) || isset($_REQUEST['updated']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) ) { ?>
-<div id="message" class="updated"><p>
-<?php if ( isset($_REQUEST['updated']) && (int) $_REQUEST['updated'] ) {
-	printf( _n( '%s post updated.', '%s posts updated.', $_REQUEST['updated'] ), number_format_i18n( $_REQUEST['updated'] ) );
-	unset($_REQUEST['updated']);
-}
-
-if ( isset($_REQUEST['skipped']) && (int) $_REQUEST['skipped'] )
-	unset($_REQUEST['skipped']);
-
-if ( isset($_REQUEST['locked']) && (int) $_REQUEST['locked'] ) {
-	printf( _n( '%s item not updated, somebody is editing it.', '%s items not updated, somebody is editing them.', $_REQUEST['locked'] ), number_format_i18n( $_REQUEST['locked'] ) );
-	unset($_REQUEST['locked']);
-}
-
-if ( isset($_REQUEST['deleted']) && (int) $_REQUEST['deleted'] ) {
-	printf( _n( 'Item permanently deleted.', '%s items permanently deleted.', $_REQUEST['deleted'] ), number_format_i18n( $_REQUEST['deleted'] ) );
-	unset($_REQUEST['deleted']);
-}
-
-if ( isset($_REQUEST['trashed']) && (int) $_REQUEST['trashed'] ) {
-	printf( _n( 'Item moved to the Trash.', '%s items moved to the Trash.', $_REQUEST['trashed'] ), number_format_i18n( $_REQUEST['trashed'] ) );
-	$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
-	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($_REQUEST['trashed']);
-}
-
-if ( isset($_REQUEST['untrashed']) && (int) $_REQUEST['untrashed'] ) {
-	printf( _n( 'Item restored from the Trash.', '%s items restored from the Trash.', $_REQUEST['untrashed'] ), number_format_i18n( $_REQUEST['untrashed'] ) );
-	unset($_REQUEST['undeleted']);
-}
-
-$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI'] );
-?>
-</p></div>
-<?php } ?>
-
-<?php $wp_list_table->views(); ?>

 <form id="posts-filter" action="" method="get">
+<h2><?php
+if ( is_single() ) {
+	printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title));
+} else {
+	$post_status_label = _c('Manage Posts|manage posts header');
+	if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) )
+        $post_status_label = $post_stati[$_GET['post_status']][1];
+	if ( $post_listing_pageable && !is_archive() && !is_search() )
+		$h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label);
+	else
+		$h2_noun = $post_status_label;
+	// Use $_GET instead of is_ since they can override each other
+	$h2_author = '';
+	$_GET['author'] = (int) $_GET['author'];
+	if ( $_GET['author'] != 0 ) {
+		if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion
+			$h2_author = ' ' . __('by other authors');
+		} else {
+			$author_user = get_userdata( get_query_var( 'author' ) );
+			$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
+		}
+	}
+	$h2_search = isset($_GET['s'])   && $_GET['s']   ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : '';
+	$h2_cat    = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in &#8220;%s&#8221;'), single_cat_title('', false) ) : '';
+	$h2_tag    = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with &#8220;%s&#8221;'), single_tag_title('', false) ) : '';
+	$h2_month  = isset($_GET['m'])   && $_GET['m']   ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : '';
+	printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month );
+}
+?></h2>

-<?php $wp_list_table->search_box( $post_type_object->labels->search_items, 'post' ); ?>
-
-<input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
-<input type="hidden" name="post_type" class="post_type_page" value="<?php echo $post_type; ?>" />
-<?php if ( ! empty( $_REQUEST['show_sticky'] ) ) { ?>
-<input type="hidden" name="show_sticky" value="1" />
-<?php } ?>
-
-<?php $wp_list_table->display(); ?>
-
-</form>
-
+<ul class="subsubsub">
 <?php
-if ( $wp_list_table->has_items() )
-	$wp_list_table->inline_edit();
+$status_links = array();
+$num_posts = wp_count_posts( 'post', 'readable' );
+$class = empty( $_GET['post_status'] ) ? ' class="current"' : '';
+$status_links[] = "<li><a href='edit.php' $class>" . __('All Posts') . '</a>';
+foreach ( $post_stati as $status => $label ) {
+	$class = '';
+
+	if ( !in_array( $status, $avail_post_stati ) )
+		continue;
+
+	if ( empty( $num_posts->$status ) )
+		continue;
+	if ( $status == $_GET['post_status'] )
+		$class = ' class="current"';
+
+	$status_links[] = "<li><a href='edit.php?post_status=$status' $class>" .
+	sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>';
+}
+echo implode( ' |</li>', $status_links ) . '</li>';
+unset( $status_links );
+?>
+</ul>
+
+<?php if ( isset($_GET['post_status'] ) ) : ?>
+<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
+<?php
+endif;
+
+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="post.php?action=edit&amp;post=<?php echo $_GET['posted']; ?>"><?php _e('Edit post'); ?></a></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+endif;
 ?>

-<div id="ajax-response"></div>
+<p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
+	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
+	<input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
+</p>
+
+<div class="tablenav">
+
+<?php
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'paged', '%#%' ),
+	'format' => '',
+	'total' => $wp_query->max_num_pages,
+	'current' => $_GET['paged']
+));
+
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft">
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
+<?php wp_nonce_field('bulk-posts'); ?>
+<?php
+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_result = $wpdb->get_results( $arc_query );
+
+$month_count = count($arc_result);
+
+if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?>
+<select name='m'>
+<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option>
+<?php
+foreach ($arc_result as $arc_row) {
+	if ( $arc_row->yyear == 0 )
+		continue;
+	$arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
+
+	if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] )
+		$default = ' selected="selected"';
+	else
+		$default = '';
+
+	echo "<option$default value='$arc_row->yyear$arc_row->mmonth'>";
+	echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear";
+	echo "</option>\n";
+}
+?>
+</select>
+<?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);
+do_action('restrict_manage_posts');
+?>
+<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
+
+<?php } ?>
+</div>
+
 <br class="clear" />
 </div>

+<br class="clear" />
+
+<?php include( 'edit-post-rows.php' ); ?>
+
+</form>
+
+<div id="ajax-response"></div>
+
+<div class="tablenav">
+
 <?php
-include('./admin-footer.php');
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<br class="clear" />
+</div>
+
+<br class="clear" />
+
+<?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" style="margin-top: .5em">
+<thead>
+  <tr>
+    <th scope="col"><?php _e('Comment') ?></th>
+    <th scope="col"><?php _e('Date') ?></th>
+    <th scope="col"><?php _e('Actions') ?></th>
+  </tr>
+</thead>
+<tbody id="the-comment-list" class="list:comment">
+<?php
+	foreach ($comments as $comment)
+		_wp_comment_row( $comment->comment_ID, 'detail', false, false );
+?>
+</tbody>
+</table>
+
+<?php
+
+endif; // comments
+endif; // posts;
+
+?>
+
+</div>
+
+<?php include('admin-footer.php'); ?>
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -1,206 +1,50 @@
 <?php
-/**
- * WordPress Export Administration Screen
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** Load WordPress Bootstrap */
 require_once ('admin.php');
-
-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');
-
-function add_js() {
-?>
-<script type="text/javascript">
-//<![CDATA[
-	jQuery(document).ready(function($){
- 		var form = $('#export-filters'),
- 			filters = form.find('.export-filters');
- 		filters.hide();
- 		form.find('input:radio').change(function() {
-			filters.slideUp('fast');
-			switch ( $(this).val() ) {
-				case 'posts': $('#post-filters').slideDown(); break;
-				case 'pages': $('#page-filters').slideDown(); break;
-			}
- 		});
-	});
-//]]>
-</script>
-<?php
-}
-add_action( 'admin_head', 'add_js' );
-
-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 choose for the WXR file to include only certain posts or pages by setting the dropdown filters to  limit the export by category, author, date range by month, or publishing status.') . '</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_Screen" target="_blank">Documentation on Export</a>') . '</p>' .
-	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-);
+$parent_file = 'edit.php';

 if ( isset( $_GET['download'] ) ) {
-	$args = array();
-
-	if ( ! isset( $_GET['content'] ) || 'all' == $_GET['content'] ) {
-		$args['content'] = 'all';
-	} else if ( 'posts' == $_GET['content'] ) {
-		$args['content'] = 'post';
-
-		if ( $_GET['cat'] )
-			$args['category'] = (int) $_GET['cat'];
-
-		if ( $_GET['post_author'] )
-			$args['author'] = (int) $_GET['post_author'];
-
-		if ( $_GET['post_start_date'] || $_GET['post_end_date'] ) {
-			$args['start_date'] = $_GET['post_start_date'];
-			$args['end_date'] = $_GET['post_end_date'];
-		}
-
-		if ( $_GET['post_status'] )
-			$args['status'] = $_GET['post_status'];
-	} else if ( 'pages' == $_GET['content'] ) {
-		$args['content'] = 'page';
-
-		if ( $_GET['page_author'] )
-			$args['author'] = (int) $_GET['page_author'];
-
-		if ( $_GET['page_start_date'] || $_GET['page_end_date'] ) {
-			$args['start_date'] = $_GET['page_start_date'];
-			$args['end_date'] = $_GET['page_end_date'];
-		}
-
-		if ( $_GET['page_status'] )
-			$args['status'] = $_GET['page_status'];
-	} else {
-		$args['content'] = $_GET['content'];
-	}
-
-	export_wp( $args );
+	export_wp( $_GET['author'] );
 	die();
 }

 require_once ('admin-header.php');
-
-function export_date_options() {
-	global $wpdb, $wp_locale;
-
-	$months = $wpdb->get_results( "
-		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
-		FROM $wpdb->posts
-		WHERE post_type = 'post' AND post_status != 'auto-draft'
-		ORDER BY post_date DESC
-	" );
-
-	$month_count = count( $months );
-	if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
-		return;
-
-	foreach ( $months as $date ) {
-		if ( 0 == $date->year )
-			continue;
-
-		$month = zeroise( $date->month, 2 );
-		echo '<option value="' . $date->year . '-' . $month . '">' . $wp_locale->get_month( $month ) . ' ' . $date->year . '</option>';
-	}
-}
 ?>

 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
-
+<h2><?php _e('Export'); ?></h2>
 <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 in another WordPress installation to import this site.'); ?></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>
+<form action="" method="get">
+<h3><?php _e('Options'); ?></h3>

-<h3><?php _e( 'Choose what to export' ); ?></h3>
-<form action="" method="get" id="export-filters">
+<table class="form-table">
+<tr>
+<th><label for="author"><?php _e('Restrict Author'); ?></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='$o->ID'>$o->display_name</option>";
+}
+?>
+</select>
+</td>
+</tr>
+</table>
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?>" />
 <input type="hidden" name="download" value="true" />
-<p><label><input type="radio" name="content" value="all" checked="checked" /> <?php _e( 'All content' ); ?></label>
-<span class="description"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus and custom posts.' ); ?></span></p>
-
-<p><label><input type="radio" name="content" value="posts" /> <?php _e( 'Posts' ); ?></label></p>
-<ul id="post-filters" class="export-filters">
-	<li>
-		<label><?php _e( 'Categories:' ); ?></label>
-		<?php wp_dropdown_categories( array( 'show_option_all' => __('All') ) ); ?>
-	</li>
-	<li>
-		<label><?php _e( 'Authors:' ); ?></label>
-<?php
-		$authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'post'" );
-		wp_dropdown_users( array( 'include' => $authors, 'name' => 'post_author', 'multi' => true, 'show_option_all' => __('All') ) );
-?>
-	</li>
-	<li>
-		<label><?php _e( 'Date range:' ); ?></label>
-		<select name="post_start_date">
-			<option value="0"><?php _e( 'Start Date' ); ?></option>
-			<?php export_date_options(); ?>
-		</select>
-		<select name="post_end_date">
-			<option value="0"><?php _e( 'End Date' ); ?></option>
-			<?php export_date_options(); ?>
-		</select>
-	</li>
-	<li>
-		<label><?php _e( 'Status:' ); ?></label>
-		<select name="post_status">
-			<option value="0"><?php _e( 'All' ); ?></option>
-			<?php $post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
-			foreach ( $post_stati as $status ) : ?>
-			<option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
-			<?php endforeach; ?>
-		</select>
-	</li>
-</ul>
-
-<p><label><input type="radio" name="content" value="pages" /> <?php _e( 'Pages' ); ?></label></p>
-<ul id="page-filters" class="export-filters">
-	<li>
-		<label><?php _e( 'Authors:' ); ?></label>
-<?php
-		$authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'page'" );
-		wp_dropdown_users( array( 'include' => $authors, 'name' => 'page_author', 'multi' => true, 'show_option_all' => __('All') ) );
-?>
-	</li>
-	<li>
-		<label><?php _e( 'Date range:' ); ?></label>
-		<select name="page_start_date">
-			<option value="0"><?php _e( 'Start Date' ); ?></option>
-			<?php export_date_options(); ?>
-		</select>
-		<select name="page_end_date">
-			<option value="0"><?php _e( 'End Date' ); ?></option>
-			<?php export_date_options(); ?>
-		</select>
-	</li>
-	<li>
-		<label><?php _e( 'Status:' ); ?></label>
-		<select name="page_status">
-			<option value="0"><?php _e( 'All' ); ?></option>
-			<?php foreach ( $post_stati as $status ) : ?>
-			<option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
-			<?php endforeach; ?>
-		</select>
-	</li>
-</ul>
-
-<?php foreach ( get_post_types( array( '_builtin' => false, 'can_export' => true ), 'objects' ) as $post_type ) : ?>
-<p><label><input type="radio" name="content" value="<?php echo esc_attr( $post_type->name ); ?>" /> <?php echo esc_html( $post_type->label ); ?></label></p>
-<?php endforeach; ?>
-
-<?php submit_button( __('Download Export File'), 'secondary' ); ?>
+</p>
 </form>
 </div>

-<?php include('admin-footer.php'); ?>
+<?php
+
+
+include ('admin-footer.php');
+?>
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -1,42 +0,0 @@
-<?php
-/**
- * Your Rights administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** WordPress Administration Bootstrap */
-require_once( './admin.php' );
-
-$title = __( 'Freedoms' );
-$parent_file = 'index.php';
-
-include( './admin-header.php' );
-?>
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e( 'Freedoms' ); ?></h2>
-
-<p><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'http://wordpress.org/about/license/' ); ?></p>
-
-<ol start="0">
-	<li><?php _e( 'You have the freedom to run the program, for any purpose.' ); ?></li>
-	<li><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></li>
-	<li><?php _e( 'You have the freedom to redistribute copies of the original program so you can help your neighbor.' ); ?></li>
-	<li><?php _e( 'You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.' ); ?></li>
-</ol>
-
-<p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'http://wordpressfoundation.org/trademark-policy/' ); ?></p>
-
-<p><?php
-
-$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : 'http://wordpress.org/extend/plugins/';
-$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : 'http://wordpress.org/extend/themes/';
-
-printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, 'http://wordpress.org/about/license/' ); ?></p>
-
-<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="http://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
-
-</div>
-<?php include( './admin-footer.php' ); ?>
--- a/wp-admin/gears-manifest.php
+++ b/wp-admin/gears-manifest.php
@@ -1,24 +1,60 @@
 <?php
-/**
- * Defines the Gears manifest file for Google Gears offline storage.
- *
- * @package WordPress
- * @subpackage Administration
- */

-/**
- * Disable error reporting
- *
- * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
- */
-error_reporting(0);
+define( 'ABSPATH', dirname(dirname(__FILE__)) );
+define( 'WPINC', '/wp-includes' );

-/** Set ABSPATH for execution */
-define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
+function __() {}
+function add_filter() {}
+function attribute_escape() {}
+function apply_filters() {}
+function get_option() {}
+function is_lighttpd_before_150() {}
+function add_action() {}
+function do_action_ref_array() {}
+function get_bloginfo() {}
+function is_admin() {return true;}
+function site_url() {}
+function admin_url() {}
+function wp_guess_url() {}

-require(ABSPATH . '/wp-admin/includes/manifest.php');
+require(ABSPATH . '/wp-includes/script-loader.php');
+require(ABSPATH . '/wp-includes/version.php');

-$files = get_manifest();
+$wp_scripts = new WP_Scripts();
+wp_default_scripts($wp_scripts);
+
+$wp_styles = new WP_Styles();
+wp_default_styles($wp_styles);
+
+$defaults = $man_version = '';
+foreach ( $wp_scripts->registered as $script ) {
+	if ( empty($script->src) || strpos($script->src, 'tiny_mce_config.php') ) continue;
+	$ver = empty($script->ver) ? $wp_version : $script->ver;
+	$src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src );
+	$defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
+	$man_version .= $ver;
+}
+
+foreach ( $wp_styles->registered as $style ) {
+	if ( empty($style->src) ) continue;
+
+	$ver = empty($style->ver) ? $wp_version : $style->ver;
+	$src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src );
+	if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css';
+	$defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
+
+	if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) {
+		if ( is_bool( $style->extra['rtl'] ) )
+			$rtl_href = str_replace( '.css', '-rtl.css', $src );
+		else 
+			$rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
+
+		$defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n";
+	}
+	$man_version .= $ver;
+}
+
+$man_version = md5($man_version);

 header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
 header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
@@ -28,24 +64,146 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 ?>
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>",
+"version" : "<?php echo $man_version; ?>_20080810",
 "entries" : [
-<?php
-$entries = '';
+<?php echo $defaults; ?>

-foreach ( $files as $file ) {
-	// Set ignoreQuery, defaulting to true
-	$ignore_query = ( isset($file[2]) && !$file[2] ) ? '' : ', "ignoreQuery" : true ';
+{ "url" : "images/align-center.png" },
+{ "url" : "images/align-left.png" },
+{ "url" : "images/align-none.png" },
+{ "url" : "images/align-right.png" },
+{ "url" : "images/browse-happy.gif" },
+{ "url" : "images/bubble_bg.gif" },
+{ "url" : "images/comment-grey-bubble.png" },
+{ "url" : "images/comment-pill.gif" },
+{ "url" : "images/comment-stalk-classic.gif" },
+{ "url" : "images/comment-stalk-fresh.gif" },
+{ "url" : "images/comment-stalk-rtl.gif" },
+{ "url" : "images/date-button.gif" },
+{ "url" : "images/fade-butt.png" },
+{ "url" : "images/gear.png" },
+{ "url" : "images/logo-ghost.png" },
+{ "url" : "images/logo-login.gif" },
+{ "url" : "images/logo.gif" },
+{ "url" : "images/media-button-gallery.gif" },
+{ "url" : "images/media-button-image.gif" },
+{ "url" : "images/media-button-music.gif" },
+{ "url" : "images/media-button-other.gif" },
+{ "url" : "images/media-button-video.gif" },
+{ "url" : "images/media-buttons.gif" },
+{ "url" : "images/tab.png" },
+{ "url" : "images/tail.gif" },
+{ "url" : "images/toggle-arrow-rtl.gif" },
+{ "url" : "images/toggle-arrow.gif" },
+{ "url" : "images/wordpress-logo.png" },
+{ "url" : "images/xit.gif" },
+{ "url" : "images/loading-publish.gif" },
+{ "url" : "images/loading.gif" },
+{ "url" : "images/required.gif" },
+{ "url" : "images/no.png" },
+{ "url" : "images/yes.png" },

-	// If version is not set, just output the file
-	if ( !isset($file[1]) )
-		$entries .= '{ "url" : "' . $file[0] . '"' . $ignore_query . ' }' . "\n";
-	// Output url and src
-	else
-		$entries .= '{ "url" : "' . $file[0] . '", "src" : "' . $file[0] . '?' . $file[1] . '"' . $ignore_query . ' },' . "\n";
-}
+<?php if ( is_file(ABSPATH.'/wp-includes/js/tinymce/tiny_mce.js') ) { ?>
+{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/utils/validate.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311g" },
+{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311" },

-echo trim( trim($entries), ',' );
-?>
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311g" },
+{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },

+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311g" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },
+
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/fm.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/sflogo.png" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flash.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flv_player.swf" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/quicktime.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/realmedia.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/shockwave.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/trans.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" },
+<?php } ?>
+
+{ "url" : "../wp-includes/images/crystal/archive.png" },
+{ "url" : "../wp-includes/images/crystal/audio.png" },
+{ "url" : "../wp-includes/images/crystal/code.png" },
+{ "url" : "../wp-includes/images/crystal/default.png" },
+{ "url" : "../wp-includes/images/crystal/document.png" },
+{ "url" : "../wp-includes/images/crystal/interactive.png" },
+{ "url" : "../wp-includes/images/crystal/text.png" },
+{ "url" : "../wp-includes/images/crystal/video.png" },
+{ "url" : "../wp-includes/images/crystal/spreadsheet.png" },
+{ "url" : "../wp-includes/images/rss.png" },
+{ "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
+{ "url" : "../wp-includes/js/thickbox/tb-close.png" },
+{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" }
 ]}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;padding-left:16px;position:static;}.rtl #dashboard_right_now p.musub{padding-left:0;padding-right:16px;}#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;}.wp-list-table .site-deleted{background:#ff8573;}.wp-list-table .site-spammed{background:#faafaa;}.wp-list-table .site-archived{background:#ffebe8;}.wp-list-table .site-mature{background:#fecac2;}
				`@@ -1 +0,0 @@`
				#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;font-family:Tahoma,Arial,sans-serif;}#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-left:0;margin-right:20px;}.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:3px 3px 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{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;}
				`@@ -1 +0,0 @@`
				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;}
				`@@ -1 +0,0 @@`
				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;}#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;}
				`@@ -1 +0,0 @@`
				div.star{left:auto;right:0;}.star img,div.star a,div.star a:hover,div.star a:visited{right:auto;left:0;}.theme-listing .theme-item h3{font-style:normal;}#theme-information .theme-preview-img{float:right;margin:5px 15px 10px 25px;}#theme-information .action-button #cancel{float:right;}#theme-information .action-button #install{float:left;}.feature-filter .feature-group{float:right;}.feature-filter .feature-name{float:right;text-align:left;}.feature-filter .feature-group li{float:right;padding-right:0;padding-left:25px;}