diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index df64921b72..0dca1d1996 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -50,6 +50,20 @@ if ( ! is_user_logged_in() ) {
 
 if ( isset( $_GET['action'] ) ) :
 switch ( $action = $_GET['action'] ) :
+case 'fetch-list' :
+	require_once( './includes/default-list-tables.php' );
+
+	$class = $_GET['list_args']['class'];
+
+	if ( class_exists( $class ) ) {
+		global $current_screen;
+		$current_screen = (object) $_GET['list_args']['screen'];
+		$table = new $class;
+		$table->ajax_response();
+	}
+
+	die('-1');
+	break;
 case 'ajax-tag-search' :
 	if ( !current_user_can( 'edit_posts' ) )
 		die('-1');
@@ -515,52 +529,17 @@ case 'add-link-category' : // On the Fly
 	}
 	$x->send();
 	break;
-case 'add-link-cat' : // From Blogroll -> Categories
-	check_ajax_referer( 'add-link-category' );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	if ( '' === trim($_POST['name']) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'link-cat',
-			'id' => new WP_Error( 'name', __('You did not enter a category name.') )
-		) );
-		$x->send();
-	}
-
-	$r = wp_insert_term($_POST['name'], 'link_category', $_POST );
-	if ( is_wp_error( $r ) ) {
-		$x = new WP_AJAX_Response( array(
-			'what' => 'link-cat',
-			'id' => $r
-		) );
-		$x->send();
-	}
-
-	extract($r, EXTR_SKIP);
-
-	if ( !$link_cat = link_cat_row( $term_id ) )
-		die('0');
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'link-cat',
-		'id' => $term_id,
-		'position' => -1,
-		'data' => $link_cat
-	) );
-	$x->send();
-	break;
-case 'add-tag' : // From Manage->Tags
+case 'add-tag' :
 	check_ajax_referer( 'add-tag' );
 	$post_type = !empty($_POST['post_type']) ? $_POST['post_type'] : 'post';
 	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 	$tax = get_taxonomy($taxonomy);
 
-	$x = new WP_Ajax_Response();
-
 	if ( !current_user_can( $tax->cap->edit_terms ) )
 		die('-1');
 
+	$x = new WP_Ajax_Response();
+
 	$tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
 
 	if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
@@ -578,6 +557,9 @@ case 'add-tag' : // From Manage->Tags
 	if ( isset($_POST['screen']) )
 		set_current_screen($_POST['screen']);
 
+	require_once( './includes/default-list-tables.php' );
+	$table = new WP_Terms_Table( 'ajax' );
+
 	$level = 0;
 	$tag_full_name = false;
 	$tag_full_name = $tag->name;
@@ -588,10 +570,10 @@ case 'add-tag' : // From Manage->Tags
 			$tag_full_name = $_tag->name . ' — ' . $tag_full_name;
 			$level++;
 		}
-		$noparents = _tag_row( $tag, $level, $taxonomy );
+		$noparents = $table->single_row( $tag, $level, $taxonomy );
 	}
 	$tag->name = $tag_full_name;
-	$parents = _tag_row( $tag, 0, $taxonomy);
+	$parents = $table->single_row( $tag, 0, $taxonomy);
 
 	$x->add( array(
 		'what' => 'taxonomy',
@@ -600,7 +582,7 @@ case 'add-tag' : // From Manage->Tags
 	$x->add( array(
 		'what' => 'term',
 		'position' => $level,
-		'supplemental' => get_term( $tag->term_id, $taxonomy, ARRAY_A ) //Refetch as $tag has been contaminated by the full name.
+		'supplemental' => get_term( $tag->term_id, $taxonomy, ARRAY_A ) // Refetch as $tag has been contaminated by the full name.
 		) );
 	$x->send();
 	break;
@@ -642,28 +624,23 @@ case 'add-comment' :
 	check_ajax_referer( $action );
 	if ( !current_user_can( 'edit_posts' ) )
 		die('-1');
-	$search = isset($_POST['s']) ? $_POST['s'] : false;
-	$status = isset($_POST['comment_status']) ? $_POST['comment_status'] : 'all';
-	$per_page = isset($_POST['per_page']) ?  (int) $_POST['per_page'] + 8 : 28;
-	$start = isset($_POST['page']) ? ( intval($_POST['page']) * $per_page ) -1 : $per_page - 1;
-	if ( 1 > $start )
-		$start = 27;
 
-	$mode = isset($_POST['mode']) ? $_POST['mode'] : 'detail';
-	$p = isset($_POST['p']) ? $_POST['p'] : 0;
-	$comment_type = isset($_POST['comment_type']) ? $_POST['comment_type'] : '';
-	list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1, $p, $comment_type );
+	require_once( './includes/default-list-tables.php' );
+	$table = new WP_Comments_Table( 'ajax' );
+
+	global $comments;
+
+	if ( !$comments )
+		die('1');
 
 	if ( get_option('show_avatars') )
 		add_filter( 'comment_author', 'floated_admin_avatar' );
 
-	if ( !$comments )
-		die('1');
 	$x = new WP_Ajax_Response();
 	foreach ( (array) $comments as $comment ) {
 		get_comment( $comment );
 		ob_start();
-			_wp_comment_row( $comment->comment_ID, $mode, $status, true, true );
+			$table->single_row( $comment->comment_ID, $mode, $status, true, true );
 			$comment_list_item = ob_get_contents();
 		ob_end_clean();
 		$x->add( array(
@@ -681,10 +658,10 @@ case 'get-comments' :
 	if ( !current_user_can( 'edit_post', $post_ID ) )
 		die('-1');
 
-	$start = isset($_POST['start']) ? intval($_POST['start']) : 0;
-	$num = isset($_POST['num']) ? intval($_POST['num']) : 10;
+	require_once( './includes/default-list-tables.php' );
+	$table = new WP_Comments_Table( 'ajax' );
 
-	list($comments, $total) = _wp_get_comment_list( false, false, $start, $num, $post_ID );
+	global $comments;
 
 	if ( !$comments )
 		die('1');
@@ -694,7 +671,7 @@ case 'get-comments' :
 	foreach ( (array) $comments as $comment ) {
 		get_comment( $comment );
 		ob_start();
-			_wp_comment_row( $comment->comment_ID, 'single', false, false );
+			$table->single_row( $comment->comment_ID, 'single', false, false );
 			$comment_list_item .= ob_get_contents();
 		ob_end_clean();
 	}
@@ -707,6 +684,9 @@ case 'get-comments' :
 case 'replyto-comment' :
 	check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );
 
+	require_once( './includes/default-list-tables.php' );
+	$table = new WP_Comments_Table( 'ajax' );
+
 	$comment_post_ID = (int) $_POST['comment_post_ID'];
 	if ( !current_user_can( 'edit_post', $comment_post_ID ) )
 		die('-1');
@@ -759,7 +739,7 @@ case 'replyto-comment' :
 			require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
 			_wp_dashboard_recent_comments_row( $comment, false );
 		} else {
-			_wp_comment_row( $comment->comment_ID, $mode, false, $checkbox );
+			$table->single_row( $comment->comment_ID, $mode, false, $checkbox );
 		}
 		$comment_list_item = ob_get_contents();
 	ob_end_clean();
@@ -795,13 +775,16 @@ case 'edit-comment' :
 	if ( get_option('show_avatars') && 'single' != $mode )
 		add_filter( 'comment_author', 'floated_admin_avatar' );
 
-	$x = new WP_Ajax_Response();
+	require_once( './includes/default-list-tables.php' );
+	$table = new WP_Comments_Table( 'ajax' );
 
 	ob_start();
-		_wp_comment_row( $comment_id, $mode, $comments_listing, $checkbox );
+		$table->single_row( $comment_id, $mode, $comments_listing, $checkbox );
 		$comment_list_item = ob_get_contents();
 	ob_end_clean();
 
+	$x = new WP_Ajax_Response();
+
 	$x->add( array(
 		'what' => 'edit_comment',
 		'id' => $comment->comment_ID,
@@ -941,10 +924,13 @@ case 'add-user' :
 	}
 	$user_object = new WP_User( $user_id );
 
+	require_once( './includes/default-list-tables.php' );
+	$table = new WP_Users_Table( 'ajax' );
+
 	$x = new WP_Ajax_Response( array(
 		'what' => 'user',
 		'id' => $user_id,
-		'data' => user_row( $user_object, '', $user_object->roles[0] ),
+		'data' => $table->single_row( $user_object, '', $user_object->roles[0] ),
 		'supplemental' => array(
 			'show-link' => sprintf(__( 'User <a href="#%s">%s</a> added' ), "user-$user_id", $user_object->user_login),
 			'role' => $user_object->roles[0]
@@ -1231,16 +1217,11 @@ case 'inline-save':
 	// update the post
 	edit_post();
 
-	if ( in_array( $_POST['post_type'], get_post_types( array( 'show_ui' => true ) ) ) ) {
-		$post = array();
-		$post[] = get_post($_POST['post_ID']);
-		if ( is_post_type_hierarchical( $_POST['post_type'] ) ) {
-			page_rows( $post );
-		} else {
-			$mode = $_POST['post_view'];
-			post_rows( $post );
-		}
-	}
+	require_once( './includes/default-list-tables.php' );
+	$table = new WP_Posts_Table( 'ajax' );
+
+	$mode = $_POST['post_view'];
+	$table->display_rows( array( get_post( $_POST['post_ID'] ) ) );
 
 	exit;
 	break;
@@ -1258,41 +1239,30 @@ case 'inline-save-tax':
 	if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) )
 		die(-1);
 
-	switch ($_POST['tax_type']) {
-		case 'link-cat' :
-			$updated = wp_update_term($id, 'link_category', $_POST);
+	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 
-			if ( $updated && !is_wp_error($updated) )
-				echo link_cat_row($updated['term_id']);
-			else
-				die( __('Category not updated.') );
+	$tag = get_term( $id, $taxonomy );
+	$_POST['description'] = $tag->description;
 
-			break;
-		case 'tag' :
-			$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+	$updated = wp_update_term($id, $taxonomy, $_POST);
+	if ( $updated && !is_wp_error($updated) ) {
+		$tag = get_term( $updated['term_id'], $taxonomy );
+		if ( !$tag || is_wp_error( $tag ) ) {
+			if ( is_wp_error($tag) && $tag->get_error_message() )
+				die( $tag->get_error_message() );
+			die( __('Item not updated.') );
+		}
 
-			$tag = get_term( $id, $taxonomy );
-			$_POST['description'] = $tag->description;
+		set_current_screen( 'edit-' . $taxonomy );
 
-			$updated = wp_update_term($id, $taxonomy, $_POST);
-			if ( $updated && !is_wp_error($updated) ) {
-				$tag = get_term( $updated['term_id'], $taxonomy );
-				if ( !$tag || is_wp_error( $tag ) ) {
-					if ( is_wp_error($tag) && $tag->get_error_message() )
-						die( $tag->get_error_message() );
-					die( __('Item not updated.') );
-				}
+		require_once( './includes/default-list-tables.php' );
+		$table = new WP_Terms_Table( 'ajax' );
 
-				set_current_screen( 'edit-' . $taxonomy );
-
-				echo _tag_row($tag, 0, $taxonomy);
-			} else {
-				if ( is_wp_error($updated) && $updated->get_error_message() )
-					die( $updated->get_error_message() );
-				die( __('Item not updated.') );
-			}
-
-			break;
+		echo $table->single_row( $tag, 0, $taxonomy );
+	} else {
+		if ( is_wp_error($updated) && $updated->get_error_message() )
+			die( $updated->get_error_message() );
+		die( __('Item not updated.') );
 	}
 
 	exit;
diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index abacd39f50..7a0f559511 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -1 +1 @@
-html{background-color:#f7f6f1;}* html input,* html .widget{border-color:#8cbdd5;}textarea,input[type="text"],input[type="password"],input[type="file"],input[type="button"],input[type="submit"],input[type="reset"],select{border-color:#dfdfdf;background-color:#fff;}kbd,code{background:#eaeaea;}input[readonly]{background-color:#eee;}.find-box-search{border-color:#dfdfdf;background-color:#f1f1f1;}.find-box{background-color:#f1f1f1;}.find-box-inside{background-color:#fff;}a.page-numbers:hover{border-color:#999;}body,#wpbody,.form-table .pre{color:#333;}body>#upload-menu{border-bottom-color:#fff;}#postcustomstuff table,#your-profile fieldset,#rightnow,div.dashboard-widget,#dashboard-widgets p.dashboard-widget-links,#replyrow #ed_reply_toolbar input{border-color:#ccc;}#poststuff .inside label.spam,#poststuff .inside label.deleted{color:red;}#poststuff .inside label.waiting{color:orange;}#poststuff .inside label.approved{color:green;}#postcustomstuff table{border-color:#dfdfdf;background-color:#f9f9f9;}#postcustomstuff thead th{background-color:#f1f1f1;}#postcustomstuff table input,#postcustomstuff table textarea{border-color:#dfdfdf;background-color:#fff;}.widefat{border-color:#dfdfdf;background-color:#fff;}div.dashboard-widget-error{background-color:#c43;}div.dashboard-widget-notice{background-color:#cfe1ef;}div.dashboard-widget-submit{border-top-color:#ccc;}div.tabs-panel,ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{border-color:#dfdfdf;}ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{background-color:#f1f1f1;}input.disabled,textarea.disabled{background-color:#ccc;}.login #backtoblog a:hover,#plugin-information .action-button a,#plugin-information .action-button a:hover,#plugin-information .action-button a:visited{color:#fff;}.widget .widget-top,.postbox h3,.stuffbox h3{background:#d5e6f2 url("../images/blue-grad.png") repeat-x left top;text-shadow:#fff 0 1px 0;}.form-table th,.form-wrap label{color:#222;text-shadow:#fff 0 1px 0;}.description,.form-wrap p{color:#666;}strong .post-com-count span{background-color:#21759b;}.sorthelper{background-color:#ccf3fa;}.ac_match,.subsubsub a.current{color:#000;}.wrap h2{color:#093e56;}.ac_over{background-color:#f0f0b8;}.ac_results{background-color:#fff;border-color:#808080;}.ac_results li{color:#101010;}.alt .alternate{background-color:#edfbfc;}.available-theme a.screenshot{background-color:#f1f1f1;border-color:#ddd;}.bar{background-color:#e8e8e8;border-right-color:#99d;}#media-upload,#media-upload .media-item .slidetoggle{background:#fff;}#media-upload .slidetoggle{border-top-color:#dfdfdf;}.error,.login #login_error{background-color:#ffebe8;border-color:#c00;}.error a{color:#c00;}.form-invalid{background-color:#ffebe8!important;}.form-invalid input,.form-invalid select{border-color:#c00!important;}.submit{border-color:#8cbdd5;}.highlight{background-color:#e4f2fd;color:#d54e21;}.howto,.nonessential,#edit-slug-box,.form-input-tip,.rss-widget span.rss-date,.subsubsub{color:#666;}.media-item{border-bottom-color:#dfdfdf;}#wpbody-content #media-items .describe{border-top-color:#dfdfdf;}.media-upload-form label.form-help,td.help{color:#9a9a9a;}.post-com-count{background-image:url(../images/bubble_bg.gif);color:#fff;}.post-com-count span{background-color:#bbb;color:#fff;}.post-com-count:hover span{background-color:#d54e21;}.quicktags,.search{background-color:#ccc;color:#000;}.side-info h5{border-bottom-color:#dadada;}.side-info ul{color:#666;}.button,.button-secondary,.submit input,input[type=button],input[type=submit]{border-color:#dfdfdf;color:#464646;}.button:hover,.button-secondary:hover,.submit input:hover,input[type=button]:hover,input[type=submit]:hover{color:#000;border-color:#adaca7;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;text-shadow:rgba(255,255,255,1) 0 1px 0;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}input.button-primary,button.button-primary,a.button-primary{border-color:#5b86ab;font-weight:bold;color:#fff;background:#5580a6 url(../images/button-grad-vs.png) repeat-x scroll left top;text-shadow:rgba(0,0,0,0.3) 0 -1px 0;}input.button-primary:active,button.button-primary:active,a.button-primary:active{background:#21759b url(../images/button-grad-active-vs.png) repeat-x scroll left top;color:#eaf2fa;}input.button-primary:hover,button.button-primary:hover,a.button-primary:hover,a.button-primary:focus,a.button-primary:active{border-color:#2e5475;color:#eaf2fa;}.button-disabled,.button[disabled],.button:disabled,.button-secondary[disabled],.button-secondary:disabled,a.button.disabled{color:#aaa!important;border-color:#ddd!important;}.button-primary-disabled,.button-primary[disabled],.button-primary:disabled{color:#B0C3E2!important;background:#6590A6!important;}a:hover,a:active,a:focus{color:#d54e21;}#wphead #viewsite a:hover,#adminmenu a:hover,#adminmenu ul.wp-submenu a:hover,#the-comment-list .comment a:hover,#rightnow a:hover,#media-upload a.del-link:hover,div.dashboard-widget-submit input:hover,.subsubsub a:hover,.subsubsub a.current:hover,.ui-tabs-nav a:hover,.plugins .inactive a:hover,#all-plugins-table .plugins .inactive a:hover,#search-plugins-table .plugins .inactive a:hover{color:#d54e21;}#the-comment-list .comment-item,#dashboard-widgets #dashboard_quick_press form p.submit{border-color:#dfdfdf;}#side-sortables .category-tabs .tabs a,#side-sortables .add-menu-item-tabs .tabs a{color:#333;}#rightnow .rbutton{background-color:#ebebeb;color:#264761;}.submitbox .submit{background-color:#464646;color:#ccc;}.plugins a.delete:hover,#all-plugins-table .plugins a.delete:hover,#search-plugins-table .plugins a.delete:hover,.submitbox .submitdelete{color:#f00;border-bottom-color:#f00;}.submitbox .submitdelete:hover,#media-items a.delete:hover{color:#fff;background-color:#f00;border-bottom-color:#f00;}#normal-sortables .submitbox .submitdelete:hover{color:#000;background-color:#f00;border-bottom-color:#f00;}.tablenav .dots{border-color:transparent;}.tablenav .next,.tablenav .prev{border-color:transparent;color:#21759b;}.tablenav .next:hover,.tablenav .prev:hover{border-color:transparent;color:#d54e21;}.updated,.login .message{background-color:#ffffe0;border-color:#e6db55;}.update-message{color:#000;}a.page-numbers{border-bottom-color:#b8d3e2;}.commentlist li{border-bottom-color:#ccc;}.widefat td,.widefat th,#install-plugins .plugins td,#install-plugins .plugins th{border-color:#dfdfdf;}.widefat th{text-shadow:rgba(255,255,255,0.8) 0 1px 0;}.widefat thead tr th,.widefat tfoot tr th,h3.dashboard-widget-title,h3.dashboard-widget-title span,h3.dashboard-widget-title small,.find-box-head{color:#333;background:#d5e6f2 url(../images/blue-grad.png) repeat-x scroll left top;}h3.dashboard-widget-title small a{color:#d7d7d7;}h3.dashboard-widget-title small a:hover{color:#fff;}a,#adminmenu a,#poststuff #edButtonPreview,#poststuff #edButtonHTML,#the-comment-list p.comment-author strong a,#media-upload a.del-link,#media-items a.delete,.plugins a.delete,.ui-tabs-nav a{color:#1c6280;}body.press-this .tabs a,body.press-this .tabs a:hover{border-color:#c6d9e9;border-bottom-color:#fff;color:#d54e21;}#adminmenu #awaiting-mod,#adminmenu .update-plugins,#sidemenu a .update-plugins,#rightnow .reallynow,#plugin-information .action-button{background-color:#d54e21;color:#fff;}#adminmenu li a:hover #awaiting-mod,#adminmenu li a:hover .update-plugins,#sidemenu li a:hover .update-plugins{background-color:#264761;color:#fff;}#adminmenu li.current a #awaiting-mod,#adminmenu li.current a .update-plugins,#adminmenu li.wp-has-current-submenu a .update-plugins,#adminmenu li.wp-has-current-submenu a .update-plugins{background-color:#ddd;color:#000;text-shadow:none;-moz-box-shadow:rgba(0,0,0,0.2) 0 -1px 0;-khtml-box-shadow:rgba(0,0,0,0.2) 0 -1px 0;-webkit-box-shadow:rgba(0,0,0,0.2) 0 -1px 0;box-shadow:rgba(0,0,0,0.2) 0 -1px 0;}#adminmenu li.current a:hover #awaiting-mod,#adminmenu li.current a:hover .update-plugins,#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod,#adminmenu li.wp-has-current-submenu a:hover .update-plugins{background-color:#264761;color:#fff;}div#media-upload-header,div#plugin-information-header{background-color:#f9f9f9;border-bottom-color:#dfdfdf;}#currenttheme img{border-color:#666;}#dashboard_secondary div.dashboard-widget-content ul li a{background-color:#f9f9f9;}input.readonly,textarea.readonly{background-color:#ddd;}#ed_toolbar input,#ed_reply_toolbar input{background:#fff url("../images/fade-butt.png") repeat-x 0 -2px;}#editable-post-name{background-color:#fffbcc;}#edit-slug-box strong,.tablenav .displaying-num,#submitted-on{color:#777;}.login #nav a{color:#21759b!important;}.login #nav a:hover{color:#d54e21!important;}#footer,#footer-upgrade{background:#1d507d;color:#b6d1e4;}#media-items,.imgedit-group{border-color:#dfdfdf;}.checkbox,.side-info,.plugins tr,.postbox,#your-profile #rich_editing{background-color:#fff;}.plugins .inactive,.plugins .inactive th,.plugins .inactive td,tr.inactive+tr.plugin-update-tr .plugin-update{background-color:#ebeeef;}.plugin-update-tr .update-message{background-color:#fffbe4;border-color:#dfdfdf;}.plugins .active,.plugins .active th,.plugins .active td{color:#000;}.plugins .inactive a{color:#579;}#the-comment-list tr.undo,#the-comment-list div.undo{background-color:#f4f4f4;}#the-comment-list .unapproved{background-color:#ffffe0;}#the-comment-list .approve a{color:#006505;}#the-comment-list .unapprove a{color:#d98500;}table.widefat span.delete a,table.widefat span.trash a,table.widefat span.spam a,#dashboard_recent_comments .delete a,#dashboard_recent_comments .trash a,#dashboard_recent_comments .spam a{color:#bc0b0b;}.widget,#widget-list .widget-top,.postbox,#titlediv,#poststuff .postarea,.stuffbox{border-color:#dfdfdf;}.widget,.postbox{background-color:#fff;}.ui-sortable .postbox h3{color:#093e56;}.widget .widget-top,.ui-sortable .postbox h3:hover{color:#000;}.curtime #timestamp{background-image:url(../images/date-button.gif);}#quicktags #ed_link{color:#00f;}#rightnow .youhave{background-color:#f0f6fb;}#rightnow a{color:#448abd;}.tagchecklist span a,#bulk-titles div a{background:url(../images/xit.gif) no-repeat;}.tagchecklist span a:hover,#bulk-titles div a:hover{background:url(../images/xit.gif) no-repeat -10px 0;}#update-nag,.update-nag{background-color:#FFFBCC;border-color:#E6DB55;color:#555;}.login #backtoblog a{color:#ccc;}#wphead{background-color:#1d507d;}body.login{border-top-color:#093e56;}#wphead h1 a{color:#fff;}#user_info{color:#b6d1e4;}#user_info a:link,#user_info a:visited,#footer a:link,#footer a:visited{color:#fff;text-decoration:none;}#user_info a:hover,#user_info a:active,#footer a:hover,#footer a:active{text-decoration:underline;}div#media-upload-error,.file-error,abbr.required,.widget-control-remove:hover,table.widefat .delete a:hover,table.widefat .trash a:hover,table.widefat .spam a:hover,#dashboard_recent_comments .delete a:hover,#dashboard_recent_comments .trash a:hover,#dashboard_recent_comments .spam a:hover{color:#f00;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;}#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;}#quicktags{border-color:#dfdfdf;background-color:#dfdfdf;}#ed_toolbar input{border-color:#c3c3c3;}#ed_toolbar input:hover{border-color:#aaa;background:#ddd;}#poststuff .wp_themeSkin .mceStatusbar{border-color:#ededed;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{background-color:#f2f1eb;border-color:#dfdfdf;color:#999;}#poststuff #editor-toolbar .active{border-bottom-color:#e3eef7;background-color:#e3eef7;color:#333;}#post-status-info{background-color:#ededed;}.wp_themeSkin *,.wp_themeSkin a:hover,.wp_themeSkin a:link,.wp_themeSkin a:visited,.wp_themeSkin a:active{color:#000;}.wp_themeSkin iframe{background:#fff;}.wp_themeSkin .mceStatusbar{color:#000;background-color:#f5f5f5;}.wp_themeSkin .mceButton{background-color:#e9e8e8;border-color:#b2b2b2;}.wp_themeSkin a.mceButtonEnabled:hover,.wp_themeSkin a.mceButtonActive,.wp_themeSkin a.mceButtonSelected{background-color:#d5d5d5;border-color:#777!important;}.wp_themeSkin .mceButtonDisabled{border-color:#ccc!important;}.wp_themeSkin .mceListBox .mceText,.wp_themeSkin .mceListBox .mceOpen{border-color:#b2b2b2;background-color:#d5d5d5;}.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,.wp_themeSkin .mceListBoxHover .mceOpen,.wp_themeSkin .mceListBoxSelected .mceOpen,.wp_themeSkin .mceListBoxSelected .mceText{border-color:#777!important;background-color:#d5d5d5;}.wp_themeSkin table.mceListBoxEnabled:hover .mceText,.wp_themeSkin .mceListBoxHover .mceText{border-color:#777!important;}.wp_themeSkin select.mceListBox{border-color:#b2b2b2;background-color:#fff;}.wp_themeSkin .mceSplitButton a.mceAction,.wp_themeSkin .mceSplitButton a.mceOpen{border-color:#b2b2b2;}.wp_themeSkin .mceSplitButton a.mceOpen:hover,.wp_themeSkin .mceSplitButtonSelected a.mceOpen,.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,.wp_themeSkin .mceSplitButton a.mceAction:hover{background-color:#d5d5d5;border-color:#777!important;}.wp_themeSkin .mceSplitButtonActive{background-color:#b2b2b2;}.wp_themeSkin div.mceColorSplitMenu table{background-color:#ebebeb;border-color:#b2b2b2;}.wp_themeSkin .mceColorSplitMenu a{border-color:#b2b2b2;}.wp_themeSkin .mceColorSplitMenu a.mceMoreColors{border-color:#fff;}.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover{border-color:#0a246a;background-color:#b6bdd2;}.wp_themeSkin a.mceMoreColors:hover{border-color:#0a246a;}.wp_themeSkin .mceMenu{border-color:#ddd;}.wp_themeSkin .mceMenu table{background-color:#ebeaeb;}.wp_themeSkin .mceMenu .mceText{color:#000;}.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,.wp_themeSkin .mceMenu .mceMenuItemActive{background-color:#f5f5f5;}.wp_themeSkin td.mceMenuItemSeparator{background-color:#aaa;}.wp_themeSkin .mceMenuItemTitle a{background-color:#ccc;border-bottom-color:#aaa;}.wp_themeSkin .mceMenuItemTitle span.mceText{color:#000;}.wp_themeSkin .mceMenuItemDisabled .mceText{color:#888;}#quicktags,.wp_themeSkin tr.mceFirst td.mceToolbar{background:#d5e6f2 url("../images/ed-bg-vs.gif") repeat-x scroll left top;}.wp_themeSkin tr.mceFirst td.mceToolbar{border-color:#dfdfdf;}.wp-admin #mceModalBlocker{background:#000;}.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft{background:#444;border-left:1px solid #999;border-top:1px solid #999;-moz-border-radius:4px 0 0 0;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px;}.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight{background:#444;border-right:1px solid #999;border-top:1px solid #999;border-top-right-radius:4px;-khtml-border-top-right-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius:0 4px 0 0;}.wp-admin .clearlooks2 .mceMiddle .mceLeft{background:#f1f1f1;border-left:1px solid #999;}.wp-admin .clearlooks2 .mceMiddle .mceRight{background:#f1f1f1;border-right:1px solid #999;}.wp-admin .clearlooks2 .mceBottom{background:#f1f1f1;border-bottom:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceLeft{background:#f1f1f1;border-bottom:1px solid #999;border-left:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceCenter{background:#f1f1f1;border-bottom:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceRight{background:#f1f1f1;border-bottom:1px solid #999;border-right:1px solid #999;}.wp-admin .clearlooks2 .mceFocus .mceTop span{color:#e5e5e5;}#editorcontainer,#post-status-info,#titlediv #title,.editwidget .widget-inside{border-color:#dfdfdf;}#titlediv #title{background-color:#fff;}#tTips p#tTips_inside{background-color:#ddd;color:#333;}#timestampdiv input,#namediv input,#poststuff .inside .the-tagcloud{border-color:#dfdfdf;}#adminmenu *{border-color:#dfdfdf;}#adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;}.folded #adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;}#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -207px;}#adminmenu .wp-has-submenu:hover .wp-menu-toggle,#adminmenu .wp-menu-open .wp-menu-toggle{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -109px;}#adminmenu a.menu-top{background:#eaf3fa url(../images/menu-bits-vs.gif) repeat-x scroll left -379px;}#adminmenu .wp-submenu a{background:#fff url(../images/menu-bits-vs.gif) no-repeat scroll 0 -310px;}#adminmenu .wp-has-current-submenu ul li a{background:none;}#adminmenu .wp-has-current-submenu ul li a.current{background:url(../images/menu-dark.gif) top left no-repeat!important;}#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,#adminmenu .menu-top .current{background:#3c6b95 url(../images/menu-bits-vs.gif) top left repeat-x;border-color:#1d507d;color:#fff;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;}#adminmenu li.wp-has-current-submenu .wp-submenu,#adminmenu li.wp-has-current-submenu ul li a{border-color:#aaa!important;}#adminmenu li.wp-has-current-submenu ul li a{background:url(../images/menu-dark.gif) bottom left no-repeat!important;}#adminmenu li.wp-has-current-submenu ul{border-bottom-color:#aaa;}#adminmenu li.menu-top .current:hover{border-color:#6583c0;}#adminmenu .wp-submenu .current a.current{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll 0 -289px;}#adminmenu .wp-submenu a:hover{background-color:#eaf2fa!important;color:#333!important;}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover{color:#333;background-color:#f5f5f5;background-image:none;border-color:#e3e3e3;text-shadow:rgba(255,255,255,1) 0 1px 0;}#adminmenu .wp-submenu ul{background-color:#fff;}.folded #adminmenu li.menu-top,#adminmenu .wp-submenu .wp-submenu-head{background-color:#eaf2fa;}.folded #adminmenu li.wp-has-current-submenu,.folded #adminmenu li.menu-top.current{background-color:#bbd8e7;}#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head{background-color:#bbd8e7;border-color:#8cbdd5;}#adminmenu div.wp-submenu{background-color:transparent;}#adminmenu .menu-icon-dashboard div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -61px -33px;}#adminmenu .menu-icon-dashboard:hover div.wp-menu-image,#adminmenu .menu-icon-dashboard.wp-has-current-submenu div.wp-menu-image,#adminmenu .menu-icon-dashboard.current div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -61px -1px;}#adminmenu .menu-icon-post div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -272px -33px;}#adminmenu .menu-icon-post:hover div.wp-menu-image,#adminmenu .menu-icon-post.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -272px -1px;}#adminmenu .menu-icon-media div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -121px -33px;}#adminmenu .menu-icon-media:hover div.wp-menu-image,#adminmenu .menu-icon-media.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -121px -1px;}#adminmenu .menu-icon-links div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -91px -33px;}#adminmenu .menu-icon-links:hover div.wp-menu-image,#adminmenu .menu-icon-links.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -91px -1px;}#adminmenu .menu-icon-page div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -151px -33px;}#adminmenu .menu-icon-page:hover div.wp-menu-image,#adminmenu .menu-icon-page.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -151px -1px;}#adminmenu .menu-icon-comments div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -31px -33px;}#adminmenu .menu-icon-comments:hover div.wp-menu-image,#adminmenu .menu-icon-comments.wp-has-current-submenu div.wp-menu-image,#adminmenu .menu-icon-comments.current div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -31px -1px;}#adminmenu .menu-icon-appearance div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -1px -33px;}#adminmenu .menu-icon-appearance:hover div.wp-menu-image,#adminmenu .menu-icon-appearance.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -1px -1px;}#adminmenu .menu-icon-plugins div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -181px -33px;}#adminmenu .menu-icon-plugins:hover div.wp-menu-image,#adminmenu .menu-icon-plugins.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -181px -1px;}#adminmenu .menu-icon-users div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -301px -33px;}#adminmenu .menu-icon-users:hover div.wp-menu-image,#adminmenu .menu-icon-users.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -301px -1px;}#adminmenu .menu-icon-tools div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -211px -33px;}#adminmenu .menu-icon-tools:hover div.wp-menu-image,#adminmenu .menu-icon-tools.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -211px -1px;}#adminmenu .menu-icon-settings div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -241px -33px;}#adminmenu .menu-icon-settings:hover div.wp-menu-image,#adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -241px -1px;}#adminmenu .menu-icon-site div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -361px -33px;}#adminmenu .menu-icon-site:hover div.wp-menu-image,#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -361px -1px;}table.diff .diff-deletedline{background-color:#fdd;}table.diff .diff-deletedline del{background-color:#f99;}table.diff .diff-addedline{background-color:#dfd;}table.diff .diff-addedline ins{background-color:#9f9;}#att-info{background-color:#e4f2fd;}#sidemenu a{background-color:#f9f9f9;border-color:#f9f9f9;border-bottom-color:#dfdfdf;}#sidemenu a.current{background-color:#fff;border-color:#dfdfdf #dfdfdf #fff;color:#d54e21;}#screen-options-wrap,#contextual-help-wrap{background-color:#eae9e4;border-color:#dfdfdf;}#screen-meta-links a.show-settings{color:#606060;}#screen-meta-links a.show-settings:hover{color:#000;}#replysubmit{background-color:#f1f1f1;border-top-color:#ddd;}#replyerror{border-color:#ddd;background-color:#f9f9f9;}#edithead,#replyhead{background-color:#f1f1f1;}#ed_reply_toolbar{background-color:#e9e9e9;}.vim-current,.vim-current th,.vim-current td{background-color:#e4f2fd!important;}.star-average,.star.star-rating{background-color:#fc0;}div.star.select:hover{background-color:#d00;}#plugin-information .fyi ul{background-color:#eaf3fa;}#plugin-information .fyi h2.mainheader{background-color:#cee1ef;}#plugin-information pre,#plugin-information code{background-color:#ededff;}#plugin-information pre{border:1px solid #ccc;}.inline-edit-row fieldset input[type="text"],.inline-edit-row fieldset textarea,#bulk-titles,#replyrow input{border-color:#ddd;}.inline-editor div.title{background-color:#eaf3fa;}.inline-editor ul.cat-checklist{background-color:#fff;border-color:#ddd;}.inline-editor .categories .catshow,.inline-editor .categories .cathide{color:#21759b;}.inline-editor .quick-edit-save{background-color:#f1f1f1;}#replyrow #ed_reply_toolbar input:hover{border-color:#aaa;background:#ddd;}fieldset.inline-edit-col-right .inline-edit-col{border-color:#dfdfdf;}.attention{color:#d54e21;}.meta-box-sortables .postbox:hover .handlediv{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;}#major-publishing-actions{background:#eaf2fa;}.tablenav .tablenav-pages{color:#555;}.tablenav .tablenav-pages a{border-color:#e3e3e3;background:#eee url('../images/menu-bits-vs.gif') repeat-x scroll left -379px;}.tablenav .tablenav-pages a:hover{color:#d54e21;border-color:#d54321;}.tablenav .tablenav-pages a:active{color:#fff!important;}.tablenav .tablenav-pages .current{background:#dfdfdf;border-color:#d3d3d3;}#availablethemes,#availablethemes td{border-color:#ddd;}#current-theme img{border-color:#999;}#TB_window #TB_title a.tb-theme-preview-link,#TB_window #TB_title a.tb-theme-preview-link:visited{color:#999;}#TB_window #TB_title a.tb-theme-preview-link:hover,#TB_window #TB_title a.tb-theme-preview-link:focus{color:#ccc;}.misc-pub-section{border-bottom-color:#eee;}#minor-publishing{border-bottom-color:#ddd;}#post-body .misc-pub-section{border-right-color:#eee;}.post-com-count span{background-color:#bbb;}.form-table .color-palette td{border-color:#fff;}.sortable-placeholder{border-color:#bbb;background-color:#f5f5f5;}#post-body ul.category-tabs li.tabs a,#post-body ul.add-menu-item-tabs li.tabs a{color:#333;}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{border-color:#999;background-color:#eee;}#wp_editimgbtn:hover,#wp_delimgbtn:hover,#wp_editgallery:hover,#wp_delgallery:hover{border-color:#555;background-color:#ccc;}#favorite-first{background:#5580a6 url(../images/fav-vs.png) repeat-x 0 center;border-color:#517ea5!important;border-bottom-color:#416686!important;}#favorite-actions .slide-down{background-image:url(../images/fav-top-vs.gif);background-position:0 0;background-repeat:repeat-x;}#favorite-inside{border-color:#5b86ac;background-color:#5580a6;}#favorite-toggle{background:transparent url(../images/fav-arrow-vs.gif) no-repeat 0 -4px;}#favorite-actions a{color:#ddd;}#favorite-actions a:hover{color:#fff;}#favorite-inside a:hover{text-decoration:underline;}#favorite-actions .slide-down{border-bottom-color:#626262;}#screen-meta a.show-settings{background-color:transparent;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}#icon-edit,#icon-post{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -552px -5px;}#icon-index{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -137px -5px;}#icon-upload{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -251px -5px;}#icon-link-manager,#icon-link,#icon-link-category{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -190px -5px;}#icon-edit-pages,#icon-page{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -312px -5px;}#icon-edit-comments{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -72px -5px;}#icon-themes{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -11px -5px;}#icon-plugins{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -370px -5px;}#icon-users,#icon-profile,#icon-user-edit{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -600px -5px;}#icon-tools,#icon-admin{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -432px -5px;}#icon-options-general{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -492px -5px;}#icon-ms-admin{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -659px -5px;}.view-switch #view-switch-list{background:transparent url(../images/list-vs.png) no-repeat 0 0;}.view-switch #view-switch-list.current{background:transparent url(../images/list-vs.png) no-repeat -40px 0;}.view-switch #view-switch-excerpt{background:transparent url(../images/list-vs.png) no-repeat -20px 0;}.view-switch #view-switch-excerpt.current{background:transparent url(../images/list-vs.png) no-repeat -60px 0;}#header-logo{background:transparent url(../images/wp-logo-vs.png) no-repeat scroll center center;}#wphead #site-visit-button{background-color:#3c6b95;background-image:url(../images/visit-site-button-grad-vs.gif);color:#b6d1e4;text-shadow:#3f3f3f 0 -1px 0;}#wphead a:hover #site-visit-button{color:#fff;}#wphead a:focus #site-visit-button,#wphead a:active #site-visit-button{background-position:0 -27px;}.popular-tags,.feature-filter{background-color:#fff;border-color:#dfdfdf;}#theme-information .action-button{border-top-color:#dfdfdf;}.theme-listing br.line{border-bottom-color:#ccc;}div.widgets-sortables,#widgets-left .inactive{background-color:#f1f1f1;border-color:#ddd;}#available-widgets .widget-holder{background-color:#fff;border-color:#ddd;}#widgets-left .sidebar-name{background-color:#aaa;background-image:url(../images/ed-bg-vs.gif);text-shadow:#fff 0 1px 0;border-color:#dfdfdf;}#widgets-right .sidebar-name{background-image:url(../images/fav-vs.png);text-shadow:#3f3f3f 0 -1px 0;background-color:#636363;border-color:#636363;color:#fff;}.sidebar-name:hover,#removing-widget{color:#d54e21;}#removing-widget span{color:black;}#widgets-left .sidebar-name-arrow{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -109px;}#widgets-right .sidebar-name-arrow{background:transparent url(../images/fav-arrow-vs.gif) no-repeat scroll 0 -1px;}.in-widget-title{color:#606060;}.deleting .widget-title *{color:#aaa;}.imgedit-menu div{border-color:#d5d5d5;background-color:#f1f1f1;}.imgedit-menu div:hover{border-color:#c1c1c1;background-color:#eaeaea;}.imgedit-menu div.disabled{border-color:#ccc;background-color:#ddd;filter:alpha(opacity=50);opacity:.5;}#dashboard_recent_comments div.undo{border-top-color:#dfdfdf;}.comment-ays,.comment-ays th{border-color:#ddd;}.comment-ays th{background-color:#f1f1f1;}#nav-menu-header,.menu-item-handle{background:url("../images/blue-grad.png") repeat-x scroll left top #d5e6f2;}#menu-management .nav-tab-active{background:#eaf3fa;border-bottom-color:#eaf3fa;}
\ No newline at end of file
+html{background-color:#f7f6f1;}* html input,* html .widget{border-color:#8cbdd5;}textarea,input[type="text"],input[type="password"],input[type="file"],input[type="button"],input[type="submit"],input[type="reset"],select{border-color:#dfdfdf;background-color:#fff;}kbd,code{background:#eaeaea;}input[readonly]{background-color:#eee;}.find-box-search{border-color:#dfdfdf;background-color:#f1f1f1;}.find-box{background-color:#f1f1f1;}.find-box-inside{background-color:#fff;}a.page-numbers:hover{border-color:#999;}body,#wpbody,.form-table .pre{color:#333;}body>#upload-menu{border-bottom-color:#fff;}#postcustomstuff table,#your-profile fieldset,#rightnow,div.dashboard-widget,#dashboard-widgets p.dashboard-widget-links,#replyrow #ed_reply_toolbar input{border-color:#ccc;}#poststuff .inside label.spam,#poststuff .inside label.deleted{color:red;}#poststuff .inside label.waiting{color:orange;}#poststuff .inside label.approved{color:green;}#postcustomstuff table{border-color:#dfdfdf;background-color:#f9f9f9;}#postcustomstuff thead th{background-color:#f1f1f1;}#postcustomstuff table input,#postcustomstuff table textarea{border-color:#dfdfdf;background-color:#fff;}.widefat{border-color:#dfdfdf;background-color:#fff;}div.dashboard-widget-error{background-color:#c43;}div.dashboard-widget-notice{background-color:#cfe1ef;}div.dashboard-widget-submit{border-top-color:#ccc;}div.tabs-panel,ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{border-color:#dfdfdf;}ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{background-color:#f1f1f1;}input.disabled,textarea.disabled{background-color:#ccc;}.login #backtoblog a:hover,#plugin-information .action-button a,#plugin-information .action-button a:hover,#plugin-information .action-button a:visited{color:#fff;}.widget .widget-top,.postbox h3,.stuffbox h3{background:#d5e6f2 url("../images/blue-grad.png") repeat-x left top;text-shadow:#fff 0 1px 0;}.form-table th,.form-wrap label{color:#222;text-shadow:#fff 0 1px 0;}.description,.form-wrap p{color:#666;}strong .post-com-count span{background-color:#21759b;}.sorthelper{background-color:#ccf3fa;}.ac_match,.subsubsub a.current{color:#000;}.wrap h2{color:#093e56;}.ac_over{background-color:#f0f0b8;}.ac_results{background-color:#fff;border-color:#808080;}.ac_results li{color:#101010;}.alt .alternate{background-color:#edfbfc;}.available-theme a.screenshot{background-color:#f1f1f1;border-color:#ddd;}.bar{background-color:#e8e8e8;border-right-color:#99d;}#media-upload,#media-upload .media-item .slidetoggle{background:#fff;}#media-upload .slidetoggle{border-top-color:#dfdfdf;}.error,.login #login_error{background-color:#ffebe8;border-color:#c00;}.error a{color:#c00;}.form-invalid{background-color:#ffebe8!important;}.form-invalid input,.form-invalid select{border-color:#c00!important;}.submit{border-color:#8cbdd5;}.highlight{background-color:#e4f2fd;color:#d54e21;}.howto,.nonessential,#edit-slug-box,.form-input-tip,.rss-widget span.rss-date,.subsubsub{color:#666;}.media-item{border-bottom-color:#dfdfdf;}#wpbody-content #media-items .describe{border-top-color:#dfdfdf;}.media-upload-form label.form-help,td.help{color:#9a9a9a;}.post-com-count{background-image:url(../images/bubble_bg.gif);color:#fff;}.post-com-count span{background-color:#bbb;color:#fff;}.post-com-count:hover span{background-color:#d54e21;}.quicktags,.search{background-color:#ccc;color:#000;}.side-info h5{border-bottom-color:#dadada;}.side-info ul{color:#666;}.button,.button-secondary,.submit input,input[type=button],input[type=submit]{border-color:#dfdfdf;color:#464646;}.button:hover,.button-secondary:hover,.submit input:hover,input[type=button]:hover,input[type=submit]:hover{color:#000;border-color:#adaca7;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;text-shadow:rgba(255,255,255,1) 0 1px 0;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}input.button-primary,button.button-primary,a.button-primary{border-color:#5b86ab;font-weight:bold;color:#fff;background:#5580a6 url(../images/button-grad-vs.png) repeat-x scroll left top;text-shadow:rgba(0,0,0,0.3) 0 -1px 0;}input.button-primary:active,button.button-primary:active,a.button-primary:active{background:#21759b url(../images/button-grad-active-vs.png) repeat-x scroll left top;color:#eaf2fa;}input.button-primary:hover,button.button-primary:hover,a.button-primary:hover,a.button-primary:focus,a.button-primary:active{border-color:#2e5475;color:#eaf2fa;}.button-disabled,.button[disabled],.button:disabled,.button-secondary[disabled],.button-secondary:disabled,a.button.disabled{color:#aaa!important;border-color:#ddd!important;}.button-primary-disabled,.button-primary[disabled],.button-primary:disabled{color:#B0C3E2!important;background:#6590A6!important;}a:hover,a:active,a:focus{color:#d54e21;}#wphead #viewsite a:hover,#adminmenu a:hover,#adminmenu ul.wp-submenu a:hover,#the-comment-list .comment a:hover,#rightnow a:hover,#media-upload a.del-link:hover,div.dashboard-widget-submit input:hover,.subsubsub a:hover,.subsubsub a.current:hover,.ui-tabs-nav a:hover,.plugins .inactive a:hover,#all-plugins-table .plugins .inactive a:hover,#search-plugins-table .plugins .inactive a:hover{color:#d54e21;}#the-comment-list .comment-item,#dashboard-widgets #dashboard_quick_press form p.submit{border-color:#dfdfdf;}#side-sortables .category-tabs .tabs a,#side-sortables .add-menu-item-tabs .tabs a{color:#333;}#rightnow .rbutton{background-color:#ebebeb;color:#264761;}.submitbox .submit{background-color:#464646;color:#ccc;}.plugins a.delete:hover,#all-plugins-table .plugins a.delete:hover,#search-plugins-table .plugins a.delete:hover,.submitbox .submitdelete{color:#f00;border-bottom-color:#f00;}.submitbox .submitdelete:hover,#media-items a.delete:hover{color:#fff;background-color:#f00;border-bottom-color:#f00;}#normal-sortables .submitbox .submitdelete:hover{color:#000;background-color:#f00;border-bottom-color:#f00;}.tablenav .dots{border-color:transparent;}.tablenav .next,.tablenav .prev{border-color:transparent;color:#21759b;}.tablenav .next:hover,.tablenav .prev:hover{border-color:transparent;color:#d54e21;}.updated,.login .message{background-color:#ffffe0;border-color:#e6db55;}.update-message{color:#000;}a.page-numbers{border-bottom-color:#b8d3e2;}.commentlist li{border-bottom-color:#ccc;}.widefat td,.widefat th,#install-plugins .plugins td,#install-plugins .plugins th{border-color:#dfdfdf;}.widefat th{text-shadow:rgba(255,255,255,0.8) 0 1px 0;}.widefat thead tr th,.widefat tfoot tr th,h3.dashboard-widget-title,h3.dashboard-widget-title span,h3.dashboard-widget-title small,.find-box-head{color:#333;background:#d5e6f2 url(../images/blue-grad.png) repeat-x scroll left top;}h3.dashboard-widget-title small a{color:#d7d7d7;}h3.dashboard-widget-title small a:hover{color:#fff;}a,#adminmenu a,#poststuff #edButtonPreview,#poststuff #edButtonHTML,#the-comment-list p.comment-author strong a,#media-upload a.del-link,#media-items a.delete,.plugins a.delete,.ui-tabs-nav a{color:#1c6280;}body.press-this .tabs a,body.press-this .tabs a:hover{border-color:#c6d9e9;border-bottom-color:#fff;color:#d54e21;}#adminmenu #awaiting-mod,#adminmenu .update-plugins,#sidemenu a .update-plugins,#rightnow .reallynow,#plugin-information .action-button{background-color:#d54e21;color:#fff;}#adminmenu li a:hover #awaiting-mod,#adminmenu li a:hover .update-plugins,#sidemenu li a:hover .update-plugins{background-color:#264761;color:#fff;}#adminmenu li.current a #awaiting-mod,#adminmenu li.current a .update-plugins,#adminmenu li.wp-has-current-submenu a .update-plugins,#adminmenu li.wp-has-current-submenu a .update-plugins{background-color:#ddd;color:#000;text-shadow:none;-moz-box-shadow:rgba(0,0,0,0.2) 0 -1px 0;-khtml-box-shadow:rgba(0,0,0,0.2) 0 -1px 0;-webkit-box-shadow:rgba(0,0,0,0.2) 0 -1px 0;box-shadow:rgba(0,0,0,0.2) 0 -1px 0;}#adminmenu li.current a:hover #awaiting-mod,#adminmenu li.current a:hover .update-plugins,#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod,#adminmenu li.wp-has-current-submenu a:hover .update-plugins{background-color:#264761;color:#fff;}div#media-upload-header,div#plugin-information-header{background-color:#f9f9f9;border-bottom-color:#dfdfdf;}#currenttheme img{border-color:#666;}#dashboard_secondary div.dashboard-widget-content ul li a{background-color:#f9f9f9;}input.readonly,textarea.readonly{background-color:#ddd;}#ed_toolbar input,#ed_reply_toolbar input{background:#fff url("../images/fade-butt.png") repeat-x 0 -2px;}#editable-post-name{background-color:#fffbcc;}#edit-slug-box strong,.tablenav .displaying-num,#submitted-on{color:#777;}.login #nav a{color:#21759b!important;}.login #nav a:hover{color:#d54e21!important;}#footer,#footer-upgrade{background:#1d507d;color:#b6d1e4;}#media-items,.imgedit-group{border-color:#dfdfdf;}.checkbox,.side-info,.plugins tr,.postbox,#your-profile #rich_editing{background-color:#fff;}.plugins .inactive,.plugins .inactive th,.plugins .inactive td,tr.inactive+tr.plugin-update-tr .plugin-update{background-color:#ebeeef;}.plugin-update-tr .update-message{background-color:#fffbe4;border-color:#dfdfdf;}.plugins .active,.plugins .active th,.plugins .active td{color:#000;}.plugins .inactive a{color:#579;}#the-comment-list tr.undo,#the-comment-list div.undo{background-color:#f4f4f4;}#the-comment-list .unapproved{background-color:#ffffe0;}#the-comment-list .approve a{color:#006505;}#the-comment-list .unapprove a{color:#d98500;}table.widefat span.delete a,table.widefat span.trash a,table.widefat span.spam a,#dashboard_recent_comments .delete a,#dashboard_recent_comments .trash a,#dashboard_recent_comments .spam a{color:#bc0b0b;}.widget,#widget-list .widget-top,.postbox,#titlediv,#poststuff .postarea,.stuffbox{border-color:#dfdfdf;}.widget,.postbox{background-color:#fff;}.ui-sortable .postbox h3{color:#093e56;}.widget .widget-top,.ui-sortable .postbox h3:hover{color:#000;}.curtime #timestamp{background-image:url(../images/date-button.gif);}#quicktags #ed_link{color:#00f;}#rightnow .youhave{background-color:#f0f6fb;}#rightnow a{color:#448abd;}.tagchecklist span a,#bulk-titles div a{background:url(../images/xit.gif) no-repeat;}.tagchecklist span a:hover,#bulk-titles div a:hover{background:url(../images/xit.gif) no-repeat -10px 0;}#update-nag,.update-nag{background-color:#FFFBCC;border-color:#E6DB55;color:#555;}.login #backtoblog a{color:#ccc;}#wphead{background-color:#1d507d;}body.login{border-top-color:#093e56;}#wphead h1 a{color:#fff;}#user_info{color:#b6d1e4;}#user_info a:link,#user_info a:visited,#footer a:link,#footer a:visited{color:#fff;text-decoration:none;}#user_info a:hover,#user_info a:active,#footer a:hover,#footer a:active{text-decoration:underline;}div#media-upload-error,.file-error,abbr.required,.widget-control-remove:hover,table.widefat .delete a:hover,table.widefat .trash a:hover,table.widefat .spam a:hover,#dashboard_recent_comments .delete a:hover,#dashboard_recent_comments .trash a:hover,#dashboard_recent_comments .spam a:hover{color:#f00;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;}#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;}#quicktags{border-color:#dfdfdf;background-color:#dfdfdf;}#ed_toolbar input{border-color:#c3c3c3;}#ed_toolbar input:hover{border-color:#aaa;background:#ddd;}#poststuff .wp_themeSkin .mceStatusbar{border-color:#ededed;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{background-color:#f2f1eb;border-color:#dfdfdf;color:#999;}#poststuff #editor-toolbar .active{border-bottom-color:#e3eef7;background-color:#e3eef7;color:#333;}#post-status-info{background-color:#ededed;}.wp_themeSkin *,.wp_themeSkin a:hover,.wp_themeSkin a:link,.wp_themeSkin a:visited,.wp_themeSkin a:active{color:#000;}.wp_themeSkin iframe{background:#fff;}.wp_themeSkin .mceStatusbar{color:#000;background-color:#f5f5f5;}.wp_themeSkin .mceButton{background-color:#e9e8e8;border-color:#b2b2b2;}.wp_themeSkin a.mceButtonEnabled:hover,.wp_themeSkin a.mceButtonActive,.wp_themeSkin a.mceButtonSelected{background-color:#d5d5d5;border-color:#777!important;}.wp_themeSkin .mceButtonDisabled{border-color:#ccc!important;}.wp_themeSkin .mceListBox .mceText,.wp_themeSkin .mceListBox .mceOpen{border-color:#b2b2b2;background-color:#d5d5d5;}.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,.wp_themeSkin .mceListBoxHover .mceOpen,.wp_themeSkin .mceListBoxSelected .mceOpen,.wp_themeSkin .mceListBoxSelected .mceText{border-color:#777!important;background-color:#d5d5d5;}.wp_themeSkin table.mceListBoxEnabled:hover .mceText,.wp_themeSkin .mceListBoxHover .mceText{border-color:#777!important;}.wp_themeSkin select.mceListBox{border-color:#b2b2b2;background-color:#fff;}.wp_themeSkin .mceSplitButton a.mceAction,.wp_themeSkin .mceSplitButton a.mceOpen{border-color:#b2b2b2;}.wp_themeSkin .mceSplitButton a.mceOpen:hover,.wp_themeSkin .mceSplitButtonSelected a.mceOpen,.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,.wp_themeSkin .mceSplitButton a.mceAction:hover{background-color:#d5d5d5;border-color:#777!important;}.wp_themeSkin .mceSplitButtonActive{background-color:#b2b2b2;}.wp_themeSkin div.mceColorSplitMenu table{background-color:#ebebeb;border-color:#b2b2b2;}.wp_themeSkin .mceColorSplitMenu a{border-color:#b2b2b2;}.wp_themeSkin .mceColorSplitMenu a.mceMoreColors{border-color:#fff;}.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover{border-color:#0a246a;background-color:#b6bdd2;}.wp_themeSkin a.mceMoreColors:hover{border-color:#0a246a;}.wp_themeSkin .mceMenu{border-color:#ddd;}.wp_themeSkin .mceMenu table{background-color:#ebeaeb;}.wp_themeSkin .mceMenu .mceText{color:#000;}.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,.wp_themeSkin .mceMenu .mceMenuItemActive{background-color:#f5f5f5;}.wp_themeSkin td.mceMenuItemSeparator{background-color:#aaa;}.wp_themeSkin .mceMenuItemTitle a{background-color:#ccc;border-bottom-color:#aaa;}.wp_themeSkin .mceMenuItemTitle span.mceText{color:#000;}.wp_themeSkin .mceMenuItemDisabled .mceText{color:#888;}#quicktags,.wp_themeSkin tr.mceFirst td.mceToolbar{background:#d5e6f2 url("../images/ed-bg-vs.gif") repeat-x scroll left top;}.wp_themeSkin tr.mceFirst td.mceToolbar{border-color:#dfdfdf;}.wp-admin #mceModalBlocker{background:#000;}.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft{background:#444;border-left:1px solid #999;border-top:1px solid #999;-moz-border-radius:4px 0 0 0;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px;}.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight{background:#444;border-right:1px solid #999;border-top:1px solid #999;border-top-right-radius:4px;-khtml-border-top-right-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius:0 4px 0 0;}.wp-admin .clearlooks2 .mceMiddle .mceLeft{background:#f1f1f1;border-left:1px solid #999;}.wp-admin .clearlooks2 .mceMiddle .mceRight{background:#f1f1f1;border-right:1px solid #999;}.wp-admin .clearlooks2 .mceBottom{background:#f1f1f1;border-bottom:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceLeft{background:#f1f1f1;border-bottom:1px solid #999;border-left:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceCenter{background:#f1f1f1;border-bottom:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceRight{background:#f1f1f1;border-bottom:1px solid #999;border-right:1px solid #999;}.wp-admin .clearlooks2 .mceFocus .mceTop span{color:#e5e5e5;}#editorcontainer,#post-status-info,#titlediv #title,.editwidget .widget-inside{border-color:#dfdfdf;}#titlediv #title{background-color:#fff;}#tTips p#tTips_inside{background-color:#ddd;color:#333;}#timestampdiv input,#namediv input,#poststuff .inside .the-tagcloud{border-color:#dfdfdf;}#adminmenu *{border-color:#dfdfdf;}#adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;}.folded #adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;}#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -207px;}#adminmenu .wp-has-submenu:hover .wp-menu-toggle,#adminmenu .wp-menu-open .wp-menu-toggle{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -109px;}#adminmenu a.menu-top{background:#eaf3fa url(../images/menu-bits-vs.gif) repeat-x scroll left -379px;}#adminmenu .wp-submenu a{background:#fff url(../images/menu-bits-vs.gif) no-repeat scroll 0 -310px;}#adminmenu .wp-has-current-submenu ul li a{background:none;}#adminmenu .wp-has-current-submenu ul li a.current{background:url(../images/menu-dark.gif) top left no-repeat!important;}#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,#adminmenu .menu-top .current{background:#3c6b95 url(../images/menu-bits-vs.gif) top left repeat-x;border-color:#1d507d;color:#fff;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;}#adminmenu li.wp-has-current-submenu .wp-submenu,#adminmenu li.wp-has-current-submenu ul li a{border-color:#aaa!important;}#adminmenu li.wp-has-current-submenu ul li a{background:url(../images/menu-dark.gif) bottom left no-repeat!important;}#adminmenu li.wp-has-current-submenu ul{border-bottom-color:#aaa;}#adminmenu li.menu-top .current:hover{border-color:#6583c0;}#adminmenu .wp-submenu .current a.current{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll 0 -289px;}#adminmenu .wp-submenu a:hover{background-color:#eaf2fa!important;color:#333!important;}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover{color:#333;background-color:#f5f5f5;background-image:none;border-color:#e3e3e3;text-shadow:rgba(255,255,255,1) 0 1px 0;}#adminmenu .wp-submenu ul{background-color:#fff;}.folded #adminmenu li.menu-top,#adminmenu .wp-submenu .wp-submenu-head{background-color:#eaf2fa;}.folded #adminmenu li.wp-has-current-submenu,.folded #adminmenu li.menu-top.current{background-color:#bbd8e7;}#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head{background-color:#bbd8e7;border-color:#8cbdd5;}#adminmenu div.wp-submenu{background-color:transparent;}#adminmenu .menu-icon-dashboard div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -61px -33px;}#adminmenu .menu-icon-dashboard:hover div.wp-menu-image,#adminmenu .menu-icon-dashboard.wp-has-current-submenu div.wp-menu-image,#adminmenu .menu-icon-dashboard.current div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -61px -1px;}#adminmenu .menu-icon-post div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -272px -33px;}#adminmenu .menu-icon-post:hover div.wp-menu-image,#adminmenu .menu-icon-post.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -272px -1px;}#adminmenu .menu-icon-media div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -121px -33px;}#adminmenu .menu-icon-media:hover div.wp-menu-image,#adminmenu .menu-icon-media.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -121px -1px;}#adminmenu .menu-icon-links div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -91px -33px;}#adminmenu .menu-icon-links:hover div.wp-menu-image,#adminmenu .menu-icon-links.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -91px -1px;}#adminmenu .menu-icon-page div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -151px -33px;}#adminmenu .menu-icon-page:hover div.wp-menu-image,#adminmenu .menu-icon-page.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -151px -1px;}#adminmenu .menu-icon-comments div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -31px -33px;}#adminmenu .menu-icon-comments:hover div.wp-menu-image,#adminmenu .menu-icon-comments.wp-has-current-submenu div.wp-menu-image,#adminmenu .menu-icon-comments.current div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -31px -1px;}#adminmenu .menu-icon-appearance div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -1px -33px;}#adminmenu .menu-icon-appearance:hover div.wp-menu-image,#adminmenu .menu-icon-appearance.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -1px -1px;}#adminmenu .menu-icon-plugins div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -181px -33px;}#adminmenu .menu-icon-plugins:hover div.wp-menu-image,#adminmenu .menu-icon-plugins.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -181px -1px;}#adminmenu .menu-icon-users div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -301px -33px;}#adminmenu .menu-icon-users:hover div.wp-menu-image,#adminmenu .menu-icon-users.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -301px -1px;}#adminmenu .menu-icon-tools div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -211px -33px;}#adminmenu .menu-icon-tools:hover div.wp-menu-image,#adminmenu .menu-icon-tools.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -211px -1px;}#adminmenu .menu-icon-settings div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -241px -33px;}#adminmenu .menu-icon-settings:hover div.wp-menu-image,#adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -241px -1px;}#adminmenu .menu-icon-site div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -361px -33px;}#adminmenu .menu-icon-site:hover div.wp-menu-image,#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu-vs.png?ver=20100531') no-repeat scroll -361px -1px;}table.diff .diff-deletedline{background-color:#fdd;}table.diff .diff-deletedline del{background-color:#f99;}table.diff .diff-addedline{background-color:#dfd;}table.diff .diff-addedline ins{background-color:#9f9;}#att-info{background-color:#e4f2fd;}#sidemenu a{background-color:#f9f9f9;border-color:#f9f9f9;border-bottom-color:#dfdfdf;}#sidemenu a.current{background-color:#fff;border-color:#dfdfdf #dfdfdf #fff;color:#d54e21;}#screen-options-wrap,#contextual-help-wrap{background-color:#eae9e4;border-color:#dfdfdf;}#screen-meta-links a.show-settings{color:#606060;}#screen-meta-links a.show-settings:hover{color:#000;}#replysubmit{background-color:#f1f1f1;border-top-color:#ddd;}#replyerror{border-color:#ddd;background-color:#f9f9f9;}#edithead,#replyhead{background-color:#f1f1f1;}#ed_reply_toolbar{background-color:#e9e9e9;}.vim-current,.vim-current th,.vim-current td{background-color:#e4f2fd!important;}.star-average,.star.star-rating{background-color:#fc0;}div.star.select:hover{background-color:#d00;}#plugin-information .fyi ul{background-color:#eaf3fa;}#plugin-information .fyi h2.mainheader{background-color:#cee1ef;}#plugin-information pre,#plugin-information code{background-color:#ededff;}#plugin-information pre{border:1px solid #ccc;}.inline-edit-row fieldset input[type="text"],.inline-edit-row fieldset textarea,#bulk-titles,#replyrow input{border-color:#ddd;}.inline-editor div.title{background-color:#eaf3fa;}.inline-editor ul.cat-checklist{background-color:#fff;border-color:#ddd;}.inline-editor .categories .catshow,.inline-editor .categories .cathide{color:#21759b;}.inline-editor .quick-edit-save{background-color:#f1f1f1;}#replyrow #ed_reply_toolbar input:hover{border-color:#aaa;background:#ddd;}fieldset.inline-edit-col-right .inline-edit-col{border-color:#dfdfdf;}.attention{color:#d54e21;}.meta-box-sortables .postbox:hover .handlediv{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;}#major-publishing-actions{background:#eaf2fa;}.tablenav .tablenav-pages{color:#555;}.tablenav .tablenav-pages a{border-color:#e3e3e3;background:#eee url('../images/menu-bits-vs.gif') repeat-x scroll left -379px;}.tablenav .tablenav-pages a:hover{color:#d54e21;border-color:#d54321;}.tablenav .tablenav-pages a:active{color:#fff!important;}.tablenav .tablenav-pages .current{background:#dfdfdf;border-color:#d3d3d3;}#availablethemes,#availablethemes td{border-color:#ddd;}#current-theme img{border-color:#999;}#TB_window #TB_title a.tb-theme-preview-link,#TB_window #TB_title a.tb-theme-preview-link:visited{color:#999;}#TB_window #TB_title a.tb-theme-preview-link:hover,#TB_window #TB_title a.tb-theme-preview-link:focus{color:#ccc;}.misc-pub-section{border-bottom-color:#eee;}#minor-publishing{border-bottom-color:#ddd;}#post-body .misc-pub-section{border-right-color:#eee;}.post-com-count span{background-color:#bbb;}.form-table .color-palette td{border-color:#fff;}.sortable-placeholder{border-color:#bbb;background-color:#f5f5f5;}#post-body ul.category-tabs li.tabs a,#post-body ul.add-menu-item-tabs li.tabs a{color:#333;}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{border-color:#999;background-color:#eee;}#wp_editimgbtn:hover,#wp_delimgbtn:hover,#wp_editgallery:hover,#wp_delgallery:hover{border-color:#555;background-color:#ccc;}#favorite-first{background:#5580a6 url(../images/fav-vs.png) repeat-x 0 center;border-color:#517ea5!important;border-bottom-color:#416686!important;}#favorite-actions .slide-down{background-image:url(../images/fav-top-vs.gif);background-position:0 0;background-repeat:repeat-x;}#favorite-inside{border-color:#5b86ac;background-color:#5580a6;}#favorite-toggle{background:transparent url(../images/fav-arrow-vs.gif) no-repeat 0 -4px;}#favorite-actions a{color:#ddd;}#favorite-actions a:hover{color:#fff;}#favorite-inside a:hover{text-decoration:underline;}#favorite-actions .slide-down{border-bottom-color:#626262;}#screen-meta a.show-settings{background-color:transparent;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}#icon-edit,#icon-post{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -552px -5px;}#icon-index{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -137px -5px;}#icon-upload{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -251px -5px;}#icon-link-manager,#icon-link,#icon-link-category{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -190px -5px;}#icon-edit-pages,#icon-page{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -312px -5px;}#icon-edit-comments{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -72px -5px;}#icon-themes{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -11px -5px;}#icon-plugins{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -370px -5px;}#icon-users,#icon-profile,#icon-user-edit{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -600px -5px;}#icon-tools,#icon-admin{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -432px -5px;}#icon-options-general{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -492px -5px;}#icon-ms-admin{background:transparent url(../images/icons32-vs.png?ver=20100531) no-repeat -659px -5px;}.view-switch #view-switch-list{background:transparent url(../images/list-vs.png) no-repeat 0 0;}.view-switch .current #view-switch-list{background:transparent url(../images/list-vs.png) no-repeat -40px 0;}.view-switch #view-switch-excerpt{background:transparent url(../images/list-vs.png) no-repeat -20px 0;}.view-switch .current #view-switch-excerpt{background:transparent url(../images/list-vs.png) no-repeat -60px 0;}#header-logo{background:transparent url(../images/wp-logo-vs.png) no-repeat scroll center center;}#wphead #site-visit-button{background-color:#3c6b95;background-image:url(../images/visit-site-button-grad-vs.gif);color:#b6d1e4;text-shadow:#3f3f3f 0 -1px 0;}#wphead a:hover #site-visit-button{color:#fff;}#wphead a:focus #site-visit-button,#wphead a:active #site-visit-button{background-position:0 -27px;}.popular-tags,.feature-filter{background-color:#fff;border-color:#dfdfdf;}#theme-information .action-button{border-top-color:#dfdfdf;}.theme-listing br.line{border-bottom-color:#ccc;}div.widgets-sortables,#widgets-left .inactive{background-color:#f1f1f1;border-color:#ddd;}#available-widgets .widget-holder{background-color:#fff;border-color:#ddd;}#widgets-left .sidebar-name{background-color:#aaa;background-image:url(../images/ed-bg-vs.gif);text-shadow:#fff 0 1px 0;border-color:#dfdfdf;}#widgets-right .sidebar-name{background-image:url(../images/fav-vs.png);text-shadow:#3f3f3f 0 -1px 0;background-color:#636363;border-color:#636363;color:#fff;}.sidebar-name:hover,#removing-widget{color:#d54e21;}#removing-widget span{color:black;}#widgets-left .sidebar-name-arrow{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -109px;}#widgets-right .sidebar-name-arrow{background:transparent url(../images/fav-arrow-vs.gif) no-repeat scroll 0 -1px;}.in-widget-title{color:#606060;}.deleting .widget-title *{color:#aaa;}.imgedit-menu div{border-color:#d5d5d5;background-color:#f1f1f1;}.imgedit-menu div:hover{border-color:#c1c1c1;background-color:#eaeaea;}.imgedit-menu div.disabled{border-color:#ccc;background-color:#ddd;filter:alpha(opacity=50);opacity:.5;}#dashboard_recent_comments div.undo{border-top-color:#dfdfdf;}.comment-ays,.comment-ays th{border-color:#ddd;}.comment-ays th{background-color:#f1f1f1;}#nav-menu-header,.menu-item-handle{background:url("../images/blue-grad.png") repeat-x scroll left top #d5e6f2;}#menu-management .nav-tab-active{background:#eaf3fa;border-bottom-color:#eaf3fa;}
\ No newline at end of file
diff --git a/wp-admin/css/colors-classic.dev.css b/wp-admin/css/colors-classic.dev.css
index 3d9924f706..5c74874852 100644
--- a/wp-admin/css/colors-classic.dev.css
+++ b/wp-admin/css/colors-classic.dev.css
@@ -1592,7 +1592,7 @@ fieldset.inline-edit-col-right .inline-edit-col {
 	background: transparent url(../images/list-vs.png) no-repeat 0 0;
 }
 
-.view-switch #view-switch-list.current {
+.view-switch .current #view-switch-list {
 	background: transparent url(../images/list-vs.png) no-repeat -40px 0;
 }
 
@@ -1600,7 +1600,7 @@ fieldset.inline-edit-col-right .inline-edit-col {
 	background: transparent url(../images/list-vs.png) no-repeat -20px 0;
 }
 
-.view-switch #view-switch-excerpt.current {
+.view-switch .current #view-switch-excerpt {
 	background: transparent url(../images/list-vs.png) no-repeat -60px 0;
 }
 
@@ -1726,4 +1726,4 @@ div.widgets-sortables,
 #menu-management .nav-tab-active {
 	background: #eaf3fa;
 	border-bottom-color: #eaf3fa;
-}
\ No newline at end of file
+}
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 6937d35bed..4786275cd7 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -1 +1 @@
-html{background-color:#f9f9f9;}* html input,* html .widget{border-color:#dfdfdf;}textarea,input[type="text"],input[type="password"],input[type="file"],input[type="button"],input[type="submit"],input[type="reset"],select{border-color:#dfdfdf;background-color:#fff;}kbd,code{background:#eaeaea;}input[readonly]{background-color:#eee;}.find-box-search{border-color:#dfdfdf;background-color:#f1f1f1;}.find-box{background-color:#f1f1f1;}.find-box-inside{background-color:#fff;}a.page-numbers:hover{border-color:#999;}body,#wpbody,.form-table .pre{color:#333;}body>#upload-menu{border-bottom-color:#fff;}#postcustomstuff table,#your-profile fieldset,#rightnow,div.dashboard-widget,#dashboard-widgets p.dashboard-widget-links,#replyrow #ed_reply_toolbar input{border-color:#ccc;}#poststuff .inside label.spam,#poststuff .inside label.deleted{color:red;}#poststuff .inside label.waiting{color:orange;}#poststuff .inside label.approved{color:green;}#postcustomstuff table{border-color:#dfdfdf;background-color:#F9F9F9;}#postcustomstuff thead th{background-color:#F1F1F1;}#postcustomstuff table input,#postcustomstuff table textarea{border-color:#dfdfdf;background-color:#fff;}.widefat{border-color:#dfdfdf;background-color:#fff;}div.dashboard-widget-error{background-color:#c43;}div.dashboard-widget-notice{background-color:#cfe1ef;}div.dashboard-widget-submit{border-top-color:#ccc;}div.tabs-panel,ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{border-color:#dfdfdf;}ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{background-color:#f1f1f1;}input.disabled,textarea.disabled{background-color:#ccc;}#plugin-information .action-button a,#plugin-information .action-button a:hover,#plugin-information .action-button a:visited{color:#fff;}.widget .widget-top,.postbox h3,.stuffbox h3{background:#dfdfdf url("../images/gray-grad.png") repeat-x left top;text-shadow:#fff 0 1px 0;}.form-table th,.form-wrap label{color:#222;text-shadow:#fff 0 1px 0;}.description,.form-wrap p{color:#666;}strong .post-com-count span{background-color:#21759b;}.sorthelper{background-color:#ccf3fa;}.ac_match,.subsubsub a.current{color:#000;}.wrap h2{color:#464646;}.ac_over{background-color:#f0f0b8;}.ac_results{background-color:#fff;border-color:#808080;}.ac_results li{color:#101010;}.alternate,.alt{background-color:#f9f9f9;}.available-theme a.screenshot{background-color:#f1f1f1;border-color:#ddd;}.bar{background-color:#e8e8e8;border-right-color:#99d;}#media-upload,#media-upload .media-item .slidetoggle{background:#fff;}#media-upload .slidetoggle{border-top-color:#dfdfdf;}.error,.login #login_error{background-color:#ffebe8;border-color:#c00;}.error a{color:#c00;}.form-invalid{background-color:#ffebe8!important;}.form-invalid input,.form-invalid select{border-color:#c00!important;}.submit{border-color:#DFDFDF;}.highlight{background-color:#e4f2fd;color:#d54e21;}.howto,.nonessential,#edit-slug-box,.form-input-tip,.rss-widget span.rss-date,.subsubsub{color:#666;}.media-item{border-bottom-color:#dfdfdf;}#wpbody-content #media-items .describe{border-top-color:#dfdfdf;}.media-upload-form label.form-help,td.help{color:#9a9a9a;}.post-com-count{background-image:url(../images/bubble_bg.gif);color:#fff;}.post-com-count span{background-color:#bbb;color:#fff;}.post-com-count:hover span{background-color:#d54e21;}.quicktags,.search{background-color:#ccc;color:#000;}.side-info h5{border-bottom-color:#dadada;}.side-info ul{color:#666;}.button,.button-secondary,.submit input,input[type=button],input[type=submit]{border-color:#bbb;color:#464646;}.button:hover,.button-secondary:hover,.submit input:hover,input[type=button]:hover,input[type=submit]:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;text-shadow:rgba(255,255,255,1) 0 1px 0;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}input.button-primary,button.button-primary,a.button-primary{border-color:#298cba;font-weight:bold;color:#fff;background:#21759B url(../images/button-grad.png) repeat-x scroll left top;text-shadow:rgba(0,0,0,0.3) 0 -1px 0;}input.button-primary:active,button.button-primary:active,a.button-primary:active{background:#21759b url(../images/button-grad-active.png) repeat-x scroll left top;color:#eaf2fa;}input.button-primary:hover,button.button-primary:hover,a.button-primary:hover,a.button-primary:focus,a.button-primary:active{border-color:#13455b;color:#eaf2fa;}.button-disabled,.button[disabled],.button:disabled,.button-secondary[disabled],.button-secondary:disabled,a.button.disabled{color:#aaa!important;border-color:#ddd!important;}.button-primary-disabled,.button-primary[disabled],.button-primary:disabled{color:#9FD0D5!important;background:#298CBA!important;}a:hover,a:active,a:focus{color:#d54e21;}#wphead #viewsite a:hover,#adminmenu a:hover,#adminmenu ul.wp-submenu a:hover,#the-comment-list .comment a:hover,#rightnow a:hover,#media-upload a.del-link:hover,div.dashboard-widget-submit input:hover,.subsubsub a:hover,.subsubsub a.current:hover,.ui-tabs-nav a:hover,.plugins .inactive a:hover,#all-plugins-table .plugins .inactive a:hover,#search-plugins-table .plugins .inactive a:hover{color:#d54e21;}#the-comment-list .comment-item,#dashboard-widgets #dashboard_quick_press form p.submit{border-color:#dfdfdf;}#side-sortables .category-tabs .tabs a,#side-sortables .add-menu-item-tabs .tabs a{color:#333;}#rightnow .rbutton{background-color:#ebebeb;color:#264761;}.submitbox .submit{background-color:#464646;color:#ccc;}.plugins a.delete:hover,#all-plugins-table .plugins a.delete:hover,#search-plugins-table .plugins a.delete:hover,.submitbox .submitdelete{color:#f00;border-bottom-color:#f00;}.submitbox .submitdelete:hover,#media-items a.delete:hover{color:#fff;background-color:#f00;border-bottom-color:#f00;}#normal-sortables .submitbox .submitdelete:hover{color:#000;background-color:#f00;border-bottom-color:#f00;}.tablenav .dots{border-color:transparent;}.tablenav .next,.tablenav .prev{border-color:transparent;color:#21759b;}.tablenav .next:hover,.tablenav .prev:hover{border-color:transparent;color:#d54e21;}.updated,.login .message{background-color:#ffffe0;border-color:#e6db55;}.update-message{color:#000;}a.page-numbers{border-bottom-color:#B8D3E2;}.commentlist li{border-bottom-color:#ccc;}.widefat td,.widefat th,#install-plugins .plugins td,#install-plugins .plugins th{border-color:#dfdfdf;}.widefat th{text-shadow:rgba(255,255,255,0.8) 0 1px 0;}.widefat thead tr th,.widefat tfoot tr th,h3.dashboard-widget-title,h3.dashboard-widget-title span,h3.dashboard-widget-title small,.find-box-head{color:#333;background:#dfdfdf url(../images/gray-grad.png) repeat-x scroll left top;}h3.dashboard-widget-title small a{color:#d7d7d7;}h3.dashboard-widget-title small a:hover{color:#fff;}a,#adminmenu a,#poststuff #edButtonPreview,#poststuff #edButtonHTML,#the-comment-list p.comment-author strong a,#media-upload a.del-link,#media-items a.delete,.plugins a.delete,.ui-tabs-nav a{color:#21759b;}body.press-this .tabs a,body.press-this .tabs a:hover{background-color:#fff;border-color:#c6d9e9;border-bottom-color:#fff;color:#d54e21;}#adminmenu #awaiting-mod,#adminmenu .update-plugins,#sidemenu a .update-plugins,#rightnow .reallynow{background-color:#464646;color:#fff;-moz-box-shadow:#fff 0 -1px 0;-khtml-box-shadow:#fff 0 -1px 0;-webkit-box-shadow:#fff 0 -1px 0;box-shadow:#fff 0 -1px 0;}#plugin-information .action-button{background-color:#d54e21;color:#fff;}#adminmenu li.current a #awaiting-mod,#adminmenu li a.wp-has-current-submenu .update-plugins{background-color:#464646;color:#fff;-moz-box-shadow:#fff 0 -1px 0;-khtml-box-shadow:#fff 0 -1px 0;-webkit-box-shadow:#fff 0 -1px 0;box-shadow:#fff 0 -1px 0;}div#media-upload-header,div#plugin-information-header{background-color:#f9f9f9;border-bottom-color:#dfdfdf;}#currenttheme img{border-color:#666;}#dashboard_secondary div.dashboard-widget-content ul li a{background-color:#f9f9f9;}input.readonly,textarea.readonly{background-color:#ddd;}#ed_toolbar input,#ed_reply_toolbar input{background:#fff url("../images/fade-butt.png") repeat-x 0 -2px;}#editable-post-name{background-color:#fffbcc;}#edit-slug-box strong,.tablenav .displaying-num,#submitted-on{color:#777;}.login #nav a{color:#21759b!important;}.login #nav a:hover{color:#d54e21!important;}#footer{color:#777;border-color:#d1d1d1;background:#d9d9d9;background:-moz-linear-gradient(bottom,#d7d7d7,#e4e4e4);background:-webkit-gradient(linear,left bottom,left top,from(#d7d7d7),to(#e4e4e4));}#media-items,.imgedit-group{border-color:#dfdfdf;}.checkbox,.side-info,.plugins tr,#your-profile #rich_editing{background-color:#fff;}.plugins .inactive,.plugins .inactive th,.plugins .inactive td,tr.inactive+tr.plugin-update-tr .plugin-update{background-color:#eee;}.plugin-update-tr .update-message{background-color:#fffbe4;border-color:#dfdfdf;}.plugins .active,.plugins .active th,.plugins .active td{color:#000;}.plugins .inactive a{color:#579;}#the-comment-list tr.undo,#the-comment-list div.undo{background-color:#f4f4f4;}#the-comment-list .unapproved{background-color:#ffffe0;}#the-comment-list .approve a{color:#006505;}#the-comment-list .unapprove a{color:#d98500;}table.widefat span.delete a,table.widefat span.trash a,table.widefat span.spam a,#dashboard_recent_comments .delete a,#dashboard_recent_comments .trash a,#dashboard_recent_comments .spam a{color:#bc0b0b;}.widget,#widget-list .widget-top,.postbox,#titlediv,#poststuff .postarea,.stuffbox{border-color:#dfdfdf;}.widget,.postbox{background-color:#fff;}.ui-sortable .postbox h3{color:#464646;}.widget .widget-top,.ui-sortable .postbox h3:hover{color:#000;}.curtime #timestamp{background-image:url(../images/date-button.gif);}#quicktags #ed_link{color:#00f;}#rightnow .youhave{background-color:#f0f6fb;}#rightnow a{color:#448abd;}.tagchecklist span a,#bulk-titles div a{background:url(../images/xit.gif) no-repeat;}.tagchecklist span a:hover,#bulk-titles div a:hover{background:url(../images/xit.gif) no-repeat -10px 0;}#update-nag,.update-nag{background-color:#FFFBCC;border-color:#E6DB55;color:#555;}.login #backtoblog a{color:#464646;}#wphead{border-bottom:#c6c6c6 1px solid;background:#d9d9d9;background:-moz-linear-gradient(bottom,#d7d7d7,#e4e4e4);background:-webkit-gradient(linear,left bottom,left top,from(#d7d7d7),to(#e4e4e4));}#wphead h1 a{color:#464646;}#user_info{color:#777;}#user_info a:link,#user_info a:visited,#footer a:link,#footer a:visited{color:#222;text-decoration:none;}#user_info a:hover,#footer a:hover{color:#000;text-decoration:underline!important;}#user_info a:active,#footer a:active{color:#ccc!important;}div#media-upload-error,.file-error,abbr.required,.widget-control-remove:hover,table.widefat .delete a:hover,table.widefat .trash a:hover,table.widefat .spam a:hover,#dashboard_recent_comments .delete a:hover,#dashboard_recent_comments .trash a:hover #dashboard_recent_comments .spam a:hover{color:#f00;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;}#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;}#quicktags{border-color:#dfdfdf;background-color:#dfdfdf;}#ed_toolbar input{border-color:#C3C3C3;}#ed_toolbar input:hover{border-color:#aaa;background:#ddd;}#poststuff .wp_themeSkin .mceStatusbar{border-color:#EDEDED;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{background-color:#f1f1f1;border-color:#dfdfdf;color:#999;}#poststuff #editor-toolbar .active{border-bottom-color:#e9e9e9;background-color:#e9e9e9;color:#333;}#post-status-info{background-color:#EDEDED;}.wp_themeSkin *,.wp_themeSkin a:hover,.wp_themeSkin a:link,.wp_themeSkin a:visited,.wp_themeSkin a:active{color:#000;}.wp_themeSkin iframe{background:#fff;}.wp_themeSkin .mceStatusbar{color:#000;background-color:#f5f5f5;}.wp_themeSkin .mceButton{background-color:#e9e8e8;border-color:#B2B2B2;}.wp_themeSkin a.mceButtonEnabled:hover,.wp_themeSkin a.mceButtonActive,.wp_themeSkin a.mceButtonSelected{background-color:#d5d5d5;border-color:#777!important;}.wp_themeSkin .mceButtonDisabled{border-color:#ccc!important;}.wp_themeSkin .mceListBox .mceText,.wp_themeSkin .mceListBox .mceOpen{border-color:#B2B2B2;background-color:#d5d5d5;}.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,.wp_themeSkin .mceListBoxHover .mceOpen,.wp_themeSkin .mceListBoxSelected .mceOpen,.wp_themeSkin .mceListBoxSelected .mceText{border-color:#777!important;background-color:#d5d5d5;}.wp_themeSkin table.mceListBoxEnabled:hover .mceText,.wp_themeSkin .mceListBoxHover .mceText{border-color:#777!important;}.wp_themeSkin select.mceListBox{border-color:#B2B2B2;background-color:#fff;}.wp_themeSkin .mceSplitButton a.mceAction,.wp_themeSkin .mceSplitButton a.mceOpen{border-color:#B2B2B2;}.wp_themeSkin .mceSplitButton a.mceOpen:hover,.wp_themeSkin .mceSplitButtonSelected a.mceOpen,.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,.wp_themeSkin .mceSplitButton a.mceAction:hover{background-color:#d5d5d5;border-color:#777!important;}.wp_themeSkin .mceSplitButtonActive{background-color:#B2B2B2;}.wp_themeSkin div.mceColorSplitMenu table{background-color:#ebebeb;border-color:#B2B2B2;}.wp_themeSkin .mceColorSplitMenu a{border-color:#B2B2B2;}.wp_themeSkin .mceColorSplitMenu a.mceMoreColors{border-color:#fff;}.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover{border-color:#0A246A;background-color:#B6BDD2;}.wp_themeSkin a.mceMoreColors:hover{border-color:#0A246A;}.wp_themeSkin .mceMenu{border-color:#ddd;}.wp_themeSkin .mceMenu table{background-color:#ebeaeb;}.wp_themeSkin .mceMenu .mceText{color:#000;}.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,.wp_themeSkin .mceMenu .mceMenuItemActive{background-color:#f5f5f5;}.wp_themeSkin td.mceMenuItemSeparator{background-color:#aaa;}.wp_themeSkin .mceMenuItemTitle a{background-color:#ccc;border-bottom-color:#aaa;}.wp_themeSkin .mceMenuItemTitle span.mceText{color:#000;}.wp_themeSkin .mceMenuItemDisabled .mceText{color:#888;}.wp_themeSkin tr.mceFirst td.mceToolbar{background:#dfdfdf url("../images/ed-bg.gif") repeat-x scroll left top;border-color:#dfdfdf;}.wp-admin #mceModalBlocker{background:#000;}.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft{background:#444;border-left:1px solid #999;border-top:1px solid #999;-moz-border-radius:4px 0 0 0;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px;}.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight{background:#444;border-right:1px solid #999;border-top:1px solid #999;border-top-right-radius:4px;-khtml-border-top-right-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius:0 4px 0 0;}.wp-admin .clearlooks2 .mceMiddle .mceLeft{background:#f1f1f1;border-left:1px solid #999;}.wp-admin .clearlooks2 .mceMiddle .mceRight{background:#f1f1f1;border-right:1px solid #999;}.wp-admin .clearlooks2 .mceBottom{background:#f1f1f1;border-bottom:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceLeft{background:#f1f1f1;border-bottom:1px solid #999;border-left:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceCenter{background:#f1f1f1;border-bottom:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceRight{background:#f1f1f1;border-bottom:1px solid #999;border-right:1px solid #999;}.wp-admin .clearlooks2 .mceFocus .mceTop span{color:#e5e5e5;}#editorcontainer,#post-status-info,#titlediv #title,.editwidget .widget-inside{border-color:#dfdfdf;}#titlediv #title{background-color:#fff;}#tTips p#tTips_inside{background-color:#ddd;color:#333;}#timestampdiv input,#namediv input,#poststuff .inside .the-tagcloud{border-color:#ddd;}#adminmenu *{border-color:#e3e3e3;}#adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;}.folded #adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;}#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -207px;}#adminmenu .wp-has-submenu:hover .wp-menu-toggle,#adminmenu .wp-menu-open .wp-menu-toggle{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;}#adminmenu a.menu-top{background:#f1f1f1 url(../images/menu-bits.gif?ver=20100610) repeat-x scroll left -379px;}#adminmenu .wp-submenu a{background:#fff url(../images/menu-bits.gif?ver=20100610) no-repeat scroll 0 -310px;}#adminmenu .wp-has-current-submenu ul li a{background:none;}#adminmenu .wp-has-current-submenu ul li a.current{background:url(../images/menu-dark.gif) top left no-repeat!important;}.wp-has-current-submenu .wp-submenu{border-top:none!important;}#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu{border-bottom:#aaa 1px solid;}#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,#adminmenu li.current a.menu-top{background:#e0e0e0 url(../images/menu-bits.gif?ver=20100610) top left repeat-x;border:#aaa 1px solid;color:#000;}#adminmenu li.wp-has-current-submenu .wp-submenu,#adminmenu li.wp-has-current-submenu ul li a{border-right-color:#aaa!important;border-left-color:#aaa!important;}#adminmenu li.wp-has-current-submenu ul li a{background:url(../images/menu-dark.gif) bottom left no-repeat!important;}#adminmenu li.wp-has-current-submenu ul{border-bottom-color:#aaa;}#adminmenu .wp-submenu .current a.current{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll 0 -289px;}#adminmenu .wp-submenu a:hover{background-color:#EAF2FA!important;color:#333!important;}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover{color:#333;background-color:#f5f5f5;background-image:none;border-color:#e3e3e3;}#adminmenu .wp-submenu ul{background-color:#fff;}.folded #adminmenu li.menu-top,#adminmenu .wp-submenu .wp-submenu-head{background-color:#F1F1F1;}.folded #adminmenu li.wp-has-current-submenu,.folded #adminmenu li.menu-top.current{background-color:#e6e6e6;}#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head{background-color:#EAEAEA;border-color:#aaa;}#adminmenu div.wp-submenu{background-color:transparent;}#adminmenu .menu-icon-dashboard div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -61px -33px;}#adminmenu .menu-icon-dashboard:hover div.wp-menu-image,#adminmenu .menu-icon-dashboard.wp-has-current-submenu div.wp-menu-image,#adminmenu .menu-icon-dashboard.current div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -61px -1px;}#adminmenu .menu-icon-post div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -272px -33px;}#adminmenu .menu-icon-post:hover div.wp-menu-image,#adminmenu .menu-icon-post.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -272px -1px;}#adminmenu .menu-icon-media div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -121px -33px;}#adminmenu .menu-icon-media:hover div.wp-menu-image,#adminmenu .menu-icon-media.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -121px -1px;}#adminmenu .menu-icon-links div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -91px -33px;}#adminmenu .menu-icon-links:hover div.wp-menu-image,#adminmenu .menu-icon-links.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -91px -1px;}#adminmenu .menu-icon-page div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -151px -33px;}#adminmenu .menu-icon-page:hover div.wp-menu-image,#adminmenu .menu-icon-page.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -151px -1px;}#adminmenu .menu-icon-comments div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -31px -33px;}#adminmenu .menu-icon-comments:hover div.wp-menu-image,#adminmenu .menu-icon-comments.wp-has-current-submenu div.wp-menu-image,#adminmenu .menu-icon-comments.current div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -31px -1px;}#adminmenu .menu-icon-appearance div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -1px -33px;}#adminmenu .menu-icon-appearance:hover div.wp-menu-image,#adminmenu .menu-icon-appearance.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -1px -1px;}#adminmenu .menu-icon-plugins div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -181px -33px;}#adminmenu .menu-icon-plugins:hover div.wp-menu-image,#adminmenu .menu-icon-plugins.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -181px -1px;}#adminmenu .menu-icon-users div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -301px -33px;}#adminmenu .menu-icon-users:hover div.wp-menu-image,#adminmenu .menu-icon-users.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -301px -1px;}#adminmenu .menu-icon-tools div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -211px -33px;}#adminmenu .menu-icon-tools:hover div.wp-menu-image,#adminmenu .menu-icon-tools.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -211px -1px;}#adminmenu .menu-icon-settings div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -241px -33px;}#adminmenu .menu-icon-settings:hover div.wp-menu-image,#adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -241px -1px;}#adminmenu .menu-icon-site div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -361px -33px;}#adminmenu .menu-icon-site:hover div.wp-menu-image,#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -361px -1px;}table.diff .diff-deletedline{background-color:#fdd;}table.diff .diff-deletedline del{background-color:#f99;}table.diff .diff-addedline{background-color:#dfd;}table.diff .diff-addedline ins{background-color:#9f9;}#att-info{background-color:#E4F2FD;}#sidemenu a{background-color:#f9f9f9;border-color:#f9f9f9;border-bottom-color:#dfdfdf;}#sidemenu a.current{background-color:#fff;border-color:#dfdfdf #dfdfdf #fff;color:#D54E21;}#screen-options-wrap,#contextual-help-wrap{background-color:#f1f1f1;border-color:#dfdfdf;}#screen-meta-links a.show-settings{color:#606060;}#screen-meta-links a.show-settings:hover{color:#000;}#replysubmit{background-color:#f1f1f1;border-top-color:#ddd;}#replyerror{border-color:#ddd;background-color:#f9f9f9;}#edithead,#replyhead{background-color:#f1f1f1;}#ed_reply_toolbar{background-color:#e9e9e9;}.vim-current,.vim-current th,.vim-current td{background-color:#E4F2FD!important;}.star-average,.star.star-rating{background-color:#fc0;}div.star.select:hover{background-color:#d00;}#plugin-information .fyi ul{background-color:#eaf3fa;}#plugin-information .fyi h2.mainheader{background-color:#cee1ef;}#plugin-information pre,#plugin-information code{background-color:#ededff;}#plugin-information pre{border:1px solid #ccc;}.inline-edit-row fieldset input[type="text"],.inline-edit-row fieldset textarea,#bulk-titles,#replyrow input{border-color:#ddd;}.inline-editor div.title{background-color:#EAF3FA;}.inline-editor ul.cat-checklist{background-color:#fff;border-color:#ddd;}.inline-editor .categories .catshow,.inline-editor .categories .cathide{color:#21759b;}.inline-editor .quick-edit-save{background-color:#f1f1f1;}#replyrow #ed_reply_toolbar input:hover{border-color:#aaa;background:#ddd;}fieldset.inline-edit-col-right .inline-edit-col{border-color:#dfdfdf;}.attention{color:#D54E21;}.meta-box-sortables .postbox:hover .handlediv{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -111px;}#major-publishing-actions{background:#eaf2fa;}.tablenav .tablenav-pages{color:#555;}.tablenav .tablenav-pages a{border-color:#e3e3e3;background:#eee url('../images/menu-bits.gif?ver=20100610') repeat-x scroll left -379px;}.tablenav .tablenav-pages a:hover{color:#d54e21;border-color:#d54321;}.tablenav .tablenav-pages a:active{color:#fff!important;}.tablenav .tablenav-pages .current{background:#dfdfdf;border-color:#d3d3d3;}#availablethemes,#availablethemes td{border-color:#ddd;}#current-theme img{border-color:#999;}#TB_window #TB_title a.tb-theme-preview-link,#TB_window #TB_title a.tb-theme-preview-link:visited{color:#999;}#TB_window #TB_title a.tb-theme-preview-link:hover,#TB_window #TB_title a.tb-theme-preview-link:focus{color:#ccc;}.misc-pub-section{border-bottom-color:#eee;}#minor-publishing{border-bottom-color:#ddd;}#post-body .misc-pub-section{border-right-color:#eee;}.post-com-count span{background-color:#bbb;}.form-table .color-palette td{border-color:#fff;}.sortable-placeholder{border-color:#bbb;background-color:#f5f5f5;}#post-body ul.category-tabs li.tabs a,#post-body ul.add-menu-item-tabs li.tabs a{color:#333;}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{border-color:#999;background-color:#eee;}#wp_editimgbtn:hover,#wp_delimgbtn:hover,#wp_editgallery:hover,#wp_delgallery:hover{border-color:#555;background-color:#ccc;}#favorite-first{border-color:#c0c0c0;background:#f1f1f1;background:-moz-linear-gradient(bottom,#e7e7e7,#fff);background:-webkit-gradient(linear,left bottom,left top,from(#e7e7e7),to(#fff));}#favorite-inside{border-color:#c0c0c0;background-color:#fff;}#favorite-toggle{background:transparent url(../images/fav-arrow.gif?ver=20100531) no-repeat 0 -4px;}#favorite-actions a{color:#464646;}#favorite-actions a:hover{color:#000;}#favorite-inside a:hover{text-decoration:underline;}#screen-meta a.show-settings{background-color:transparent;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}#icon-edit,#icon-post{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -552px -5px;}#icon-index{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -137px -5px;}#icon-upload{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -251px -5px;}#icon-link-manager,#icon-link,#icon-link-category{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -190px -5px;}#icon-edit-pages,#icon-page{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -312px -5px;}#icon-edit-comments{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -72px -5px;}#icon-themes{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -11px -5px;}#icon-plugins{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -370px -5px;}#icon-users,#icon-profile,#icon-user-edit{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -600px -5px;}#icon-tools,#icon-admin{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -432px -5px;}#icon-options-general{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -492px -5px;}#icon-ms-admin{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -659px -5px;}.view-switch #view-switch-list{background:transparent url(../images/list.png) no-repeat 0 0;}.view-switch #view-switch-list.current{background:transparent url(../images/list.png) no-repeat -40px 0;}.view-switch #view-switch-excerpt{background:transparent url(../images/list.png) no-repeat -20px 0;}.view-switch #view-switch-excerpt.current{background:transparent url(../images/list.png) no-repeat -60px 0;}#header-logo{background:transparent url(../images/wp-logo.png?ver=20100531) no-repeat scroll center center;}.popular-tags,.feature-filter{background-color:#fff;border-color:#DFDFDF;}#theme-information .action-button{border-top-color:#DFDFDF;}.theme-listing br.line{border-bottom-color:#ccc;}div.widgets-sortables,#widgets-left .inactive{background-color:#f1f1f1;border-color:#ddd;}#available-widgets .widget-holder{background-color:#fff;border-color:#ddd;}#widgets-left .sidebar-name{background-color:#aaa;background-image:url(../images/ed-bg.gif);text-shadow:#fff 0 1px 0;border-color:#dfdfdf;}#widgets-right .sidebar-name{background-image:url(../images/fav.png);text-shadow:#3f3f3f 0 -1px 0;background-color:#636363;border-color:#636363;color:#fff;}.sidebar-name:hover,#removing-widget{color:#d54e21;}#removing-widget span{color:black;}#widgets-left .sidebar-name-arrow{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;}#widgets-right .sidebar-name-arrow{background:transparent url(../images/widgets-arrow.gif?ver=20100531) no-repeat scroll 0 -1px;}.in-widget-title{color:#606060;}.deleting .widget-title *{color:#aaa;}.imgedit-menu div{border-color:#d5d5d5;background-color:#f1f1f1;}.imgedit-menu div:hover{border-color:#c1c1c1;background-color:#eaeaea;}.imgedit-menu div.disabled{border-color:#ccc;background-color:#ddd;filter:alpha(opacity=50);opacity:.5;}#dashboard_recent_comments div.undo{border-top-color:#dfdfdf;}.comment-ays,.comment-ays th{border-color:#ddd;}.comment-ays th{background-color:#f1f1f1;}#nav-menu-header,.menu-item-handle{background:url("../images/gray-grad.png") repeat-x scroll left top #dfdfdf;}#menu-management .nav-tab-active{background:#ececec;border-bottom-color:#ececec;}
\ No newline at end of file
+html{background-color:#f9f9f9;}* html input,* html .widget{border-color:#dfdfdf;}textarea,input[type="text"],input[type="password"],input[type="file"],input[type="button"],input[type="submit"],input[type="reset"],select{border-color:#dfdfdf;background-color:#fff;}kbd,code{background:#eaeaea;}input[readonly]{background-color:#eee;}.find-box-search{border-color:#dfdfdf;background-color:#f1f1f1;}.find-box{background-color:#f1f1f1;}.find-box-inside{background-color:#fff;}a.page-numbers:hover{border-color:#999;}body,#wpbody,.form-table .pre{color:#333;}body>#upload-menu{border-bottom-color:#fff;}#postcustomstuff table,#your-profile fieldset,#rightnow,div.dashboard-widget,#dashboard-widgets p.dashboard-widget-links,#replyrow #ed_reply_toolbar input{border-color:#ccc;}#poststuff .inside label.spam,#poststuff .inside label.deleted{color:red;}#poststuff .inside label.waiting{color:orange;}#poststuff .inside label.approved{color:green;}#postcustomstuff table{border-color:#dfdfdf;background-color:#F9F9F9;}#postcustomstuff thead th{background-color:#F1F1F1;}#postcustomstuff table input,#postcustomstuff table textarea{border-color:#dfdfdf;background-color:#fff;}.widefat{border-color:#dfdfdf;background-color:#fff;}div.dashboard-widget-error{background-color:#c43;}div.dashboard-widget-notice{background-color:#cfe1ef;}div.dashboard-widget-submit{border-top-color:#ccc;}div.tabs-panel,ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{border-color:#dfdfdf;}ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{background-color:#f1f1f1;}input.disabled,textarea.disabled{background-color:#ccc;}#plugin-information .action-button a,#plugin-information .action-button a:hover,#plugin-information .action-button a:visited{color:#fff;}.widget .widget-top,.postbox h3,.stuffbox h3{background:#dfdfdf url("../images/gray-grad.png") repeat-x left top;text-shadow:#fff 0 1px 0;}.form-table th,.form-wrap label{color:#222;text-shadow:#fff 0 1px 0;}.description,.form-wrap p{color:#666;}strong .post-com-count span{background-color:#21759b;}.sorthelper{background-color:#ccf3fa;}.ac_match,.subsubsub a.current{color:#000;}.wrap h2{color:#464646;}.ac_over{background-color:#f0f0b8;}.ac_results{background-color:#fff;border-color:#808080;}.ac_results li{color:#101010;}.alternate,.alt{background-color:#f9f9f9;}.available-theme a.screenshot{background-color:#f1f1f1;border-color:#ddd;}.bar{background-color:#e8e8e8;border-right-color:#99d;}#media-upload,#media-upload .media-item .slidetoggle{background:#fff;}#media-upload .slidetoggle{border-top-color:#dfdfdf;}.error,.login #login_error{background-color:#ffebe8;border-color:#c00;}.error a{color:#c00;}.form-invalid{background-color:#ffebe8!important;}.form-invalid input,.form-invalid select{border-color:#c00!important;}.submit{border-color:#DFDFDF;}.highlight{background-color:#e4f2fd;color:#d54e21;}.howto,.nonessential,#edit-slug-box,.form-input-tip,.rss-widget span.rss-date,.subsubsub{color:#666;}.media-item{border-bottom-color:#dfdfdf;}#wpbody-content #media-items .describe{border-top-color:#dfdfdf;}.media-upload-form label.form-help,td.help{color:#9a9a9a;}.post-com-count{background-image:url(../images/bubble_bg.gif);color:#fff;}.post-com-count span{background-color:#bbb;color:#fff;}.post-com-count:hover span{background-color:#d54e21;}.quicktags,.search{background-color:#ccc;color:#000;}.side-info h5{border-bottom-color:#dadada;}.side-info ul{color:#666;}.button,.button-secondary,.submit input,input[type=button],input[type=submit]{border-color:#bbb;color:#464646;}.button:hover,.button-secondary:hover,.submit input:hover,input[type=button]:hover,input[type=submit]:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;text-shadow:rgba(255,255,255,1) 0 1px 0;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}input.button-primary,button.button-primary,a.button-primary{border-color:#298cba;font-weight:bold;color:#fff;background:#21759B url(../images/button-grad.png) repeat-x scroll left top;text-shadow:rgba(0,0,0,0.3) 0 -1px 0;}input.button-primary:active,button.button-primary:active,a.button-primary:active{background:#21759b url(../images/button-grad-active.png) repeat-x scroll left top;color:#eaf2fa;}input.button-primary:hover,button.button-primary:hover,a.button-primary:hover,a.button-primary:focus,a.button-primary:active{border-color:#13455b;color:#eaf2fa;}.button-disabled,.button[disabled],.button:disabled,.button-secondary[disabled],.button-secondary:disabled,a.button.disabled{color:#aaa!important;border-color:#ddd!important;}.button-primary-disabled,.button-primary[disabled],.button-primary:disabled{color:#9FD0D5!important;background:#298CBA!important;}a:hover,a:active,a:focus{color:#d54e21;}#wphead #viewsite a:hover,#adminmenu a:hover,#adminmenu ul.wp-submenu a:hover,#the-comment-list .comment a:hover,#rightnow a:hover,#media-upload a.del-link:hover,div.dashboard-widget-submit input:hover,.subsubsub a:hover,.subsubsub a.current:hover,.ui-tabs-nav a:hover,.plugins .inactive a:hover,#all-plugins-table .plugins .inactive a:hover,#search-plugins-table .plugins .inactive a:hover{color:#d54e21;}#the-comment-list .comment-item,#dashboard-widgets #dashboard_quick_press form p.submit{border-color:#dfdfdf;}#side-sortables .category-tabs .tabs a,#side-sortables .add-menu-item-tabs .tabs a{color:#333;}#rightnow .rbutton{background-color:#ebebeb;color:#264761;}.submitbox .submit{background-color:#464646;color:#ccc;}.plugins a.delete:hover,#all-plugins-table .plugins a.delete:hover,#search-plugins-table .plugins a.delete:hover,.submitbox .submitdelete{color:#f00;border-bottom-color:#f00;}.submitbox .submitdelete:hover,#media-items a.delete:hover{color:#fff;background-color:#f00;border-bottom-color:#f00;}#normal-sortables .submitbox .submitdelete:hover{color:#000;background-color:#f00;border-bottom-color:#f00;}.tablenav .dots{border-color:transparent;}.tablenav .next,.tablenav .prev{border-color:transparent;color:#21759b;}.tablenav .next:hover,.tablenav .prev:hover{border-color:transparent;color:#d54e21;}.updated,.login .message{background-color:#ffffe0;border-color:#e6db55;}.update-message{color:#000;}a.page-numbers{border-bottom-color:#B8D3E2;}.commentlist li{border-bottom-color:#ccc;}.widefat td,.widefat th,#install-plugins .plugins td,#install-plugins .plugins th{border-color:#dfdfdf;}.widefat th{text-shadow:rgba(255,255,255,0.8) 0 1px 0;}.widefat thead tr th,.widefat tfoot tr th,h3.dashboard-widget-title,h3.dashboard-widget-title span,h3.dashboard-widget-title small,.find-box-head{color:#333;background:#dfdfdf url(../images/gray-grad.png) repeat-x scroll left top;}h3.dashboard-widget-title small a{color:#d7d7d7;}h3.dashboard-widget-title small a:hover{color:#fff;}a,#adminmenu a,#poststuff #edButtonPreview,#poststuff #edButtonHTML,#the-comment-list p.comment-author strong a,#media-upload a.del-link,#media-items a.delete,.plugins a.delete,.ui-tabs-nav a{color:#21759b;}body.press-this .tabs a,body.press-this .tabs a:hover{background-color:#fff;border-color:#c6d9e9;border-bottom-color:#fff;color:#d54e21;}#adminmenu #awaiting-mod,#adminmenu .update-plugins,#sidemenu a .update-plugins,#rightnow .reallynow{background-color:#464646;color:#fff;-moz-box-shadow:#fff 0 -1px 0;-khtml-box-shadow:#fff 0 -1px 0;-webkit-box-shadow:#fff 0 -1px 0;box-shadow:#fff 0 -1px 0;}#plugin-information .action-button{background-color:#d54e21;color:#fff;}#adminmenu li.current a #awaiting-mod,#adminmenu li a.wp-has-current-submenu .update-plugins{background-color:#464646;color:#fff;-moz-box-shadow:#fff 0 -1px 0;-khtml-box-shadow:#fff 0 -1px 0;-webkit-box-shadow:#fff 0 -1px 0;box-shadow:#fff 0 -1px 0;}div#media-upload-header,div#plugin-information-header{background-color:#f9f9f9;border-bottom-color:#dfdfdf;}#currenttheme img{border-color:#666;}#dashboard_secondary div.dashboard-widget-content ul li a{background-color:#f9f9f9;}input.readonly,textarea.readonly{background-color:#ddd;}#ed_toolbar input,#ed_reply_toolbar input{background:#fff url("../images/fade-butt.png") repeat-x 0 -2px;}#editable-post-name{background-color:#fffbcc;}#edit-slug-box strong,.tablenav .displaying-num,#submitted-on{color:#777;}.login #nav a{color:#21759b!important;}.login #nav a:hover{color:#d54e21!important;}#footer{color:#777;border-color:#d1d1d1;background:#d9d9d9;background:-moz-linear-gradient(bottom,#d7d7d7,#e4e4e4);background:-webkit-gradient(linear,left bottom,left top,from(#d7d7d7),to(#e4e4e4));}#media-items,.imgedit-group{border-color:#dfdfdf;}.checkbox,.side-info,.plugins tr,#your-profile #rich_editing{background-color:#fff;}.plugins .inactive,.plugins .inactive th,.plugins .inactive td,tr.inactive+tr.plugin-update-tr .plugin-update{background-color:#eee;}.plugin-update-tr .update-message{background-color:#fffbe4;border-color:#dfdfdf;}.plugins .active,.plugins .active th,.plugins .active td{color:#000;}.plugins .inactive a{color:#579;}#the-comment-list tr.undo,#the-comment-list div.undo{background-color:#f4f4f4;}#the-comment-list .unapproved{background-color:#ffffe0;}#the-comment-list .approve a{color:#006505;}#the-comment-list .unapprove a{color:#d98500;}table.widefat span.delete a,table.widefat span.trash a,table.widefat span.spam a,#dashboard_recent_comments .delete a,#dashboard_recent_comments .trash a,#dashboard_recent_comments .spam a{color:#bc0b0b;}.widget,#widget-list .widget-top,.postbox,#titlediv,#poststuff .postarea,.stuffbox{border-color:#dfdfdf;}.widget,.postbox{background-color:#fff;}.ui-sortable .postbox h3{color:#464646;}.widget .widget-top,.ui-sortable .postbox h3:hover{color:#000;}.curtime #timestamp{background-image:url(../images/date-button.gif);}#quicktags #ed_link{color:#00f;}#rightnow .youhave{background-color:#f0f6fb;}#rightnow a{color:#448abd;}.tagchecklist span a,#bulk-titles div a{background:url(../images/xit.gif) no-repeat;}.tagchecklist span a:hover,#bulk-titles div a:hover{background:url(../images/xit.gif) no-repeat -10px 0;}#update-nag,.update-nag{background-color:#FFFBCC;border-color:#E6DB55;color:#555;}.login #backtoblog a{color:#464646;}#wphead{border-bottom:#c6c6c6 1px solid;background:#d9d9d9;background:-moz-linear-gradient(bottom,#d7d7d7,#e4e4e4);background:-webkit-gradient(linear,left bottom,left top,from(#d7d7d7),to(#e4e4e4));}#wphead h1 a{color:#464646;}#user_info{color:#777;}#user_info a:link,#user_info a:visited,#footer a:link,#footer a:visited{color:#222;text-decoration:none;}#user_info a:hover,#footer a:hover{color:#000;text-decoration:underline!important;}#user_info a:active,#footer a:active{color:#ccc!important;}div#media-upload-error,.file-error,abbr.required,.widget-control-remove:hover,table.widefat .delete a:hover,table.widefat .trash a:hover,table.widefat .spam a:hover,#dashboard_recent_comments .delete a:hover,#dashboard_recent_comments .trash a:hover #dashboard_recent_comments .spam a:hover{color:#f00;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;}#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;}#quicktags{border-color:#dfdfdf;background-color:#dfdfdf;}#ed_toolbar input{border-color:#C3C3C3;}#ed_toolbar input:hover{border-color:#aaa;background:#ddd;}#poststuff .wp_themeSkin .mceStatusbar{border-color:#EDEDED;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{background-color:#f1f1f1;border-color:#dfdfdf;color:#999;}#poststuff #editor-toolbar .active{border-bottom-color:#e9e9e9;background-color:#e9e9e9;color:#333;}#post-status-info{background-color:#EDEDED;}.wp_themeSkin *,.wp_themeSkin a:hover,.wp_themeSkin a:link,.wp_themeSkin a:visited,.wp_themeSkin a:active{color:#000;}.wp_themeSkin iframe{background:#fff;}.wp_themeSkin .mceStatusbar{color:#000;background-color:#f5f5f5;}.wp_themeSkin .mceButton{background-color:#e9e8e8;border-color:#B2B2B2;}.wp_themeSkin a.mceButtonEnabled:hover,.wp_themeSkin a.mceButtonActive,.wp_themeSkin a.mceButtonSelected{background-color:#d5d5d5;border-color:#777!important;}.wp_themeSkin .mceButtonDisabled{border-color:#ccc!important;}.wp_themeSkin .mceListBox .mceText,.wp_themeSkin .mceListBox .mceOpen{border-color:#B2B2B2;background-color:#d5d5d5;}.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,.wp_themeSkin .mceListBoxHover .mceOpen,.wp_themeSkin .mceListBoxSelected .mceOpen,.wp_themeSkin .mceListBoxSelected .mceText{border-color:#777!important;background-color:#d5d5d5;}.wp_themeSkin table.mceListBoxEnabled:hover .mceText,.wp_themeSkin .mceListBoxHover .mceText{border-color:#777!important;}.wp_themeSkin select.mceListBox{border-color:#B2B2B2;background-color:#fff;}.wp_themeSkin .mceSplitButton a.mceAction,.wp_themeSkin .mceSplitButton a.mceOpen{border-color:#B2B2B2;}.wp_themeSkin .mceSplitButton a.mceOpen:hover,.wp_themeSkin .mceSplitButtonSelected a.mceOpen,.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,.wp_themeSkin .mceSplitButton a.mceAction:hover{background-color:#d5d5d5;border-color:#777!important;}.wp_themeSkin .mceSplitButtonActive{background-color:#B2B2B2;}.wp_themeSkin div.mceColorSplitMenu table{background-color:#ebebeb;border-color:#B2B2B2;}.wp_themeSkin .mceColorSplitMenu a{border-color:#B2B2B2;}.wp_themeSkin .mceColorSplitMenu a.mceMoreColors{border-color:#fff;}.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover{border-color:#0A246A;background-color:#B6BDD2;}.wp_themeSkin a.mceMoreColors:hover{border-color:#0A246A;}.wp_themeSkin .mceMenu{border-color:#ddd;}.wp_themeSkin .mceMenu table{background-color:#ebeaeb;}.wp_themeSkin .mceMenu .mceText{color:#000;}.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,.wp_themeSkin .mceMenu .mceMenuItemActive{background-color:#f5f5f5;}.wp_themeSkin td.mceMenuItemSeparator{background-color:#aaa;}.wp_themeSkin .mceMenuItemTitle a{background-color:#ccc;border-bottom-color:#aaa;}.wp_themeSkin .mceMenuItemTitle span.mceText{color:#000;}.wp_themeSkin .mceMenuItemDisabled .mceText{color:#888;}.wp_themeSkin tr.mceFirst td.mceToolbar{background:#dfdfdf url("../images/ed-bg.gif") repeat-x scroll left top;border-color:#dfdfdf;}.wp-admin #mceModalBlocker{background:#000;}.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft{background:#444;border-left:1px solid #999;border-top:1px solid #999;-moz-border-radius:4px 0 0 0;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px;}.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight{background:#444;border-right:1px solid #999;border-top:1px solid #999;border-top-right-radius:4px;-khtml-border-top-right-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius:0 4px 0 0;}.wp-admin .clearlooks2 .mceMiddle .mceLeft{background:#f1f1f1;border-left:1px solid #999;}.wp-admin .clearlooks2 .mceMiddle .mceRight{background:#f1f1f1;border-right:1px solid #999;}.wp-admin .clearlooks2 .mceBottom{background:#f1f1f1;border-bottom:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceLeft{background:#f1f1f1;border-bottom:1px solid #999;border-left:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceCenter{background:#f1f1f1;border-bottom:1px solid #999;}.wp-admin .clearlooks2 .mceBottom .mceRight{background:#f1f1f1;border-bottom:1px solid #999;border-right:1px solid #999;}.wp-admin .clearlooks2 .mceFocus .mceTop span{color:#e5e5e5;}#editorcontainer,#post-status-info,#titlediv #title,.editwidget .widget-inside{border-color:#dfdfdf;}#titlediv #title{background-color:#fff;}#tTips p#tTips_inside{background-color:#ddd;color:#333;}#timestampdiv input,#namediv input,#poststuff .inside .the-tagcloud{border-color:#ddd;}#adminmenu *{border-color:#e3e3e3;}#adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;}.folded #adminmenu li.wp-menu-separator{background:transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;}#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -207px;}#adminmenu .wp-has-submenu:hover .wp-menu-toggle,#adminmenu .wp-menu-open .wp-menu-toggle{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;}#adminmenu a.menu-top{background:#f1f1f1 url(../images/menu-bits.gif?ver=20100610) repeat-x scroll left -379px;}#adminmenu .wp-submenu a{background:#fff url(../images/menu-bits.gif?ver=20100610) no-repeat scroll 0 -310px;}#adminmenu .wp-has-current-submenu ul li a{background:none;}#adminmenu .wp-has-current-submenu ul li a.current{background:url(../images/menu-dark.gif) top left no-repeat!important;}.wp-has-current-submenu .wp-submenu{border-top:none!important;}#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu{border-bottom:#aaa 1px solid;}#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,#adminmenu li.current a.menu-top{background:#e0e0e0 url(../images/menu-bits.gif?ver=20100610) top left repeat-x;border:#aaa 1px solid;color:#000;}#adminmenu li.wp-has-current-submenu .wp-submenu,#adminmenu li.wp-has-current-submenu ul li a{border-right-color:#aaa!important;border-left-color:#aaa!important;}#adminmenu li.wp-has-current-submenu ul li a{background:url(../images/menu-dark.gif) bottom left no-repeat!important;}#adminmenu li.wp-has-current-submenu ul{border-bottom-color:#aaa;}#adminmenu .wp-submenu .current a.current{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll 0 -289px;}#adminmenu .wp-submenu a:hover{background-color:#EAF2FA!important;color:#333!important;}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover{color:#333;background-color:#f5f5f5;background-image:none;border-color:#e3e3e3;}#adminmenu .wp-submenu ul{background-color:#fff;}.folded #adminmenu li.menu-top,#adminmenu .wp-submenu .wp-submenu-head{background-color:#F1F1F1;}.folded #adminmenu li.wp-has-current-submenu,.folded #adminmenu li.menu-top.current{background-color:#e6e6e6;}#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head{background-color:#EAEAEA;border-color:#aaa;}#adminmenu div.wp-submenu{background-color:transparent;}#adminmenu .menu-icon-dashboard div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -61px -33px;}#adminmenu .menu-icon-dashboard:hover div.wp-menu-image,#adminmenu .menu-icon-dashboard.wp-has-current-submenu div.wp-menu-image,#adminmenu .menu-icon-dashboard.current div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -61px -1px;}#adminmenu .menu-icon-post div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -272px -33px;}#adminmenu .menu-icon-post:hover div.wp-menu-image,#adminmenu .menu-icon-post.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -272px -1px;}#adminmenu .menu-icon-media div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -121px -33px;}#adminmenu .menu-icon-media:hover div.wp-menu-image,#adminmenu .menu-icon-media.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -121px -1px;}#adminmenu .menu-icon-links div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -91px -33px;}#adminmenu .menu-icon-links:hover div.wp-menu-image,#adminmenu .menu-icon-links.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -91px -1px;}#adminmenu .menu-icon-page div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -151px -33px;}#adminmenu .menu-icon-page:hover div.wp-menu-image,#adminmenu .menu-icon-page.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -151px -1px;}#adminmenu .menu-icon-comments div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -31px -33px;}#adminmenu .menu-icon-comments:hover div.wp-menu-image,#adminmenu .menu-icon-comments.wp-has-current-submenu div.wp-menu-image,#adminmenu .menu-icon-comments.current div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -31px -1px;}#adminmenu .menu-icon-appearance div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -1px -33px;}#adminmenu .menu-icon-appearance:hover div.wp-menu-image,#adminmenu .menu-icon-appearance.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -1px -1px;}#adminmenu .menu-icon-plugins div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -181px -33px;}#adminmenu .menu-icon-plugins:hover div.wp-menu-image,#adminmenu .menu-icon-plugins.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -181px -1px;}#adminmenu .menu-icon-users div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -301px -33px;}#adminmenu .menu-icon-users:hover div.wp-menu-image,#adminmenu .menu-icon-users.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -301px -1px;}#adminmenu .menu-icon-tools div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -211px -33px;}#adminmenu .menu-icon-tools:hover div.wp-menu-image,#adminmenu .menu-icon-tools.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -211px -1px;}#adminmenu .menu-icon-settings div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -241px -33px;}#adminmenu .menu-icon-settings:hover div.wp-menu-image,#adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -241px -1px;}#adminmenu .menu-icon-site div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -361px -33px;}#adminmenu .menu-icon-site:hover div.wp-menu-image,#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image{background:transparent url('../images/menu.png?ver=20100531') no-repeat scroll -361px -1px;}table.diff .diff-deletedline{background-color:#fdd;}table.diff .diff-deletedline del{background-color:#f99;}table.diff .diff-addedline{background-color:#dfd;}table.diff .diff-addedline ins{background-color:#9f9;}#att-info{background-color:#E4F2FD;}#sidemenu a{background-color:#f9f9f9;border-color:#f9f9f9;border-bottom-color:#dfdfdf;}#sidemenu a.current{background-color:#fff;border-color:#dfdfdf #dfdfdf #fff;color:#D54E21;}#screen-options-wrap,#contextual-help-wrap{background-color:#f1f1f1;border-color:#dfdfdf;}#screen-meta-links a.show-settings{color:#606060;}#screen-meta-links a.show-settings:hover{color:#000;}#replysubmit{background-color:#f1f1f1;border-top-color:#ddd;}#replyerror{border-color:#ddd;background-color:#f9f9f9;}#edithead,#replyhead{background-color:#f1f1f1;}#ed_reply_toolbar{background-color:#e9e9e9;}.vim-current,.vim-current th,.vim-current td{background-color:#E4F2FD!important;}.star-average,.star.star-rating{background-color:#fc0;}div.star.select:hover{background-color:#d00;}#plugin-information .fyi ul{background-color:#eaf3fa;}#plugin-information .fyi h2.mainheader{background-color:#cee1ef;}#plugin-information pre,#plugin-information code{background-color:#ededff;}#plugin-information pre{border:1px solid #ccc;}.inline-edit-row fieldset input[type="text"],.inline-edit-row fieldset textarea,#bulk-titles,#replyrow input{border-color:#ddd;}.inline-editor div.title{background-color:#EAF3FA;}.inline-editor ul.cat-checklist{background-color:#fff;border-color:#ddd;}.inline-editor .categories .catshow,.inline-editor .categories .cathide{color:#21759b;}.inline-editor .quick-edit-save{background-color:#f1f1f1;}#replyrow #ed_reply_toolbar input:hover{border-color:#aaa;background:#ddd;}fieldset.inline-edit-col-right .inline-edit-col{border-color:#dfdfdf;}.attention{color:#D54E21;}.meta-box-sortables .postbox:hover .handlediv{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -111px;}#major-publishing-actions{background:#eaf2fa;}.tablenav .tablenav-pages{color:#555;}.tablenav .tablenav-pages a{border-color:#e3e3e3;background:#eee url('../images/menu-bits.gif?ver=20100610') repeat-x scroll left -379px;}.tablenav .tablenav-pages a:hover{color:#d54e21;border-color:#d54321;}.tablenav .tablenav-pages a:active{color:#fff!important;}.tablenav .tablenav-pages .current{background:#dfdfdf;border-color:#d3d3d3;}#availablethemes,#availablethemes td{border-color:#ddd;}#current-theme img{border-color:#999;}#TB_window #TB_title a.tb-theme-preview-link,#TB_window #TB_title a.tb-theme-preview-link:visited{color:#999;}#TB_window #TB_title a.tb-theme-preview-link:hover,#TB_window #TB_title a.tb-theme-preview-link:focus{color:#ccc;}.misc-pub-section{border-bottom-color:#eee;}#minor-publishing{border-bottom-color:#ddd;}#post-body .misc-pub-section{border-right-color:#eee;}.post-com-count span{background-color:#bbb;}.form-table .color-palette td{border-color:#fff;}.sortable-placeholder{border-color:#bbb;background-color:#f5f5f5;}#post-body ul.category-tabs li.tabs a,#post-body ul.add-menu-item-tabs li.tabs a{color:#333;}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{border-color:#999;background-color:#eee;}#wp_editimgbtn:hover,#wp_delimgbtn:hover,#wp_editgallery:hover,#wp_delgallery:hover{border-color:#555;background-color:#ccc;}#favorite-first{border-color:#c0c0c0;background:#f1f1f1;background:-moz-linear-gradient(bottom,#e7e7e7,#fff);background:-webkit-gradient(linear,left bottom,left top,from(#e7e7e7),to(#fff));}#favorite-inside{border-color:#c0c0c0;background-color:#fff;}#favorite-toggle{background:transparent url(../images/fav-arrow.gif?ver=20100531) no-repeat 0 -4px;}#favorite-actions a{color:#464646;}#favorite-actions a:hover{color:#000;}#favorite-inside a:hover{text-decoration:underline;}#screen-meta a.show-settings{background-color:transparent;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}#icon-edit,#icon-post{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -552px -5px;}#icon-index{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -137px -5px;}#icon-upload{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -251px -5px;}#icon-link-manager,#icon-link,#icon-link-category{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -190px -5px;}#icon-edit-pages,#icon-page{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -312px -5px;}#icon-edit-comments{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -72px -5px;}#icon-themes{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -11px -5px;}#icon-plugins{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -370px -5px;}#icon-users,#icon-profile,#icon-user-edit{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -600px -5px;}#icon-tools,#icon-admin{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -432px -5px;}#icon-options-general{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -492px -5px;}#icon-ms-admin{background:transparent url(../images/icons32.png?ver=20100531) no-repeat -659px -5px;}.view-switch #view-switch-list{background:transparent url(../images/list.png) no-repeat 0 0;}.view-switch .current #view-switch-list{background:transparent url(../images/list.png) no-repeat -40px 0;}.view-switch #view-switch-excerpt{background:transparent url(../images/list.png) no-repeat -20px 0;}.view-switch .current #view-switch-excerpt{background:transparent url(../images/list.png) no-repeat -60px 0;}#header-logo{background:transparent url(../images/wp-logo.png?ver=20100531) no-repeat scroll center center;}.popular-tags,.feature-filter{background-color:#fff;border-color:#DFDFDF;}#theme-information .action-button{border-top-color:#DFDFDF;}.theme-listing br.line{border-bottom-color:#ccc;}div.widgets-sortables,#widgets-left .inactive{background-color:#f1f1f1;border-color:#ddd;}#available-widgets .widget-holder{background-color:#fff;border-color:#ddd;}#widgets-left .sidebar-name{background-color:#aaa;background-image:url(../images/ed-bg.gif);text-shadow:#fff 0 1px 0;border-color:#dfdfdf;}#widgets-right .sidebar-name{background-image:url(../images/fav.png);text-shadow:#3f3f3f 0 -1px 0;background-color:#636363;border-color:#636363;color:#fff;}.sidebar-name:hover,#removing-widget{color:#d54e21;}#removing-widget span{color:black;}#widgets-left .sidebar-name-arrow{background:transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;}#widgets-right .sidebar-name-arrow{background:transparent url(../images/widgets-arrow.gif?ver=20100531) no-repeat scroll 0 -1px;}.in-widget-title{color:#606060;}.deleting .widget-title *{color:#aaa;}.imgedit-menu div{border-color:#d5d5d5;background-color:#f1f1f1;}.imgedit-menu div:hover{border-color:#c1c1c1;background-color:#eaeaea;}.imgedit-menu div.disabled{border-color:#ccc;background-color:#ddd;filter:alpha(opacity=50);opacity:.5;}#dashboard_recent_comments div.undo{border-top-color:#dfdfdf;}.comment-ays,.comment-ays th{border-color:#ddd;}.comment-ays th{background-color:#f1f1f1;}#nav-menu-header,.menu-item-handle{background:url("../images/gray-grad.png") repeat-x scroll left top #dfdfdf;}#menu-management .nav-tab-active{background:#ececec;border-bottom-color:#ececec;}
\ No newline at end of file
diff --git a/wp-admin/css/colors-fresh.dev.css b/wp-admin/css/colors-fresh.dev.css
index f7790130e4..80617beb45 100644
--- a/wp-admin/css/colors-fresh.dev.css
+++ b/wp-admin/css/colors-fresh.dev.css
@@ -1575,7 +1575,7 @@ fieldset.inline-edit-col-right .inline-edit-col {
 	background: transparent url(../images/list.png) no-repeat 0 0;
 }
 
-.view-switch #view-switch-list.current {
+.view-switch .current #view-switch-list {
 	background: transparent url(../images/list.png) no-repeat -40px 0;
 }
 
@@ -1583,7 +1583,7 @@ fieldset.inline-edit-col-right .inline-edit-col {
 	background: transparent url(../images/list.png) no-repeat -20px 0;
 }
 
-.view-switch #view-switch-excerpt.current {
+.view-switch .current #view-switch-excerpt {
 	background: transparent url(../images/list.png) no-repeat -60px 0;
 }
 
@@ -1693,4 +1693,4 @@ div.widgets-sortables,
 #menu-management .nav-tab-active {
 	background: #ececec;
 	border-bottom-color: #ececec;
-}
\ No newline at end of file
+}
diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css
index a7a2dbf99a..d330e50c8f 100644
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
@@ -1 +1 @@
-textarea,input[type="text"],input[type="password"],input[type="file"],input[type="button"],input[type="submit"],input[type="reset"],select{border-width:1px;border-style:solid;-moz-border-radius:4px;-khtml-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;}p,ul,ol,blockquote,input,select{font-size:12px;}select option{padding:2px;}.plugins .name,#pass-strength-result.strong,#pass-strength-result.short,.button-highlighted,input.button-highlighted,#quicktags #ed_strong,#ed_reply_toolbar #ed_reply_strong{font-weight:bold;}.plugins p{margin:0 4px;padding:0;}.plugins .desc p{margin:0 0 8px;}.plugins td.desc{line-height:1.5em;}.plugins .desc ul,.plugins .desc ol{margin:0 0 0 2em;}.plugins .desc ul{list-style-type:disc;}.plugins .action-links{white-space:nowrap;}.plugins .row-actions-visible{padding:0;}.widefat tbody.plugins th.check-column{padding:7px 0;}.widefat .plugins td,.widefat .plugins th{border-bottom:0 none;}#install-plugins .plugins td,#install-plugins .plugins th{border-bottom-style:solid;border-bottom-width:1px;}.plugins .inactive td,.plugins .inactive th,.plugins .active td,.plugins .active th{border-top-style:solid;border-top-width:1px;padding:5px 7px 0;}#wpbody-content .plugins .plugin-title{padding-right:12px;}.plugins .second td,.plugins .second th{border-top:0 none;padding:0 7px 5px;}.plugins-php .widefat tfoot th,.plugins-php .widefat tfoot td{border-top-style:solid;border-top-width:1px;}.import-system{font-size:16px;}.anchors{margin:10px 20px 10px 20px;}table#availablethemes{border-spacing:0;border-width:1px 0;border-style:solid none;margin:10px auto;width:100%;}td.available-theme{vertical-align:top;width:240px;margin:0;padding:20px;text-align:left;}table#availablethemes td{border-width:0 1px 1px;border-style:none solid solid;}table#availablethemes td.right,table#availablethemes td.left{border-right:0 none;border-left:0 none;}table#availablethemes td.bottom{border-bottom:0 none;}.available-theme a.screenshot{width:240px;height:180px;display:block;border-width:1px;border-style:solid;margin-bottom:10px;overflow:hidden;}.available-theme img{width:240px;}.available-theme h3{margin:15px 0 5px;}#current-theme{margin:1em 0 1.5em;}#current-theme a{border-bottom:none;}#current-theme h3{font-size:17px;font-weight:normal;margin:0;}#current-theme .theme-description{margin-top:5px;}#current-theme img{float:left;border-width:1px;border-style:solid;margin-right:1em;margin-bottom:1.5em;width:150px;}#TB_window #TB_title a.tb-theme-preview-link,#TB_window #TB_title a.tb-theme-preview-link:visited{font-weight:bold;text-decoration:none;}#TB_window #TB_title{background-color:#222;color:#cfcfcf;}.checkbox{border:none;margin:0;padding:0;}.code,code{font-family:Consolas,Monaco,Courier,monospace;}kbd,code{padding:1px 3px;margin:0 1px;font-size:11px;}.commentlist li{padding:1em 1em .2em;margin:0;border-bottom-width:1px;border-bottom-style:solid;}.commentlist li li{border-bottom:0;padding:0;}.commentlist p{padding:0;margin:0 0 .8em;}.post-categories{display:inline;margin:0;padding:0;}.post-categories li{display:inline;}.quicktags,.search{font:12px Georgia,"Times New Roman","Bitstream Charter",Times,serif;}.submit{padding:1.5em 0;margin:5px 0;-moz-border-radius:0 0 3px 3px;-webkit-border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;-khtml-border-bottom-left-radius:3px;-khtml-border-bottom-right-radius:3px;border-bottom-left-radius:3px;border-bottom-right-radius:3px;}form p.submit a.cancel:hover{text-decoration:none;}#submitdiv h3{margin-bottom:0!important;}#misc-publishing-actions{padding:6px 0 16px 0;}.misc-pub-section{padding:6px;border-bottom-width:1px;border-bottom-style:solid;}.misc-pub-section-last{border-bottom:0 none;}#minor-publishing-actions{padding:6px;text-align:right;}#minor-publishing{border-bottom-width:1px;border-bottom-style:solid;}#save-post{float:left;}.preview{float:right;}#major-publishing-actions{padding:6px;clear:both;border-top:none;}#minor-publishing-actions input,#major-publishing-actions input,#minor-publishing-actions .preview{min-width:80px;text-align:center;}#delete-action{line-height:25px;vertical-align:middle;text-align:left;float:left;}#publishing-action{text-align:right;float:right;line-height:23px;}#post-body #minor-publishing{padding-bottom:10px;}#post-body #misc-publishing-actions{padding:0;}#post-body .misc-pub-section{border-right-width:1px;border-right-style:solid;border-bottom:0 none;min-height:30px;float:left;max-width:32%;}#post-body .misc-pub-section-last{border-right:0;}#sticky-span{margin-left:18px;}#post-status-display,#post-visibility-display{font-weight:bold;}.side-info{margin:0;padding:4px;font-size:11px;}.side-info h5{padding-bottom:7px;font-size:14px;margin:12px 2px 5px;border-bottom-width:1px;border-bottom-style:solid;}.side-info ul{margin:0;padding-left:18px;list-style:square;}.submit input,.button,input.button,.button-primary,input.button-primary,.button-secondary,input.button-secondary,.button-highlighted,input.button-highlighted,#postcustomstuff .submit input{text-decoration:none;font-size:11px!important;line-height:13px;padding:3px 8px;cursor:pointer;border-width:1px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}a.button,a.button-primary,a.button-secondary{line-height:15px;padding:3px 10px;white-space:nowrap;-webkit-border-radius:10px;}#doaction,#doaction2,#post-query-submit{margin-right:8px;}.tablenav select[name="action"],.tablenav select[name="action2"]{width:130px;}.tablenav select[name="m"]{width:155px;}.tablenav select#cat{width:170px;}#wpcontent select{padding:2px;height:2em;font-size:11px;}#wpcontent option{padding:2px;}#timezone_string option{margin-left:1em;}.approve{display:none;}.unapproved .approve,.spam .approve,.trash .approve{display:inline;}.unapproved .unapprove{display:none;}.narrow{width:70%;margin-bottom:40px;}.narrow p{line-height:150%;}textarea.all-options,input.all-options{width:250px;}#namediv table{width:100%;}#namediv td.first{width:10px;white-space:nowrap;}#namediv input{width:98%;}#namediv p{margin:10px 0;}#wpbody-content .metabox-holder{padding-top:10px;}#content{margin:0;width:100%;}#editorcontainer #content{padding:6px;line-height:150%;border:0 none;outline:none;resize:vertical;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-khtml-box-sizing:border-box;box-sizing:border-box;}#editorcontainer,#quicktags{border-style:solid;border-width:1px;border-collapse:separate;-moz-border-radius:6px 6px 0 0;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px;-khtml-border-top-right-radius:6px;-khtml-border-top-left-radius:6px;border-top-right-radius:6px;border-top-left-radius:6px;}#quicktags{padding:0;margin-bottom:-3px;border-bottom-width:3px;background-image:url("../images/ed-bg.gif");background-position:left top;background-repeat:repeat-x;}#quicktags #ed_toolbar{padding:2px 4px 0;}#ed_toolbar input,#ed_reply_toolbar input{margin:3px 1px 4px;line-height:18px;display:inline-block;min-width:26px;padding:2px 4px;font-size:12px;}#ed_reply_toolbar input{margin:1px 2px 1px 1px;}#quicktags #ed_link,#ed_reply_toolbar #ed_reply_link{text-decoration:underline;}#quicktags #ed_del,#ed_reply_toolbar #ed_reply_del{text-decoration:line-through;}#quicktags #ed_em,#ed_reply_toolbar #ed_reply_em{font-style:italic;}#excerpt,.attachmentlinks{margin:0;height:4em;width:98%;}#postcustomstuff table,#postcustomstuff input,#postcustomstuff textarea{border-width:1px;border-style:solid;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}#postcustomstuff .updatemeta,#postcustomstuff .deletemeta{margin:auto;}#postcustomstuff thead th{padding:5px 8px 8px;}#postcustom #postcustomstuff .submit{border:0 none;float:none;padding:5px 8px;}#side-sortables #postcustom #postcustomstuff .submit{padding:0 5px;}#side-sortables #postcustom #postcustomstuff td.left input{margin:3px 3px 0;}#side-sortables #postcustom #postcustomstuff #the-list textarea{height:85px;margin:3px;}#postcustomstuff table{margin:0;width:100%;border-width:1px;border-style:solid;border-spacing:0;}#postcustomstuff table input,#postcustomstuff table select,#postcustomstuff table textarea{width:95%;margin:8px 0 8px 8px;}#postcustomstuff th.left,#postcustomstuff td.left{width:38%;}#postcustomstuff .submit input{width:auto;}#postcustomstuff #newmeta .submit{padding:0 8px;}#postcustomstuff table #addmetasub{width:auto;}#postcustomstuff #newmetaleft{vertical-align:top;}#postcustomstuff #newmetaleft a{padding:0 10px;text-decoration:none;}#save{width:15em;}#template div{margin-right:190px;}* html #template div{margin-right:0;}.zerosize{height:0;width:0;margin:0;border:0;padding:0;overflow:hidden;position:absolute;}* html #themeselect{padding:0 3px;height:22px;}#your-profile legend{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:22px;}#your-profile #rich_editing{border:none;}#howto{font-size:11px;margin:0 5px;display:block;}#ajax-response.alignleft{margin-left:2em;}div.nav{height:2em;padding:7px 10px;vertical-align:text-top;margin:5px 0;}.nav .button-secondary{padding:2px 4px;}a.page-numbers{border-bottom-style:solid;border-bottom-width:2px;font-weight:bold;margin-right:1px;padding:0 2px;}p.pagenav{margin:0;display:inline;}.pagenav span{font-weight:bold;margin:0 6px;}.row-title{font-size:12px!important;font-weight:bold;}.widefat .column-comment p{margin:.6em 0;}.column-author img,.column-username img{float:left;margin-right:10px;margin-top:3px;}.tablenav a.button-secondary{display:block;margin:3px 8px 0 0;}.tablenav{clear:both;height:30px;margin:6px 0 4px;vertical-align:middle;}.tablenav .tablenav-pages{float:right;display:block;cursor:default;height:30px;line-height:30px;font-size:11px;}.tablenav .tablenav-pages a,.tablenav-pages span.current{text-decoration:none;border:none;padding:3px 6px;border-width:1px;border-style:solid;-moz-border-radius:5px;-khtml-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}.tablenav .displaying-num{margin-right:10px;font-size:12px;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-style:italic;}.tablenav .actions{padding:2px 8px 0 0;}td.media-icon{text-align:center;width:80px;padding-top:8px;padding-bottom:8px;}td.media-icon img{max-width:80px;max-height:60px;}#update-nag,.update-nag{line-height:19px;padding:5px 0;font-size:12px;text-align:center;margin:0 15px;border-width:1px;border-style:solid;border-top-width:0;border-top-style:none;-moz-border-radius:0 0 6px 6px;-webkit-border-bottom-right-radius:6px;-webkit-border-bottom-left-radius:6px;-khtml-border-bottom-right-radius:6px;-khtml-border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-bottom-left-radius:6px;}.plugins .plugin-update{padding:0;}.plugin-update .update-message{margin:0 10px 8px 31px;font-weight:bold;}#pass-strength-result{border-style:solid;border-width:1px;float:left;margin:12px 5px 5px 1px;padding:3px 5px;text-align:center;width:200px;}.row-actions{visibility:hidden;padding:2px 0 0;}tr:hover .row-actions,div.comment-item:hover .row-actions{visibility:visible;}.row-actions-visible{padding:2px 0 0;}#wphead-info{margin:0 0 0 15px;padding-right:15px;}#user_info{float:right;font-size:12px;line-height:46px;height:46px;}#user_info p{margin:0;padding:0;line-height:46px;}#wphead{height:46px;}#wphead a,#adminmenu a,#sidemenu a,#taglist a,#catlist a,#show-settings a{text-decoration:none;}#header-logo{float:left;margin:7px 0 0 15px;}#wphead h1{font:normal 22px Georgia,"Times New Roman","Bitstream Charter",Times,serif;padding:10px 8px 5px;margin:0;float:left;}#wphead h1.long-title{font:normal 18px Georgia,"Times New Roman","Bitstream Charter",Times,serif;padding:12px 10px 5px;}#wphead #privacy-on-link{font-size:50%;font-style:normal;line-height:17px;padding:0 6px;vertical-align:middle;}#wphead h1 a:hover{text-decoration:none;}#wphead h1 a:hover #site-title,#wphead h1 a#privacy-on-link:hover{text-decoration:underline;}#adminmenu *{-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;user-select:none;}#adminmenu .wp-submenu{display:none;list-style:none;padding:0;margin:0;position:relative;z-index:2;border-width:1px 0 0;border-style:solid none none;}#adminmenu .wp-submenu a{font:normal 11px/18px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover{font-weight:bold;}#adminmenu a.menu-top,#adminmenu .wp-submenu-head{font:normal 13px/18px Georgia,"Times New Roman","Bitstream Charter",Times,serif;}#adminmenu div.wp-submenu-head{display:none;}.folded #adminmenu div.wp-submenu-head,.folded #adminmenu li.wp-has-submenu div.sub-open{display:block;}.folded #adminmenu a.menu-top,.folded #adminmenu .wp-submenu,.folded #adminmenu li.wp-menu-open .wp-submenu,.folded #adminmenu div.wp-menu-toggle{display:none;}#adminmenu li.wp-menu-open .wp-submenu,.no-js #adminmenu .open-if-no-js .wp-submenu{display:block;}#adminmenu div.wp-menu-image{float:left;width:28px;height:28px;}#adminmenu li{margin:0;padding:0;cursor:pointer;}#adminmenu a{display:block;line-height:18px;padding:1px 5px 3px;}#adminmenu li.menu-top{min-height:26px;}#adminmenu a.menu-top{line-height:18px;min-width:10em;padding:5px 5px;border-width:1px 1px 0;border-style:solid solid none;}#adminmenu .wp-submenu a{margin:0;padding-left:12px;border-width:0 1px 0 0;border-style:none solid none none;}#adminmenu .menu-top-last ul.wp-submenu{border-width:0 0 1px;border-style:none none solid;}#adminmenu .wp-submenu li{padding:0;margin:0;}.folded #adminmenu li.menu-top{width:28px;height:30px;overflow:hidden;border-width:1px 1px 0;border-style:solid solid none;}#adminmenu .menu-top-first a.menu-top,.folded #adminmenu li.menu-top-first,#adminmenu .wp-submenu .wp-submenu-head{border-width:1px 1px 0;border-style:solid solid none;-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px;-khtml-border-top-right-radius:6px;-khtml-border-top-left-radius:6px;border-top-right-radius:6px;border-top-left-radius:6px;}#adminmenu .menu-top-last a.menu-top,.folded #adminmenu li.menu-top-last{border-width:1px;border-style:solid;-moz-border-radius-bottomleft:6px;-moz-border-radius-bottomright:6px;-webkit-border-bottom-right-radius:6px;-webkit-border-bottom-left-radius:6px;-khtml-border-bottom-right-radius:6px;-khtml-border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-bottom-left-radius:6px;}#adminmenu li.wp-menu-open a.menu-top-last{border-bottom:0 none;-moz-border-radius-bottomright:0;-moz-border-radius-bottomleft: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;}#adminmenu .wp-menu-image img{float:left;padding:8px 6px 0;opacity:.6;filter:alpha(opacity=60);}#adminmenu li.menu-top:hover .wp-menu-image img,#adminmenu li.wp-has-current-submenu .wp-menu-image img{opacity:1;filter:alpha(opacity=100);}#adminmenu li.wp-menu-separator{height:21px;padding:0;margin:0;}#adminmenu a.separator{cursor:w-resize;height:20px;padding:0;}.folded #adminmenu a.separator{cursor:e-resize;}#adminmenu .wp-menu-separator-last{height:10px;width:1px;}#adminmenu .wp-submenu .wp-submenu-head{border-width:1px;border-style:solid;padding:6px 4px 6px 10px;cursor:default;}.folded #adminmenu .wp-submenu{position:absolute;margin:-1px 0 0 28px;padding:0 8px 8px;z-index:999;border:0 none;}.folded #adminmenu .wp-submenu ul{width:140px;border-width:0 0 1px;border-style:none none solid;}.folded #adminmenu .wp-submenu li.wp-first-item{border-top:0 none;}.folded #adminmenu .wp-submenu a{padding-left:10px;}.folded #adminmenu a.wp-has-submenu{margin-left:40px;}#adminmenu li.menu-top-last .wp-submenu ul{border-width:0 0 1px;border-style:none none solid;}#adminmenu .wp-menu-toggle{width:22px;clear:right;float:right;margin:1px 0 0;height:27px;padding:1px 2px 0 0;cursor:default;}#adminmenu li.wp-has-current-submenu ul{border-bottom-width:1px;border-bottom-style:solid;}#adminmenu .wp-menu-image a{height:24px;}#adminmenu .wp-menu-image img{padding:6px 0 0 1px;}#adminmenu #awaiting-mod,#adminmenu span.update-plugins,#sidemenu li a span.update-plugins{position:absolute;font-family:Helvetica,Arial,sans-serif;font-size:9px;line-height:17px;font-weight:bold;margin-top:1px;margin-left:7px;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#adminmenu li #awaiting-mod span,#adminmenu li span.update-plugins span,#sidemenu li a span.update-plugins span{display:block;padding:0 6px;}#adminmenu li span.count-0,#sidemenu li a .count-0{display:none;}.post-com-count-wrapper{min-width:22px;font-family:Helvetica,Arial,sans-serif;}.post-com-count{height:1.3em;line-height:1.1em;display:block;text-decoration:none;padding:0 0 6px;cursor:pointer;background-position:center -80px;background-repeat:no-repeat;}.post-com-count span{font-size:9px;font-weight:bold;height:1.7em;line-height:1.70em;min-width:.7em;padding:0 6px;display:inline-block;cursor:pointer;-moz-border-radius:5px;-khtml-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}strong .post-com-count{background-position:center -55px;}.post-com-count:hover{background-position:center -3px;}.column-response .post-com-count{float:left;margin-right:5px;text-align:center;}.response-links{float:left;}#the-comment-list .attachment-80x60{padding:4px 8px;}#footer{margin-top:-46px;border-top:1px;border-style:solid;}#footer,#footer a{font-size:12px;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-style:italic;}#footer p{margin:0;padding:15px;line-height:15px;}#footer a{text-decoration:none;}#footer a:hover{text-decoration:underline;}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;margin-bottom:-8px;clear:both;}.form-table td{margin-bottom:9px;padding:8px 10px;line-height:20px;font-size:11px;}.form-table th,.form-wrap label{font-weight:normal;text-shadow:rgba(255,255,255,1) 0 1px 0;}.form-table th{vertical-align:top;text-align:left;padding:10px;width:200px;}.form-table th.th-full{width:auto;}.form-table div.color-option{display:block;clear:both;margin-top:12px;}.form-table input.tog{margin-top:2px;margin-right:2px;float:left;}.form-table table.color-palette{vertical-align:bottom;float:left;margin:-12px 3px 11px;}.form-table .color-palette td{border-width:1px 1px 0;border-style:solid solid none;height:10px;line-height:20px;width:10px;}input.large-text,textarea.large-text{width:99%;}.form-table input.regular-text,#adduser .form-field input{width:25em;}.form-table input.small-text{width:50px;}#profile-page .form-table textarea{width:500px;margin-bottom:6px;}#profile-page .form-table #rich_editing{margin-right:5px;}.form-table .pre{padding:8px;margin:0;}.pre{white-space:pre-wrap;white-space:-moz-pre-wrap!important;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}table.form-table td .updated{font-size:13px;}.form-wrap{margin:10px 0;width:97%;}.form-wrap p,.form-wrap label{font-size:11px;}.form-wrap label{display:block;padding:2px;font-size:12px;}.form-field input,.form-field textarea{border-style:solid;border-width:1px;width:95%;}p.description,.form-wrap p{margin:2px 0 5px;}p.help,p.description,span.description,.form-wrap p{font-size:12px;font-style:italic;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}.form-wrap .form-field{margin:0 0 10px;padding:8px;}.col-wrap h3{margin:12px 0;font-size:1.1em;}.col-wrap p.submit{margin-top:-10px;}.tagcloud{width:97%;margin:0 0 40px;text-align:justify;}.tagcloud h3{margin:2px 0 12px;}#post-body #normal-sortables{min-height:50px;}#post-body #advanced-sortables{min-height:20px;}.postbox{position:relative;min-width:255px;width:99.5%;}#trackback_url{width:99%;}#normal-sortables .postbox .submit{background:transparent none;border:0 none;float:right;padding:0 12px;margin:0;}#normal-sortables .postbox #replyrow .submit{float:none;margin:0;padding:3px 7px;}#side-sortables .submitbox .submit input,#side-sortables .submitbox .submit .preview,#side-sortables .submitbox .submit a.preview:hover{border:0 none;}#side-sortables .inside-submitbox .insidebox,.stuffbox .insidebox{margin:11px 0;}#side-sortables .comments-box,#normal-sortables .comments-box{border:0 none;}#side-sortables .comments-box thead th,#normal-sortables .comments-box thead th{background:transparent;padding:0 7px 4px;font-style:italic;}#commentsdiv img.waiting{padding-left:5px;vertical-align:middle;}#post-body .tagsdiv #newtag{margin-right:5px;width:16em;}#side-sortables input#post_password{width:94%;}#side-sortables .tagsdiv #newtag{width:68%;}#post-status-info{border-width:0 1px 1px;border-style:none solid solid;width:100%;-moz-border-radius:0 0 6px 6px;-webkit-border-bottom-left-radius:6px;-webkit-border-bottom-right-radius:6px;-khtml-border-bottom-left-radius:6px;-khtml-border-bottom-right-radius:6px;border-bottom-left-radius:6px;border-bottom-right-radius:6px;}#post-status-info td{font-size:11px;}.autosave-info{padding:2px 15px 2px 2px;text-align:right;}#editorcontent #post-status-info{border:none;}#post-body .wp_themeSkin .mceStatusbar a.mceResize{display:block;background:transparent url(../images/resize.gif) no-repeat scroll right bottom;width:12px;cursor:se-resize;margin:0 2px;position:relative;top:22px;}#linksubmitdiv div.inside,div.inside{padding:0;margin:0;}#comment-status-radio p{margin:3px 0 5px;}#comment-status-radio input{margin:2px 3px 5px 0;vertical-align:middle;}#comment-status-radio label{padding:5px 0;}.tagchecklist{margin-left:14px;font-size:12px;overflow:auto;}.tagchecklist strong{margin-left:-8px;position:absolute;}.tagchecklist span{margin-right:25px;display:block;float:left;font-size:11px;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;}.howto{font-style:italic;display:block;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}.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;}#poststuff h2{margin-top:20px;font-size:1.5em;margin-bottom:15px;padding:0 0 3px;clear:left;}.widget .widget-top,.postbox h3{cursor:move;-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;user-select:none;}.postbox .hndle span{padding:6px 0;}.postbox .hndle{cursor:move;}.hndle a{font-size:11px;font-weight:normal;}#dashboard-widgets .meta-box-sortables{margin:0 5px;}.postbox .handlediv{float:right;width:23px;height:26px;}.sortable-placeholder{border-width:1px;border-style:dashed;margin-bottom:20px;}#poststuff h3,.metabox-holder h3{font-size:12px;font-weight:bold;padding:7px 9px;margin:0;line-height:1;}.widget,.postbox,.stuffbox{margin-bottom:20px;border-width:1px;border-style:solid;line-height:1;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.widget .widget-top,.postbox h3,.postbox h3,.stuffbox h3{-moz-border-radius:6px 6px 0 0;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px;-khtml-border-top-right-radius:6px;-khtml-border-top-left-radius:6px;border-top-right-radius:6px;border-top-left-radius:6px;}.postbox.closed h3{-moz-border-radius-bottomleft:4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-webkit-border-bottom-right-radius:4px;-khtml-border-bottom-right-radius:4px;border-bottom-right-radius:4px;}.postbox table.form-table{margin-bottom:0;}.postbox input[type="text"],.postbox textarea,.stuffbox input[type="text"],.stuffbox textarea{border-width:1px;border-style:solid;}#poststuff .inside,#poststuff .inside p{font-size:11px;margin:6px 6px 8px;}#poststuff .inside .submitbox p{margin:1em 0;}#post-visibility-select{line-height:1.5em;margin-top:3px;}#poststuff #submitdiv .inside{margin:0;}#titlediv,#poststuff .postarea{margin-bottom:20px;}#titlediv{position:relative;margin-bottom:20px;}#titlediv label{cursor:text;}#titlediv div.inside{margin:0;}#poststuff #titlewrap{border:0;padding:0;}#titlediv #title{padding:3px 4px;border-width:1px;border-style:solid;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;font-size:1.7em;line-height:100%;width:100%;outline:none;}#titlediv #title-prompt-text{color:#bbb;position:absolute;font-size:1.7em;padding:8px;}#poststuff .inside-submitbox,#side-sortables .inside-submitbox{margin:0 3px;font-size:11px;}input#link_description,input#link_url{width:98%;}#pending{background:0 none;border:0 none;padding:0;font-size:11px;margin-top:-1px;}#edit-slug-box{height:1em;margin-top:8px;padding:0 7px;}#editable-post-name-full{display:none;}#editable-post-name input{width:16em;}.postarea h3 label{float:left;}.postarea #add-media-button{float:right;margin:7px 0 0;position:relative;right:10px;}#poststuff #editor-toolbar{height:30px;}.wp_themeSkin tr.mceFirst td.mceToolbar{border-width:0 0 1px;border-style:none none solid;}#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;}.js .theEditor{color:white;}#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{vertical-align:middle;}.submitbox .submit{text-align:left;padding:12px 10px 10px;font-size:11px;}.submitbox .submitdelete{border-bottom-width:1px;border-bottom-style:solid;text-decoration:none;padding:1px 2px;}.inside-submitbox #post_status{margin:2px 0 2px -2px;}.submitbox .submit a:hover{border-bottom-width:1px;border-bottom-style:solid;}.submitbox .submit input{margin-bottom:8px;margin-right:4px;padding:6px;}#post-status-select{line-height:2.5em;margin-top:3px;}.category-adder{margin-left:120px;padding:4px 0;}.category-adder h4{margin:0 0 8px;}#side-sortables .category-adder{margin:0;}#post-body .category-add input,.category-add select{width:30%;}#side-sortables .category-add input{width:94%;}#side-sortables .category-add select{width:100%;}#side-sortables .category-add input.category-add-sumbit,#post-body .category-add input.category-add input.category-add-sumbit{width:auto;}#post-body ul.category-tabs,#post-body ul.add-menu-item-tabs{float:left;width:120px;text-align:right;margin:0 -120px 0 5px;padding:0;}#post-body ul.category-tabs li,#post-body ul.add-menu-item-tabs li{padding:8px;}#post-body ul.category-tabs li.tabs,#post-body ul.add-menu-item-tabs li.tabs{-moz-border-radius:3px 0 0 3px;-webkit-border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-top-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-top-left-radius:3px;border-bottom-left-radius:3px;}#post-body ul.category-tabs li.tabs a,#post-body ul.add-menu-item-tabs li.tabs a{font-weight:bold;text-decoration:none;}.categorydiv div.tabs-panel,.customlinkdiv div.tabs-panel,.posttypediv div.tabs-panel,.taxonomydiv div.tabs-panel,#linkcategorydiv div.tabs-panel{height:200px;overflow:auto;padding:.5em .9em;border-style:solid;border-width:1px;}.nav-menus-php .customlinkdiv div.tabs-panel,.nav-menus-php .posttypediv div.tabs-panel,.nav-menus-php .taxonomydiv div.tabs-panel{height:auto;max-height:205px;}div.tabs-panel-active{display:block;}div.tabs-panel-inactive{display:none;}#post-body .categorydiv div.tabs-panel,.taxonomy div.tabs-panel,#post-body #linkcategorydiv div.tabs-panel{margin:0 5px 0 125px;}#side-sortables .category-tabs li,#side-sortables .add-menu-item-tabs li{display:inline;}#side-sortables .category-tabs a,#side-sortables .add-menu-item-tabs a{text-decoration:none;}#side-sortables .category-tabs,#side-sortables .add-menu-item-tabs{margin-bottom:3px;}.categorydiv ul,.customlinkdiv ul,.posttypediv ul,.taxonomydiv ul,#linkcategorydiv ul{list-style:none;padding:0;margin:0;}#front-page-warning,#front-static-pages ul,.inline-editor ul.cat-checklist ul,.categorydiv ul.categorychecklist ul,.customlinkdiv ul.categorychecklist ul,.posttypediv ul.categorychecklist ul,.taxonomydiv ul.categorychecklist ul,#linkcategorydiv ul.categorychecklist ul{margin-left:18px;}ul.categorychecklist li{margin:0;padding:0;line-height:19px;word-wrap:break-word;}.category-adder h4{margin-top:4px;margin-bottom:0;}.categorydiv .tabs-panel,.customlinkdiv .tabs-panel,.posttypediv .tabs-panel,.taxonomydiv .tabs-panel{border-width:3px;border-style:solid;}ul.category-tabs,ul.add-menu-item-tabs{margin-top:12px;}ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{border-style:solid solid none;border-width:1px 1px 0;}#post-body .category-tabs li.tabs,#post-body .add-menu-item-tabs li.tabs{border-style:solid none solid solid;border-width:1px 0 1px 1px;margin-right:-1px;}ul.category-tabs li,ul.add-menu-item-tabs li{padding:5px;-moz-border-radius:3px 3px 0 0;-webkit-border-top-left-radius:3px;-webkit-border-top-right-radius:3px;-khtml-border-top-left-radius:3px;-khtml-border-top-right-radius:3px;border-top-left-radius:3px;border-top-right-radius:3px;}form#tags-filter{position:relative;}p.search-box{float:right;margin:-5px 0 0;}.screen-per-page{width:3em;}#posts-filter fieldset{float:left;margin:0 1.5ex 1em 0;padding:0;}#posts-filter fieldset legend{padding:0 0 .2em 1px;}td.post-title strong,td.plugin-title strong{display:block;margin-bottom:.2em;}td.post-title p,td.plugin-title p{margin:6px 0;}td.plugin-title{white-space:nowrap;}.wp-hidden-children .wp-hidden-child,.ui-tabs-hide{display:none;}.commentlist .avatar{vertical-align:text-top;}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle;}body.wp-admin{min-width:785px;}.view-switch{float:right;margin:6px 8px 0;}.view-switch a{text-decoration:none;}.filter{float:left;margin:-5px 0 0 10px;}.filter .subsubsub{margin-left:-10px;margin-top:13px;}#the-comment-list td.comment p.comment-author{margin-top:0;margin-left:0;}#the-comment-list p.comment-author img{float:left;margin-right:8px;}#the-comment-list p.comment-author strong a{border:none;}#the-comment-list td{vertical-align:top;}#the-comment-list td.comment{word-wrap:break-word;}#the-comment-list .check-column{padding-top:8px;}#templateside ul li a{text-decoration:none;}.indicator-hint{padding-top:8px;}#display_name{width:15em;}.tablenav .delete{margin-right:20px;}td.action-links,th.action-links{text-align:right;}table.diff{width:100%;}table.diff col.content{width:50%;}table.diff tr{background-color:transparent;}table.diff td,table.diff th{padding:.5em;font-family:Consolas,Monaco,Courier,monospace;border:none;}table.diff .diff-deletedline del,table.diff .diff-addedline ins{text-decoration:none;}#wp-word-count{display:block;padding:2px 7px;}fieldset{border:0;padding:0;margin:0;}.tool-box{margin:15px 0 35px;}.tool-box .buttons{margin:15px 0;}.tool-box .title{margin:8px 0;font:18px/24px Georgia,"Times New Roman","Bitstream Charter",Times,serif;}.pressthis a{font-size:1.2em;}#wp_editbtns,#wp_gallerybtns{padding:2px;position:absolute;display:none;z-index:999998;}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{margin:2px;padding:2px;border-width:1px;border-style:solid;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.settings-toggle{text-align:right;margin:5px 7px 15px 0;font-size:12px;}.settings-toggle h3{margin:0;}#timestampdiv select{height:20px;line-height:14px;padding:0;vertical-align:top;}#jj,#hh,#mn{width:2em;padding:1px;font-size:12px;}#aa{width:3.4em;padding:1px;font-size:12px;}.curtime #timestamp{background-repeat:no-repeat;background-position:left top;padding-left:18px;}#timestampdiv{padding-top:5px;line-height:23px;}#timestampdiv p{margin:8px 0 6px;}#timestampdiv input{border-width:1px;border-style:solid;}#sidemenu{margin:-30px 15px 0 315px;list-style:none;position:relative;float:right;padding-left:10px;font-size:12px;}#sidemenu a{padding:0 7px;display:block;float:left;line-height:28px;border-top-width:1px;border-top-style:solid;border-bottom-width:1px;border-bottom-style:solid;}#sidemenu li{display:inline;line-height:200%;list-style:none;text-align:center;white-space:nowrap;margin:0;padding:0;}#sidemenu a.current{font-weight:normal;padding-left:6px;padding-right:6px;-moz-border-radius:4px 4px 0 0;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-khtml-border-top-left-radius:4px;-khtml-border-top-right-radius:4px;border-top-left-radius:4px;border-top-right-radius:4px;border-width:1px;border-style:solid;}#sidemenu{margin:-30px 15px 0 315px;list-style:none;position:relative;float:right;padding-left:10px;font-size:12px;}#sidemenu a{padding:0 7px;display:block;float:left;line-height:28px;border-top-width:1px;border-top-style:solid;border-bottom-width:1px;border-bottom-style:solid;}#sidemenu li a .count-0{display:none;}#replyrow{font-size:11px;}#replyrow input{border-width:1px;border-style:solid;}#replyrow td{padding:2px;}#replyrow #editorcontainer{border:0 none;}#replysubmit{margin:0;padding:3px 7px;}#replysubmit img.waiting,.inline-edit-save img.waiting{padding:4px 10px 0;vertical-align:top;float:right;}#replysubmit .button{margin-right:5px;}#replyrow #editor-toolbar{display:none;}#replyhead{font-size:12px;font-weight:bold;padding:2px 10px 4px;}#edithead .inside{float:left;padding:3px 0 2px 5px;margin:0;text-align:center;font-size:11px;}#edithead .inside input{width:180px;font-size:11px;}#edithead label{padding:2px 0;}#replycontainer{padding:5px;border:0 none;height:120px;overflow:hidden;position:relative;}#replycontent{resize:none;margin:0;width:100%;height:100%;padding:0;line-height:150%;border:0 none;outline:none;font-size:12px;}#replyrow #ed_reply_toolbar{margin:0;padding:2px 3px;}#screen-meta{position:relative;clear:both;}#screen-meta-links{margin:0 18px 0 0;}#screen-meta .screen-reader-text{visibility:hidden;}#screen-options-link-wrap,#contextual-help-link-wrap{float:right;height:22px;padding:0;margin:0 6px 0 0;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;background:#e3e3e3;-moz-border-radius-bottomleft:3px;-moz-border-radius-bottomright:3px;-webkit-border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;}#contextual-help-wrap li{list-style-type:disc;margin-left:18px;}#screen-meta a.show-settings{text-decoration:none;z-index:1;padding:0 16px 0 6px;height:22px;line-height:22px;font-size:10px;display:block;background-repeat:no-repeat;background-position:right bottom;}#screen-meta a.show-settings{background-image:url(../images/screen-options-right.gif?ver=20100531);}#screen-meta a.show-settings:hover{text-decoration:none;}#screen-options-wrap h5,#contextual-help-wrap h5{margin:8px 0;font-size:13px;}#screen-options-wrap,#contextual-help-wrap{border-style:none solid solid;border-top:0 none;border-width:0 1px 1px;margin:0 15px;padding:8px 12px 12px;-moz-border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px;}.metabox-prefs label{padding-right:15px;white-space:nowrap;line-height:30px;}.metabox-prefs label input{margin:0 5px 0 2px;}.metabox-prefs label a{display:none;}tr.inline-edit-row td{padding:0 .5em;}#wpbody-content .inline-edit-row fieldset{font-size:12px;float:left;margin:0;padding:0;width:100%;}#wpbody-content .inline-edit-row fieldset .inline-edit-col{padding:0 .5em;}#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col{border-width:0 0 0 1px;border-style:none none none solid;}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:40%;}#wpbody-content .quick-edit-row-post .inline-edit-col-right{width:39%;}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:20%;}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:50%;}#wpbody-content .quick-edit-row-page .inline-edit-col-right,#wpbody-content .bulk-edit-row-post .inline-edit-col-right{width:49%;}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:30%;}#wpbody-content .bulk-edit-row-page .inline-edit-col-right{width:69%;}#wpbody-content .bulk-edit-row .inline-edit-col-bottom{float:right;width:69%;}#wpbody-content .inline-edit-row-page .inline-edit-col-right,#owpbody-content .bulk-edit-row-post .inline-edit-col-right{margin-top:27px;}.inline-edit-row fieldset .inline-edit-group{clear:both;}.inline-edit-row fieldset .inline-edit-group:after{content:".";display:block;height:0;clear:both;visibility:hidden;}.inline-edit-row p.submit{clear:both;padding:.5em;margin:.5em 0 0;}.inline-edit-row span.error{line-height:22px;margin:0 15px;padding:3px 5px;}.inline-edit-row h4{margin:.2em 0;padding:0;line-height:23px;}.inline-edit-row fieldset span.title,.inline-edit-row fieldset span.checkbox-title{margin:0;padding:0;line-height:27px;}.inline-edit-row fieldset label,.inline-edit-row fieldset span.inline-edit-categories-label{display:block;margin:.2em 0;}.inline-edit-row fieldset label.inline-edit-tags{margin-top:0;}.inline-edit-row fieldset label.inline-edit-tags span.title{margin:.2em 0;}.inline-edit-row fieldset label span.title{display:block;float:left;width:5em;}.inline-edit-row fieldset label span.input-text-wrap{display:block;margin-left:5em;}.quick-edit-row-post fieldset.inline-edit-col-right label span.title{width:auto;padding-right:.5em;}.inline-edit-row .input-text-wrap input[type=text]{width:100%;}.inline-edit-row fieldset label input[type=checkbox]{vertical-align:text-bottom;}.inline-edit-row fieldset label textarea{width:100%;height:4em;}#wpbody-content .bulk-edit-row fieldset .inline-edit-group label{max-width:50%;}#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child{margin-right:.5em;}.inline-edit-row h4{text-transform:uppercase;}.inline-edit-row fieldset span.title,.inline-edit-row fieldset span.checkbox-title{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-style:italic;line-height:1.8em;}.inline-edit-row fieldset input[type="text"],.inline-edit-row fieldset textarea{border-style:solid;border-width:1px;}.inline-edit-row fieldset .inline-edit-date{float:left;}.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=mn]{font-size:12px;width:2.1em;}.inline-edit-row fieldset input[name=aa]{font-size:12px;width:3.5em;}.inline-edit-row fieldset label input.inline-edit-password-input{width:8em;}.inline-edit-row .catshow,.inline-edit-row .cathide{cursor:pointer;}ul.cat-checklist{height:12em;border-style:solid;border-width:1px;overflow-y:scroll;padding:0 5px;margin:0;}#bulk-titles{display:block;height:12em;border-style:solid;border-width:1px;overflow-y:scroll;padding:0 5px;margin:0 0 5px;}.inline-edit-row fieldset ul.cat-checklist li,.inline-edit-row fieldset ul.cat-checklist input{margin:0;}.inline-edit-row fieldset ul.cat-checklist label,.inline-edit-row .catshow,.inline-edit-row .cathide,.inline-edit-row #bulk-titles div{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;font-style:normal;font-size:11px;}table .inline-edit-row fieldset ul.cat-hover{height:auto;max-height:30em;overflow-y:auto;position:absolute;}.inline-edit-row fieldset label input.inline-edit-menu-order-input{width:3em;}.inline-edit-row fieldset label input.inline-edit-slug-input{width:75%;}.quick-edit-row-post fieldset label.inline-edit-status{float:left;}#bulk-titles{line-height:140%;}#bulk-titles div{margin:.2em .3em;}#bulk-titles div a{cursor:pointer;display:block;float:left;height:10px;margin:3px 3px 0 -2px;overflow:hidden;position:relative;text-indent:-9999px;width:10px;}#wpbody-content #media-items .describe{border-collapse:collapse;width:100%;border-top-style:solid;border-top-width:1px;clear:both;cursor:default;padding:5px;}#wpbody-content .describe th{vertical-align:top;text-align:left;padding:10px;width:140px;}#wpbody-content .describe .media-item-info tr{background-color:transparent;}#wpbody-content .describe .media-item-info td{padding:4px 10px 0;}.describe .media-item-info .A1B1{padding:0 0 0 10px;}#wpbody-content .filename{padding:0 10px;}#wpbody-content .media-item .thumbnail{max-height:128px;max-width:128px;}#wpbody-content #async-upload-wrap a{display:none;}.media-upload-form td label{margin-right:6px;margin-left:2px;}.media-upload-form .align .field label{display:inline;padding:0 0 0 22px;margin:0 1em 0 0;font-weight:bold;}.media-upload-form tr.image-size label{margin:0 0 0 3px;font-weight:bold;}.media-upload-form th.label label{font-weight:bold;margin:.5em;font-size:13px;}.media-upload-form th.label label span{padding:0 5px;}abbr.required{border:medium none;text-decoration:none;}#wpbody-content .describe input[type="text"],#wpbody-content .describe textarea{width:460px;}#wpbody-content .describe p.help{margin:0;padding:0 0 0 5px;}.media-item .error-div a.dismiss,.describe-toggle-on,.describe-toggle-off{display:block;line-height:36px;float:right;margin-right:20px;}.describe-toggle-off{display:none;}#wpbody-content .media-item{border-bottom-style:solid;border-bottom-width:1px;min-height:36px;position:relative;width:100%;}#wpbody-content .media-single .media-item{border-bottom-style:none;border-bottom-width:0;}#wpbody-content #media-items{border-style:solid solid none;border-width:1px;width:670px;}#wpbody-content #media-items .filename{line-height:36px;overflow:hidden;}.media-item .error-div{padding-left:10px;}.media-item .pinkynail{float:left;margin:2px;max-width:40px;max-height:32px;}.media-item .startopen,.media-item .startclosed{display:none;}.media-item .original{position:relative;height:34px;width:503px;}.media-item .percent{font-weight:bold;}.crunching{display:block;line-height:32px;text-align:right;margin-right:5px;}.progress{position:relative;margin-bottom:-36px;height:36px;}.bar{width:0;height:100%;border-right-width:3px;border-right-style:solid;}.upload-php .fixed .column-parent{width:25%;}.find-box{width:500px;height:300px;overflow:hidden;padding:33px 5px 40px;position:absolute;z-index:1000;}.find-box-head{cursor:move;font-weight:bold;height:2em;line-height:2em;padding:1px 12px;position:absolute;top:5px;width:100%;}.find-box-inside{overflow:auto;width:100%;height:100%;}.find-box-search{padding:12px;border-width:1px;border-style:none none solid;}#find-posts-response{margin:8px 0;padding:0 1px;}#find-posts-response table{width:100%;}#find-posts-response .found-radio{padding:5px 0 0 8px;width:15px;}.find-box-buttons{width:480px;margin:8px;}.find-box-search label{padding-right:6px;}.find-box #resize-se{position:absolute;right:1px;bottom:1px;}#favorite-actions{float:right;margin:11px 12px 0;min-width:130px;position:relative;}#favorite-first{-moz-border-radius:12px;-khtml-border-radius:12px;-webkit-border-radius:12px;border-radius:12px;line-height:15px;padding:3px 30px 4px 12px;border-width:1px;border-style:solid;}#favorite-inside{margin:0;padding:2px 1px;border-width:1px;border-style:solid;position:absolute;z-index:11;display:none;-moz-border-radius:0 0 12px 12px;-webkit-border-bottom-right-radius:12px;-webkit-border-bottom-left-radius:12px;-khtml-border-bottom-right-radius:12px;-khtml-border-bottom-left-radius:12px;border-bottom-right-radius:12px;border-bottom-left-radius:12px;}#favorite-actions a{display:block;text-decoration:none;font-size:11px;}#favorite-inside a{padding:3px 5px 3px 10px;}#favorite-toggle{height:22px;position:absolute;right:0;top:1px;width:28px;}#favorite-actions .slide-down{-moz-border-radius:12px 12px 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;border-bottom:none;}#utc-time,#local-time{padding-left:25px;font-style:italic;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}ul#dismissed-updates{display:none;}form.upgrade{margin-top:8px;}form.upgrade .hint{font-style:italic;font-size:85%;margin:-0.5em 0 2em 0;}#poststuff .inside .the-tagcloud{margin:5px 0 10px;padding:8px;border-width:1px;border-style:solid;line-height:1.8em;word-spacing:3px;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}br.clear{height:2px;line-height:2px;}.swfupload{margin:5px 10px;vertical-align:middle;}table.fixed{table-layout:fixed;}.fixed .column-rating,.fixed .column-visible{width:8%;}.fixed .column-date,.fixed .column-parent,.fixed .column-links{width:10%;}.fixed .column-response,.fixed .column-author,.fixed .column-categories,.fixed .column-tags,.fixed .column-rel,.fixed .column-role{width:15%;}.fixed .column-comments{width:4em;padding-top:8px;}.fixed .column-slug{width:25%;}.fixed .column-posts{width:10%;}.fixed .column-icon{width:80px;}#commentsdiv .fixed .column-author,#comments-form .fixed .column-author{width:20%;}.widefat th,.widefat td{overflow:hidden;}.widefat td p{margin:2px 0 .8em;}table .vers,table .column-visible,table .column-rating{text-align:center;}.icon32{float:left;height:36px;margin:14px 6px 0 0;width:36px;}.key-labels label{line-height:24px;}.subtitle{font-size:.75em;line-height:1;padding-left:25px;}ol{list-style-type:decimal;margin-left:2em;}.postbox-container{float:left;padding-right:.5%;}.postbox-container .meta-box-sortables{min-height:300px;}.temp-border{border:1px dotted #ccc;}.columns-prefs label{padding:0 5px;}.theme-install-php h4,.plugin-install-php h4{margin:2.5em 0 8px;}p.install-help{margin:8px 0;font-style:italic;}p.popular-tags{-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;border-width:1px;border-style:solid;line-height:2em;padding:8px 12px 12px;text-align:justify;}p.popular-tags a{padding:0 3px;}.stuffbox .editcomment{clear:none;}.ajax-feedback{visibility:hidden;vertical-align:bottom;}.tagsdiv .newtag{width:180px;}.tagsdiv .the-tags{display:block;height:60px;margin:0 auto;overflow:auto;width:260px;}#post-body-content .tagsdiv .the-tags{margin:0 5px;}label,#your-profile label+a{vertical-align:middle;}#misc-publishing-actions label{vertical-align:baseline;}.plugin-update-tr .update-message{margin:5px;padding:3px 5px;border-width:1px;border-style:solid;-moz-border-radius:5px;-khtml-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}.add-new-h2{font-style:normal;margin:0 6px;position:relative;top:-3px;}.describe .image-editor{vertical-align:top;}.imgedit-wrap{position:relative;}.imgedit-settings p{margin:8px 0;}.describe .imgedit-wrap table td{vertical-align:top;padding-top:0;}.imgedit-wrap p,.describe .imgedit-wrap table td{font-size:11px;line-height:18px;}.describe .imgedit-wrap table td.imgedit-settings{padding:0 5px;}td.imgedit-settings input{vertical-align:middle;}.imgedit-wait{position:absolute;top:0;background:#FFF url(../images/wpspin_light.gif) no-repeat scroll 22px 10px;opacity:.7;filter:alpha(opacity=70);width:100%;height:500px;display:none;}.media-disabled,.imgedit-settings .disabled{color:grey;}.imgedit-wait-spin{padding:0 4px 4px;vertical-align:bottom;visibility:hidden;}.imgedit-menu{margin:0 0 12px;min-width:300px;}.imgedit-menu div{float:left;width:32px;height:32px;-moz-border-radius:4px;-khtml-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border-width:1px;border-style:solid;}.imgedit-crop-wrap{position:relative;}.imgedit-crop{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -9px -31px;margin:0 8px 0 0;}.imgedit-crop.disabled:hover{background-position:-9px -31px;}.imgedit-crop:hover{background-position:-9px -1px;}.imgedit-rleft{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -46px -31px;margin:0 3px;}.imgedit-rleft.disabled:hover{background-position:-46px -31px;}.imgedit-rleft:hover{background-position:-46px -1px;}.imgedit-rright{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -77px -31px;margin:0 8px 0 3px;}.imgedit-rright.disabled:hover{background-position:-77px -31px;}.imgedit-rright:hover{background-position:-77px -1px;}.imgedit-flipv{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -115px -31px;margin:0 3px;}.imgedit-flipv.disabled:hover{background-position:-115px -31px;}.imgedit-flipv:hover{background-position:-115px -1px;}.imgedit-fliph{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -147px -31px;margin:0 8px 0 3px;}.imgedit-fliph.disabled:hover{background-position:-147px -31px;}.imgedit-fliph:hover{background-position:-147px -1px;}.imgedit-undo{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -184px -31px;margin:0 3px;}.imgedit-undo.disabled:hover{background-position:-184px -31px;}.imgedit-undo:hover{background-position:-184px -1px;}.imgedit-redo{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -215px -31px;margin:0 8px 0 3px;}.imgedit-redo.disabled:hover{background-position:-215px -31px;}.imgedit-redo:hover{background-position:-215px -1px;}.imgedit-applyto img{margin:0 8px 0 0;}.imgedit-group-top{margin:5px 0;}.imgedit-applyto .imgedit-label{padding:2px 0 0;display:block;}.imgedit-help{display:none;font-style:italic;margin-bottom:8px;}.imgedit-help ul li{font-size:11px;}a.imgedit-help-toggle{text-decoration:none;}#wpbody-content .imgedit-response div{width:600px;margin:8px;}.form-table td.imgedit-response{padding:0;}.imgedit-submit{margin:8px 0;}.imgedit-submit-btn{margin-left:20px;}.imgedit-wrap .nowrap{white-space:nowrap;}span.imgedit-scale-warn{color:red;font-size:20px;font-style:normal;visibility:hidden;vertical-align:middle;}.imgedit-group{border-width:1px;border-style:solid;-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;margin-bottom:8px;padding:2px 10px;}#dashboard_recent_comments div.undo{border-top-style:solid;border-top-width:1px;margin:0 -10px;padding:3px 8px;font-size:11px;}.trash-undo-inside,.spam-undo-inside{margin:1px 8px 1px 0;line-height:16px;}.spam-undo-inside .avatar,.trash-undo-inside .avatar{height:20px;width:20px;margin-right:8px;vertical-align:middle;}.taghint{color:#aaa;margin:15px 0 -24px 12px;}#poststuff .tagsdiv .howto{margin:0 0 6px 8px;}.ajaxtag .newtag{background:transparent;position:relative;}#broken-themes{text-align:left;width:50%;border-spacing:3px;padding:3px;}.describe .del-link{padding-left:5px;}.comment-ays{margin-bottom:0;border-style:solid;border-width:1px;}.comment-ays th{border-right-style:solid;border-right-width:1px;}div#custom-background-image{min-height:100px;border:1px solid #dfdfdf;}div#custom-background-image img{max-width:400px;max-height:300px;}#custom-background label{padding-right:15px;}.appearance_page_custom-header #headimg{border:1px solid #DFDFDF;min-height:100px;width:100%;}.appearance_page_custom-header #upload-form p label{font-size:11px;}.appearance_page_custom-header #available-headers .default-header{float:left;margin:0 20px 20px 0;}.appearance_page_custom-header #available-headers label input{margin-right:10px;}.appearance_page_custom-header #available-headers label img{vertical-align:middle;}.nav-tab{border-style:solid;border-color:#ccc #ccc #f9f9f9;border-width:1px 1px 0;color:#c1c1c1;text-shadow:rgba(255,255,255,1) 0 1px 0;font-size:12px;line-height:16px;display:inline-block;padding:4px 14px 6px;text-decoration:none;margin:0 6px -1px 0;-moz-border-radius:5px 5px 0 0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-khtml-border-top-left-radius:5px;-khtml-border-top-right-radius:5px;border-top-left-radius:5px;border-top-right-radius:5px;}.nav-tab-active{border-width:1px;color:#464646;}.themes-php .wrap h2,.theme-install-php .wrap h2{border-bottom:1px solid #ccc;padding-bottom:0;}h2 .nav-tab{padding:4px 20px 6px;font:italic normal normal 24px/35px Georgia,"Times New Roman","Bitstream Charter",Times,serif;}body.update-php{height:98%;}
\ No newline at end of file
+textarea,input[type="text"],input[type="password"],input[type="file"],input[type="button"],input[type="submit"],input[type="reset"],select{border-width:1px;border-style:solid;-moz-border-radius:4px;-khtml-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;}p,ul,ol,blockquote,input,select{font-size:12px;}select option{padding:2px;}.plugins #name{width:33%;}.plugins .name,#pass-strength-result.strong,#pass-strength-result.short,.button-highlighted,input.button-highlighted,#quicktags #ed_strong,#ed_reply_toolbar #ed_reply_strong{font-weight:bold;}.plugins p{margin:0 4px;padding:0;}.plugins .desc p{margin:0 0 8px;}.plugins td.desc{line-height:1.5em;}.plugins .desc ul,.plugins .desc ol{margin:0 0 0 2em;}.plugins .desc ul{list-style-type:disc;}.plugins .action-links{white-space:nowrap;}.plugins .row-actions-visible{padding:0;}.plugins tbody th.check-column{padding:7px 0;}.plugins td,.plugins th{border-bottom:0 none;}#install-plugins .plugins td,#install-plugins .plugins th{border-bottom-style:solid;border-bottom-width:1px;}.plugins .inactive td,.plugins .inactive th,.plugins .active td,.plugins .active th{border-top-style:solid;border-top-width:1px;padding:5px 7px 0;}#wpbody-content .plugins .plugin-title{padding-right:12px;}.plugins .second td,.plugins .second th{border-top:0 none;padding:0 7px 5px;}.plugins-php .widefat tfoot th,.plugins-php .widefat tfoot td{border-top-style:solid;border-top-width:1px;}.import-system{font-size:16px;}.anchors{margin:10px 20px 10px 20px;}#loading-items{position:absolute;z-index:9999;padding:10px;background-color:#fff;font-weight:bold;text-align:center;opacity:.5;}table#availablethemes{border-spacing:0;border-width:1px 0;border-style:solid none;margin:10px auto;width:100%;}td.available-theme{vertical-align:top;width:240px;margin:0;padding:20px;text-align:left;}table#availablethemes td{border-width:0 1px 1px;border-style:none solid solid;}table#availablethemes td.right,table#availablethemes td.left{border-right:0 none;border-left:0 none;}table#availablethemes td.bottom{border-bottom:0 none;}.available-theme a.screenshot{width:240px;height:180px;display:block;border-width:1px;border-style:solid;margin-bottom:10px;overflow:hidden;}.available-theme img{width:240px;}.available-theme h3{margin:15px 0 5px;}#current-theme{margin:1em 0 1.5em;}#current-theme a{border-bottom:none;}#current-theme h3{font-size:17px;font-weight:normal;margin:0;}#current-theme .theme-description{margin-top:5px;}#current-theme img{float:left;border-width:1px;border-style:solid;margin-right:1em;margin-bottom:1.5em;width:150px;}#TB_window #TB_title a.tb-theme-preview-link,#TB_window #TB_title a.tb-theme-preview-link:visited{font-weight:bold;text-decoration:none;}#TB_window #TB_title{background-color:#222;color:#cfcfcf;}.checkbox{border:none;margin:0;padding:0;}.code,code{font-family:Consolas,Monaco,Courier,monospace;}kbd,code{padding:1px 3px;margin:0 1px;font-size:11px;}.commentlist li{padding:1em 1em .2em;margin:0;border-bottom-width:1px;border-bottom-style:solid;}.commentlist li li{border-bottom:0;padding:0;}.commentlist p{padding:0;margin:0 0 .8em;}.post-categories{display:inline;margin:0;padding:0;}.post-categories li{display:inline;}.quicktags,.search{font:12px Georgia,"Times New Roman","Bitstream Charter",Times,serif;}.submit{padding:1.5em 0;margin:5px 0;-moz-border-radius:0 0 3px 3px;-webkit-border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;-khtml-border-bottom-left-radius:3px;-khtml-border-bottom-right-radius:3px;border-bottom-left-radius:3px;border-bottom-right-radius:3px;}form p.submit a.cancel:hover{text-decoration:none;}#submitdiv h3{margin-bottom:0!important;}#misc-publishing-actions{padding:6px 0 16px 0;}.misc-pub-section{padding:6px;border-bottom-width:1px;border-bottom-style:solid;}.misc-pub-section-last{border-bottom:0 none;}#minor-publishing-actions{padding:6px;text-align:right;}#minor-publishing{border-bottom-width:1px;border-bottom-style:solid;}#save-post{float:left;}.preview{float:right;}#major-publishing-actions{padding:6px;clear:both;border-top:none;}#minor-publishing-actions input,#major-publishing-actions input,#minor-publishing-actions .preview{min-width:80px;text-align:center;}#delete-action{line-height:25px;vertical-align:middle;text-align:left;float:left;}#publishing-action{text-align:right;float:right;line-height:23px;}#post-body #minor-publishing{padding-bottom:10px;}#post-body #misc-publishing-actions{padding:0;}#post-body .misc-pub-section{border-right-width:1px;border-right-style:solid;border-bottom:0 none;min-height:30px;float:left;max-width:32%;}#post-body .misc-pub-section-last{border-right:0;}#sticky-span{margin-left:18px;}#post-status-display,#post-visibility-display{font-weight:bold;}.side-info{margin:0;padding:4px;font-size:11px;}.side-info h5{padding-bottom:7px;font-size:14px;margin:12px 2px 5px;border-bottom-width:1px;border-bottom-style:solid;}.side-info ul{margin:0;padding-left:18px;list-style:square;}.submit input,.button,input.button,.button-primary,input.button-primary,.button-secondary,input.button-secondary,.button-highlighted,input.button-highlighted,#postcustomstuff .submit input{text-decoration:none;font-size:11px!important;line-height:13px;padding:3px 8px;cursor:pointer;border-width:1px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}a.button,a.button-primary,a.button-secondary{line-height:15px;padding:3px 10px;white-space:nowrap;-webkit-border-radius:10px;}#doaction,#doaction2,#post-query-submit{margin-right:8px;}.tablenav select[name="action"],.tablenav select[name="action2"]{width:130px;}.tablenav select[name="m"]{width:155px;}.tablenav select#cat{width:170px;}#wpcontent select{padding:2px;height:2em;font-size:11px;}#wpcontent option{padding:2px;}#timezone_string option{margin-left:1em;}.approve{display:none;}.unapproved .approve,.spam .approve,.trash .approve{display:inline;}.unapproved .unapprove{display:none;}.narrow{width:70%;margin-bottom:40px;}.narrow p{line-height:150%;}textarea.all-options,input.all-options{width:250px;}#namediv table{width:100%;}#namediv td.first{width:10px;white-space:nowrap;}#namediv input{width:98%;}#namediv p{margin:10px 0;}#wpbody-content .metabox-holder{padding-top:10px;}#content{margin:0;width:100%;}#editorcontainer #content{padding:6px;line-height:150%;border:0 none;outline:none;resize:vertical;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-khtml-box-sizing:border-box;box-sizing:border-box;}#editorcontainer,#quicktags{border-style:solid;border-width:1px;border-collapse:separate;-moz-border-radius:6px 6px 0 0;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px;-khtml-border-top-right-radius:6px;-khtml-border-top-left-radius:6px;border-top-right-radius:6px;border-top-left-radius:6px;}#quicktags{padding:0;margin-bottom:-3px;border-bottom-width:3px;background-image:url("../images/ed-bg.gif");background-position:left top;background-repeat:repeat-x;}#quicktags #ed_toolbar{padding:2px 4px 0;}#ed_toolbar input,#ed_reply_toolbar input{margin:3px 1px 4px;line-height:18px;display:inline-block;min-width:26px;padding:2px 4px;font-size:12px;}#ed_reply_toolbar input{margin:1px 2px 1px 1px;}#quicktags #ed_link,#ed_reply_toolbar #ed_reply_link{text-decoration:underline;}#quicktags #ed_del,#ed_reply_toolbar #ed_reply_del{text-decoration:line-through;}#quicktags #ed_em,#ed_reply_toolbar #ed_reply_em{font-style:italic;}#excerpt,.attachmentlinks{margin:0;height:4em;width:98%;}#postcustomstuff table,#postcustomstuff input,#postcustomstuff textarea{border-width:1px;border-style:solid;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}#postcustomstuff .updatemeta,#postcustomstuff .deletemeta{margin:auto;}#postcustomstuff thead th{padding:5px 8px 8px;}#postcustom #postcustomstuff .submit{border:0 none;float:none;padding:5px 8px;}#side-sortables #postcustom #postcustomstuff .submit{padding:0 5px;}#side-sortables #postcustom #postcustomstuff td.left input{margin:3px 3px 0;}#side-sortables #postcustom #postcustomstuff #the-list textarea{height:85px;margin:3px;}#postcustomstuff table{margin:0;width:100%;border-width:1px;border-style:solid;border-spacing:0;}#postcustomstuff table input,#postcustomstuff table select,#postcustomstuff table textarea{width:95%;margin:8px 0 8px 8px;}#postcustomstuff th.left,#postcustomstuff td.left{width:38%;}#postcustomstuff .submit input{width:auto;}#postcustomstuff #newmeta .submit{padding:0 8px;}#postcustomstuff table #addmetasub{width:auto;}#postcustomstuff #newmetaleft{vertical-align:top;}#postcustomstuff #newmetaleft a{padding:0 10px;text-decoration:none;}#save{width:15em;}#template div{margin-right:190px;}* html #template div{margin-right:0;}.zerosize{height:0;width:0;margin:0;border:0;padding:0;overflow:hidden;position:absolute;}* html #themeselect{padding:0 3px;height:22px;}#your-profile legend{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:22px;}#your-profile #rich_editing{border:none;}#howto{font-size:11px;margin:0 5px;display:block;}#ajax-response.alignleft{margin-left:2em;}div.nav{height:2em;padding:7px 10px;vertical-align:text-top;margin:5px 0;}.nav .button-secondary{padding:2px 4px;}.tablenav-pages a{border-bottom-style:solid;border-bottom-width:2px;font-weight:bold;margin-right:1px;padding:0 2px;}.tablenav-pages .current-page{text-align:center;}.tablenav-pages .next-page{margin-left:2px;}p.pagenav{margin:0;display:inline;}.pagenav span{font-weight:bold;margin:0 6px;}.row-title{font-size:12px!important;font-weight:bold;}.widefat .column-comment p{margin:.6em 0;}.column-author img,.column-username img{float:left;margin-right:10px;margin-top:3px;}.tablenav a.button-secondary{display:block;margin:3px 8px 0 0;}.tablenav{clear:both;height:30px;margin:6px 0 4px;vertical-align:middle;}.tablenav .tablenav-pages{float:right;display:block;cursor:default;height:30px;line-height:30px;font-size:11px;}.tablenav .tablenav-pages a,.tablenav-pages span.current{text-decoration:none;border:none;padding:3px 6px;border-width:1px;border-style:solid;-moz-border-radius:5px;-khtml-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}.tablenav .displaying-num{margin-right:10px;font-size:12px;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-style:italic;}.tablenav .actions{padding:2px 8px 0 0;}td.media-icon{text-align:center;width:80px;padding-top:8px;padding-bottom:8px;}td.media-icon img{max-width:80px;max-height:60px;}#update-nag,.update-nag{line-height:19px;padding:5px 0;font-size:12px;text-align:center;margin:0 15px;border-width:1px;border-style:solid;border-top-width:0;border-top-style:none;-moz-border-radius:0 0 6px 6px;-webkit-border-bottom-right-radius:6px;-webkit-border-bottom-left-radius:6px;-khtml-border-bottom-right-radius:6px;-khtml-border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-bottom-left-radius:6px;}.plugins .plugin-update{padding:0;}.plugin-update .update-message{margin:0 10px 8px 31px;font-weight:bold;}#pass-strength-result{border-style:solid;border-width:1px;float:left;margin:12px 5px 5px 1px;padding:3px 5px;text-align:center;width:200px;}.row-actions{visibility:hidden;padding:2px 0 0;}tr:hover .row-actions,div.comment-item:hover .row-actions{visibility:visible;}.row-actions-visible{padding:2px 0 0;}#wphead-info{margin:0 0 0 15px;padding-right:15px;}#user_info{float:right;font-size:12px;line-height:46px;height:46px;}#user_info p{margin:0;padding:0;line-height:46px;}#wphead{height:46px;}#wphead a,#adminmenu a,#sidemenu a,#taglist a,#catlist a,#show-settings a{text-decoration:none;}#header-logo{float:left;margin:7px 0 0 15px;}#wphead h1{font:normal 22px Georgia,"Times New Roman","Bitstream Charter",Times,serif;padding:10px 8px 5px;margin:0;float:left;}#wphead h1.long-title{font:normal 18px Georgia,"Times New Roman","Bitstream Charter",Times,serif;padding:12px 10px 5px;}#wphead #privacy-on-link{font-size:50%;font-style:normal;line-height:17px;padding:0 6px;vertical-align:middle;}#wphead h1 a:hover{text-decoration:none;}#wphead h1 a:hover #site-title,#wphead h1 a#privacy-on-link:hover{text-decoration:underline;}#adminmenu *{-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;user-select:none;}#adminmenu .wp-submenu{display:none;list-style:none;padding:0;margin:0;position:relative;z-index:2;border-width:1px 0 0;border-style:solid none none;}#adminmenu .wp-submenu a{font:normal 11px/18px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover{font-weight:bold;}#adminmenu a.menu-top,#adminmenu .wp-submenu-head{font:normal 13px/18px Georgia,"Times New Roman","Bitstream Charter",Times,serif;}#adminmenu div.wp-submenu-head{display:none;}.folded #adminmenu div.wp-submenu-head,.folded #adminmenu li.wp-has-submenu div.sub-open{display:block;}.folded #adminmenu a.menu-top,.folded #adminmenu .wp-submenu,.folded #adminmenu li.wp-menu-open .wp-submenu,.folded #adminmenu div.wp-menu-toggle{display:none;}#adminmenu li.wp-menu-open .wp-submenu,.no-js #adminmenu .open-if-no-js .wp-submenu{display:block;}#adminmenu div.wp-menu-image{float:left;width:28px;height:28px;}#adminmenu li{margin:0;padding:0;cursor:pointer;}#adminmenu a{display:block;line-height:18px;padding:1px 5px 3px;}#adminmenu li.menu-top{min-height:26px;}#adminmenu a.menu-top{line-height:18px;min-width:10em;padding:5px 5px;border-width:1px 1px 0;border-style:solid solid none;}#adminmenu .wp-submenu a{margin:0;padding-left:12px;border-width:0 1px 0 0;border-style:none solid none none;}#adminmenu .menu-top-last ul.wp-submenu{border-width:0 0 1px;border-style:none none solid;}#adminmenu .wp-submenu li{padding:0;margin:0;}.folded #adminmenu li.menu-top{width:28px;height:30px;overflow:hidden;border-width:1px 1px 0;border-style:solid solid none;}#adminmenu .menu-top-first a.menu-top,.folded #adminmenu li.menu-top-first,#adminmenu .wp-submenu .wp-submenu-head{border-width:1px 1px 0;border-style:solid solid none;-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px;-khtml-border-top-right-radius:6px;-khtml-border-top-left-radius:6px;border-top-right-radius:6px;border-top-left-radius:6px;}#adminmenu .menu-top-last a.menu-top,.folded #adminmenu li.menu-top-last{border-width:1px;border-style:solid;-moz-border-radius-bottomleft:6px;-moz-border-radius-bottomright:6px;-webkit-border-bottom-right-radius:6px;-webkit-border-bottom-left-radius:6px;-khtml-border-bottom-right-radius:6px;-khtml-border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-bottom-left-radius:6px;}#adminmenu li.wp-menu-open a.menu-top-last{border-bottom:0 none;-moz-border-radius-bottomright:0;-moz-border-radius-bottomleft: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;}#adminmenu .wp-menu-image img{float:left;padding:8px 6px 0;opacity:.6;filter:alpha(opacity=60);}#adminmenu li.menu-top:hover .wp-menu-image img,#adminmenu li.wp-has-current-submenu .wp-menu-image img{opacity:1;filter:alpha(opacity=100);}#adminmenu li.wp-menu-separator{height:21px;padding:0;margin:0;}#adminmenu a.separator{cursor:w-resize;height:20px;padding:0;}.folded #adminmenu a.separator{cursor:e-resize;}#adminmenu .wp-menu-separator-last{height:10px;width:1px;}#adminmenu .wp-submenu .wp-submenu-head{border-width:1px;border-style:solid;padding:6px 4px 6px 10px;cursor:default;}.folded #adminmenu .wp-submenu{position:absolute;margin:-1px 0 0 28px;padding:0 8px 8px;z-index:999;border:0 none;}.folded #adminmenu .wp-submenu ul{width:140px;border-width:0 0 1px;border-style:none none solid;}.folded #adminmenu .wp-submenu li.wp-first-item{border-top:0 none;}.folded #adminmenu .wp-submenu a{padding-left:10px;}.folded #adminmenu a.wp-has-submenu{margin-left:40px;}#adminmenu li.menu-top-last .wp-submenu ul{border-width:0 0 1px;border-style:none none solid;}#adminmenu .wp-menu-toggle{width:22px;clear:right;float:right;margin:1px 0 0;height:27px;padding:1px 2px 0 0;cursor:default;}#adminmenu li.wp-has-current-submenu ul{border-bottom-width:1px;border-bottom-style:solid;}#adminmenu .wp-menu-image a{height:24px;}#adminmenu .wp-menu-image img{padding:6px 0 0 1px;}#adminmenu #awaiting-mod,#adminmenu span.update-plugins,#sidemenu li a span.update-plugins{position:absolute;font-family:Helvetica,Arial,sans-serif;font-size:9px;line-height:17px;font-weight:bold;margin-top:1px;margin-left:7px;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#adminmenu li #awaiting-mod span,#adminmenu li span.update-plugins span,#sidemenu li a span.update-plugins span{display:block;padding:0 6px;}#adminmenu li span.count-0,#sidemenu li a .count-0{display:none;}.post-com-count-wrapper{min-width:22px;font-family:Helvetica,Arial,sans-serif;}.post-com-count{height:1.3em;line-height:1.1em;display:block;text-decoration:none;padding:0 0 6px;cursor:pointer;background-position:center -80px;background-repeat:no-repeat;}.post-com-count span{font-size:9px;font-weight:bold;height:1.7em;line-height:1.70em;min-width:.7em;padding:0 6px;display:inline-block;cursor:pointer;-moz-border-radius:5px;-khtml-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}strong .post-com-count{background-position:center -55px;}.post-com-count:hover{background-position:center -3px;}.column-response .post-com-count{float:left;margin-right:5px;text-align:center;}.response-links{float:left;}#the-comment-list .attachment-80x60{padding:4px 8px;}#footer{margin-top:-46px;border-top:1px;border-style:solid;}#footer,#footer a{font-size:12px;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-style:italic;}#footer p{margin:0;padding:15px;line-height:15px;}#footer a{text-decoration:none;}#footer a:hover{text-decoration:underline;}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;margin-bottom:-8px;clear:both;}.form-table td{margin-bottom:9px;padding:8px 10px;line-height:20px;font-size:11px;}.form-table th,.form-wrap label{font-weight:normal;text-shadow:rgba(255,255,255,1) 0 1px 0;}.form-table th{vertical-align:top;text-align:left;padding:10px;width:200px;}.form-table th.th-full{width:auto;}.form-table div.color-option{display:block;clear:both;margin-top:12px;}.form-table input.tog{margin-top:2px;margin-right:2px;float:left;}.form-table table.color-palette{vertical-align:bottom;float:left;margin:-12px 3px 11px;}.form-table .color-palette td{border-width:1px 1px 0;border-style:solid solid none;height:10px;line-height:20px;width:10px;}input.large-text,textarea.large-text{width:99%;}input.regular-text,#adduser .form-field input{width:25em;}input.small-text{width:50px;}#profile-page .form-table textarea{width:500px;margin-bottom:6px;}#profile-page .form-table #rich_editing{margin-right:5px;}.form-table .pre{padding:8px;margin:0;}.pre{white-space:pre-wrap;white-space:-moz-pre-wrap!important;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}table.form-table td .updated{font-size:13px;}.form-wrap{margin:10px 0;width:97%;}.form-wrap p,.form-wrap label{font-size:11px;}.form-wrap label{display:block;padding:2px;font-size:12px;}.form-field input,.form-field textarea{border-style:solid;border-width:1px;width:95%;}p.description,.form-wrap p{margin:2px 0 5px;}p.help,p.description,span.description,.form-wrap p{font-size:12px;font-style:italic;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}.form-wrap .form-field{margin:0 0 10px;padding:8px;}.col-wrap h3{margin:12px 0;font-size:1.1em;}.col-wrap p.submit{margin-top:-10px;}.tagcloud{width:97%;margin:0 0 40px;text-align:justify;}.tagcloud h3{margin:2px 0 12px;}#post-body #normal-sortables{min-height:50px;}#post-body #advanced-sortables{min-height:20px;}.postbox{position:relative;min-width:255px;width:99.5%;}#trackback_url{width:99%;}#normal-sortables .postbox .submit{background:transparent none;border:0 none;float:right;padding:0 12px;margin:0;}#normal-sortables .postbox #replyrow .submit{float:none;margin:0;padding:3px 7px;}#side-sortables .submitbox .submit input,#side-sortables .submitbox .submit .preview,#side-sortables .submitbox .submit a.preview:hover{border:0 none;}#side-sortables .inside-submitbox .insidebox,.stuffbox .insidebox{margin:11px 0;}#side-sortables .comments-box,#normal-sortables .comments-box{border:0 none;}#side-sortables .comments-box thead th,#normal-sortables .comments-box thead th{background:transparent;padding:0 7px 4px;font-style:italic;}#commentsdiv img.waiting{padding-left:5px;vertical-align:middle;}#post-body .tagsdiv #newtag{margin-right:5px;width:16em;}#side-sortables input#post_password{width:94%;}#side-sortables .tagsdiv #newtag{width:68%;}#post-status-info{border-width:0 1px 1px;border-style:none solid solid;width:100%;-moz-border-radius:0 0 6px 6px;-webkit-border-bottom-left-radius:6px;-webkit-border-bottom-right-radius:6px;-khtml-border-bottom-left-radius:6px;-khtml-border-bottom-right-radius:6px;border-bottom-left-radius:6px;border-bottom-right-radius:6px;}#post-status-info td{font-size:11px;}.autosave-info{padding:2px 15px 2px 2px;text-align:right;}#editorcontent #post-status-info{border:none;}#post-body .wp_themeSkin .mceStatusbar a.mceResize{display:block;background:transparent url(../images/resize.gif) no-repeat scroll right bottom;width:12px;cursor:se-resize;margin:0 2px;position:relative;top:22px;}#linksubmitdiv div.inside,div.inside{padding:0;margin:0;}#comment-status-radio p{margin:3px 0 5px;}#comment-status-radio input{margin:2px 3px 5px 0;vertical-align:middle;}#comment-status-radio label{padding:5px 0;}.tagchecklist{margin-left:14px;font-size:12px;overflow:auto;}.tagchecklist strong{margin-left:-8px;position:absolute;}.tagchecklist span{margin-right:25px;display:block;float:left;font-size:11px;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;}.howto{font-style:italic;display:block;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}.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;}#poststuff h2{margin-top:20px;font-size:1.5em;margin-bottom:15px;padding:0 0 3px;clear:left;}.widget .widget-top,.postbox h3{cursor:move;-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;user-select:none;}.postbox .hndle span{padding:6px 0;}.postbox .hndle{cursor:move;}.hndle a{font-size:11px;font-weight:normal;}#dashboard-widgets .meta-box-sortables{margin:0 5px;}.postbox .handlediv{float:right;width:23px;height:26px;}.sortable-placeholder{border-width:1px;border-style:dashed;margin-bottom:20px;}#poststuff h3,.metabox-holder h3{font-size:12px;font-weight:bold;padding:7px 9px;margin:0;line-height:1;}.widget,.postbox,.stuffbox{margin-bottom:20px;border-width:1px;border-style:solid;line-height:1;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.widget .widget-top,.postbox h3,.postbox h3,.stuffbox h3{-moz-border-radius:6px 6px 0 0;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px;-khtml-border-top-right-radius:6px;-khtml-border-top-left-radius:6px;border-top-right-radius:6px;border-top-left-radius:6px;}.postbox.closed h3{-moz-border-radius-bottomleft:4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-webkit-border-bottom-right-radius:4px;-khtml-border-bottom-right-radius:4px;border-bottom-right-radius:4px;}.postbox table.form-table{margin-bottom:0;}.postbox input[type="text"],.postbox textarea,.stuffbox input[type="text"],.stuffbox textarea{border-width:1px;border-style:solid;}#poststuff .inside,#poststuff .inside p{font-size:11px;margin:6px 6px 8px;}#poststuff .inside .submitbox p{margin:1em 0;}#post-visibility-select{line-height:1.5em;margin-top:3px;}#poststuff #submitdiv .inside{margin:0;}#titlediv,#poststuff .postarea{margin-bottom:20px;}#titlediv{position:relative;margin-bottom:20px;}#titlediv label{cursor:text;}#titlediv div.inside{margin:0;}#poststuff #titlewrap{border:0;padding:0;}#titlediv #title{padding:3px 4px;border-width:1px;border-style:solid;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;font-size:1.7em;line-height:100%;width:100%;outline:none;}#titlediv #title-prompt-text{color:#bbb;position:absolute;font-size:1.7em;padding:8px;}#poststuff .inside-submitbox,#side-sortables .inside-submitbox{margin:0 3px;font-size:11px;}input#link_description,input#link_url{width:98%;}#pending{background:0 none;border:0 none;padding:0;font-size:11px;margin-top:-1px;}#edit-slug-box{height:1em;margin-top:8px;padding:0 7px;}#editable-post-name-full{display:none;}#editable-post-name input{width:16em;}.postarea h3 label{float:left;}.postarea #add-media-button{float:right;margin:7px 0 0;position:relative;right:10px;}#poststuff #editor-toolbar{height:30px;}.wp_themeSkin tr.mceFirst td.mceToolbar{border-width:0 0 1px;border-style:none none solid;}#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;}.js .theEditor{color:white;}#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{vertical-align:middle;}.submitbox .submit{text-align:left;padding:12px 10px 10px;font-size:11px;}.submitbox .submitdelete{border-bottom-width:1px;border-bottom-style:solid;text-decoration:none;padding:1px 2px;}.inside-submitbox #post_status{margin:2px 0 2px -2px;}.submitbox .submit a:hover{border-bottom-width:1px;border-bottom-style:solid;}.submitbox .submit input{margin-bottom:8px;margin-right:4px;padding:6px;}#post-status-select{line-height:2.5em;margin-top:3px;}.category-adder{margin-left:120px;padding:4px 0;}.category-adder h4{margin:0 0 8px;}#side-sortables .category-adder{margin:0;}#post-body .category-add input,.category-add select{width:30%;}#side-sortables .category-add input{width:94%;}#side-sortables .category-add select{width:100%;}#side-sortables .category-add input.category-add-sumbit,#post-body .category-add input.category-add input.category-add-sumbit{width:auto;}#post-body ul.category-tabs,#post-body ul.add-menu-item-tabs{float:left;width:120px;text-align:right;margin:0 -120px 0 5px;padding:0;}#post-body ul.category-tabs li,#post-body ul.add-menu-item-tabs li{padding:8px;}#post-body ul.category-tabs li.tabs,#post-body ul.add-menu-item-tabs li.tabs{-moz-border-radius:3px 0 0 3px;-webkit-border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-top-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-top-left-radius:3px;border-bottom-left-radius:3px;}#post-body ul.category-tabs li.tabs a,#post-body ul.add-menu-item-tabs li.tabs a{font-weight:bold;text-decoration:none;}.categorydiv div.tabs-panel,.customlinkdiv div.tabs-panel,.posttypediv div.tabs-panel,.taxonomydiv div.tabs-panel,#linkcategorydiv div.tabs-panel{height:200px;overflow:auto;padding:.5em .9em;border-style:solid;border-width:1px;}.nav-menus-php .customlinkdiv div.tabs-panel,.nav-menus-php .posttypediv div.tabs-panel,.nav-menus-php .taxonomydiv div.tabs-panel{height:auto;max-height:205px;}div.tabs-panel-active{display:block;}div.tabs-panel-inactive{display:none;}#post-body .categorydiv div.tabs-panel,.taxonomy div.tabs-panel,#post-body #linkcategorydiv div.tabs-panel{margin:0 5px 0 125px;}#side-sortables .category-tabs li,#side-sortables .add-menu-item-tabs li{display:inline;}#side-sortables .category-tabs a,#side-sortables .add-menu-item-tabs a{text-decoration:none;}#side-sortables .category-tabs,#side-sortables .add-menu-item-tabs{margin-bottom:3px;}.categorydiv ul,.customlinkdiv ul,.posttypediv ul,.taxonomydiv ul,#linkcategorydiv ul{list-style:none;padding:0;margin:0;}#front-page-warning,#front-static-pages ul,.inline-editor ul.cat-checklist ul,.categorydiv ul.categorychecklist ul,.customlinkdiv ul.categorychecklist ul,.posttypediv ul.categorychecklist ul,.taxonomydiv ul.categorychecklist ul,#linkcategorydiv ul.categorychecklist ul{margin-left:18px;}ul.categorychecklist li{margin:0;padding:0;line-height:19px;word-wrap:break-word;}.category-adder h4{margin-top:4px;margin-bottom:0;}.categorydiv .tabs-panel,.customlinkdiv .tabs-panel,.posttypediv .tabs-panel,.taxonomydiv .tabs-panel{border-width:3px;border-style:solid;}ul.category-tabs,ul.add-menu-item-tabs{margin-top:12px;}ul.category-tabs li.tabs,ul.add-menu-item-tabs li.tabs{border-style:solid solid none;border-width:1px 1px 0;}#post-body .category-tabs li.tabs,#post-body .add-menu-item-tabs li.tabs{border-style:solid none solid solid;border-width:1px 0 1px 1px;margin-right:-1px;}ul.category-tabs li,ul.add-menu-item-tabs li{padding:5px;-moz-border-radius:3px 3px 0 0;-webkit-border-top-left-radius:3px;-webkit-border-top-right-radius:3px;-khtml-border-top-left-radius:3px;-khtml-border-top-right-radius:3px;border-top-left-radius:3px;border-top-right-radius:3px;}form#tags-filter{position:relative;}p.search-box{float:right;margin:-5px 0 0;}.screen-per-page{width:3em;}#posts-filter fieldset{float:left;margin:0 1.5ex 1em 0;padding:0;}#posts-filter fieldset legend{padding:0 0 .2em 1px;}td.post-title strong,td.plugin-title strong{display:block;margin-bottom:.2em;}td.post-title p,td.plugin-title p{margin:6px 0;}td.plugin-title{white-space:nowrap;}.wp-hidden-children .wp-hidden-child,.ui-tabs-hide{display:none;}.commentlist .avatar{vertical-align:text-top;}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle;}body.wp-admin{min-width:785px;}.view-switch{float:right;margin:6px 8px 0;}.view-switch a{text-decoration:none;}.filter{float:left;margin:-5px 0 0 10px;}.filter .subsubsub{margin-left:-10px;margin-top:13px;}#the-comment-list td.comment p.comment-author{margin-top:0;margin-left:0;}#the-comment-list p.comment-author img{float:left;margin-right:8px;}#the-comment-list p.comment-author strong a{border:none;}#the-comment-list td{vertical-align:top;}#the-comment-list td.comment{word-wrap:break-word;}#the-comment-list .check-column{padding-top:8px;}#templateside ul li a{text-decoration:none;}.indicator-hint{padding-top:8px;}#display_name{width:15em;}.tablenav .delete{margin-right:20px;}td.action-links,th.action-links{text-align:right;}table.diff{width:100%;}table.diff col.content{width:50%;}table.diff tr{background-color:transparent;}table.diff td,table.diff th{padding:.5em;font-family:Consolas,Monaco,Courier,monospace;border:none;}table.diff .diff-deletedline del,table.diff .diff-addedline ins{text-decoration:none;}#wp-word-count{display:block;padding:2px 7px;}fieldset{border:0;padding:0;margin:0;}.tool-box{margin:15px 0 35px;}.tool-box .buttons{margin:15px 0;}.tool-box .title{margin:8px 0;font:18px/24px Georgia,"Times New Roman","Bitstream Charter",Times,serif;}.pressthis a{font-size:1.2em;}#wp_editbtns,#wp_gallerybtns{padding:2px;position:absolute;display:none;z-index:999998;}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{margin:2px;padding:2px;border-width:1px;border-style:solid;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.settings-toggle{text-align:right;margin:5px 7px 15px 0;font-size:12px;}.settings-toggle h3{margin:0;}#timestampdiv select{height:20px;line-height:14px;padding:0;vertical-align:top;}#jj,#hh,#mn{width:2em;padding:1px;font-size:12px;}#aa{width:3.4em;padding:1px;font-size:12px;}.curtime #timestamp{background-repeat:no-repeat;background-position:left top;padding-left:18px;}#timestampdiv{padding-top:5px;line-height:23px;}#timestampdiv p{margin:8px 0 6px;}#timestampdiv input{border-width:1px;border-style:solid;}#sidemenu{margin:-30px 15px 0 315px;list-style:none;position:relative;float:right;padding-left:10px;font-size:12px;}#sidemenu a{padding:0 7px;display:block;float:left;line-height:28px;border-top-width:1px;border-top-style:solid;border-bottom-width:1px;border-bottom-style:solid;}#sidemenu li{display:inline;line-height:200%;list-style:none;text-align:center;white-space:nowrap;margin:0;padding:0;}#sidemenu a.current{font-weight:normal;padding-left:6px;padding-right:6px;-moz-border-radius:4px 4px 0 0;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-khtml-border-top-left-radius:4px;-khtml-border-top-right-radius:4px;border-top-left-radius:4px;border-top-right-radius:4px;border-width:1px;border-style:solid;}#sidemenu{margin:-30px 15px 0 315px;list-style:none;position:relative;float:right;padding-left:10px;font-size:12px;}#sidemenu a{padding:0 7px;display:block;float:left;line-height:28px;border-top-width:1px;border-top-style:solid;border-bottom-width:1px;border-bottom-style:solid;}#sidemenu li a .count-0{display:none;}#replyrow{font-size:11px;}#replyrow input{border-width:1px;border-style:solid;}#replyrow td{padding:2px;}#replyrow #editorcontainer{border:0 none;}#replysubmit{margin:0;padding:3px 7px;}#replysubmit img.waiting,.inline-edit-save img.waiting{padding:4px 10px 0;vertical-align:top;float:right;}#replysubmit .button{margin-right:5px;}#replyrow #editor-toolbar{display:none;}#replyhead{font-size:12px;font-weight:bold;padding:2px 10px 4px;}#edithead .inside{float:left;padding:3px 0 2px 5px;margin:0;text-align:center;font-size:11px;}#edithead .inside input{width:180px;font-size:11px;}#edithead label{padding:2px 0;}#replycontainer{padding:5px;border:0 none;height:120px;overflow:hidden;position:relative;}#replycontent{resize:none;margin:0;width:100%;height:100%;padding:0;line-height:150%;border:0 none;outline:none;font-size:12px;}#replyrow #ed_reply_toolbar{margin:0;padding:2px 3px;}#screen-meta{position:relative;clear:both;}#screen-meta-links{margin:0 18px 0 0;}#screen-meta .screen-reader-text{visibility:hidden;}#screen-options-link-wrap,#contextual-help-link-wrap{float:right;height:22px;padding:0;margin:0 6px 0 0;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;background:#e3e3e3;-moz-border-radius-bottomleft:3px;-moz-border-radius-bottomright:3px;-webkit-border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;}#contextual-help-wrap li{list-style-type:disc;margin-left:18px;}#screen-meta a.show-settings{text-decoration:none;z-index:1;padding:0 16px 0 6px;height:22px;line-height:22px;font-size:10px;display:block;background-repeat:no-repeat;background-position:right bottom;}#screen-meta a.show-settings{background-image:url(../images/screen-options-right.gif?ver=20100531);}#screen-meta a.show-settings:hover{text-decoration:none;}#screen-options-wrap h5,#contextual-help-wrap h5{margin:8px 0;font-size:13px;}#screen-options-wrap,#contextual-help-wrap{border-style:none solid solid;border-top:0 none;border-width:0 1px 1px;margin:0 15px;padding:8px 12px 12px;-moz-border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px;}.metabox-prefs label{padding-right:15px;white-space:nowrap;line-height:30px;}.metabox-prefs label input{margin:0 5px 0 2px;}.metabox-prefs label a{display:none;}tr.inline-edit-row td{padding:0 .5em;}#wpbody-content .inline-edit-row fieldset{font-size:12px;float:left;margin:0;padding:0;width:100%;}#wpbody-content .inline-edit-row fieldset .inline-edit-col{padding:0 .5em;}#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col{border-width:0 0 0 1px;border-style:none none none solid;}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:40%;}#wpbody-content .quick-edit-row-post .inline-edit-col-right{width:39%;}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:20%;}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:50%;}#wpbody-content .quick-edit-row-page .inline-edit-col-right,#wpbody-content .bulk-edit-row-post .inline-edit-col-right{width:49%;}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:30%;}#wpbody-content .bulk-edit-row-page .inline-edit-col-right{width:69%;}#wpbody-content .bulk-edit-row .inline-edit-col-bottom{float:right;width:69%;}#wpbody-content .inline-edit-row-page .inline-edit-col-right,#owpbody-content .bulk-edit-row-post .inline-edit-col-right{margin-top:27px;}.inline-edit-row fieldset .inline-edit-group{clear:both;}.inline-edit-row fieldset .inline-edit-group:after{content:".";display:block;height:0;clear:both;visibility:hidden;}.inline-edit-row p.submit{clear:both;padding:.5em;margin:.5em 0 0;}.inline-edit-row span.error{line-height:22px;margin:0 15px;padding:3px 5px;}.inline-edit-row h4{margin:.2em 0;padding:0;line-height:23px;}.inline-edit-row fieldset span.title,.inline-edit-row fieldset span.checkbox-title{margin:0;padding:0;line-height:27px;}.inline-edit-row fieldset label,.inline-edit-row fieldset span.inline-edit-categories-label{display:block;margin:.2em 0;}.inline-edit-row fieldset label.inline-edit-tags{margin-top:0;}.inline-edit-row fieldset label.inline-edit-tags span.title{margin:.2em 0;}.inline-edit-row fieldset label span.title{display:block;float:left;width:5em;}.inline-edit-row fieldset label span.input-text-wrap{display:block;margin-left:5em;}.quick-edit-row-post fieldset.inline-edit-col-right label span.title{width:auto;padding-right:.5em;}.inline-edit-row .input-text-wrap input[type=text]{width:100%;}.inline-edit-row fieldset label input[type=checkbox]{vertical-align:text-bottom;}.inline-edit-row fieldset label textarea{width:100%;height:4em;}#wpbody-content .bulk-edit-row fieldset .inline-edit-group label{max-width:50%;}#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child{margin-right:.5em;}.inline-edit-row h4{text-transform:uppercase;}.inline-edit-row fieldset span.title,.inline-edit-row fieldset span.checkbox-title{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-style:italic;line-height:1.8em;}.inline-edit-row fieldset input[type="text"],.inline-edit-row fieldset textarea{border-style:solid;border-width:1px;}.inline-edit-row fieldset .inline-edit-date{float:left;}.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=mn]{font-size:12px;width:2.1em;}.inline-edit-row fieldset input[name=aa]{font-size:12px;width:3.5em;}.inline-edit-row fieldset label input.inline-edit-password-input{width:8em;}.inline-edit-row .catshow,.inline-edit-row .cathide{cursor:pointer;}ul.cat-checklist{height:12em;border-style:solid;border-width:1px;overflow-y:scroll;padding:0 5px;margin:0;}#bulk-titles{display:block;height:12em;border-style:solid;border-width:1px;overflow-y:scroll;padding:0 5px;margin:0 0 5px;}.inline-edit-row fieldset ul.cat-checklist li,.inline-edit-row fieldset ul.cat-checklist input{margin:0;}.inline-edit-row fieldset ul.cat-checklist label,.inline-edit-row .catshow,.inline-edit-row .cathide,.inline-edit-row #bulk-titles div{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;font-style:normal;font-size:11px;}table .inline-edit-row fieldset ul.cat-hover{height:auto;max-height:30em;overflow-y:auto;position:absolute;}.inline-edit-row fieldset label input.inline-edit-menu-order-input{width:3em;}.inline-edit-row fieldset label input.inline-edit-slug-input{width:75%;}.quick-edit-row-post fieldset label.inline-edit-status{float:left;}#bulk-titles{line-height:140%;}#bulk-titles div{margin:.2em .3em;}#bulk-titles div a{cursor:pointer;display:block;float:left;height:10px;margin:3px 3px 0 -2px;overflow:hidden;position:relative;text-indent:-9999px;width:10px;}#wpbody-content #media-items .describe{border-collapse:collapse;width:100%;border-top-style:solid;border-top-width:1px;clear:both;cursor:default;padding:5px;}#wpbody-content .describe th{vertical-align:top;text-align:left;padding:10px;width:140px;}#wpbody-content .describe .media-item-info tr{background-color:transparent;}#wpbody-content .describe .media-item-info td{padding:4px 10px 0;}.describe .media-item-info .A1B1{padding:0 0 0 10px;}#wpbody-content .filename{padding:0 10px;}#wpbody-content .media-item .thumbnail{max-height:128px;max-width:128px;}#wpbody-content #async-upload-wrap a{display:none;}.media-upload-form td label{margin-right:6px;margin-left:2px;}.media-upload-form .align .field label{display:inline;padding:0 0 0 22px;margin:0 1em 0 0;font-weight:bold;}.media-upload-form tr.image-size label{margin:0 0 0 3px;font-weight:bold;}.media-upload-form th.label label{font-weight:bold;margin:.5em;font-size:13px;}.media-upload-form th.label label span{padding:0 5px;}abbr.required{border:medium none;text-decoration:none;}#wpbody-content .describe input[type="text"],#wpbody-content .describe textarea{width:460px;}#wpbody-content .describe p.help{margin:0;padding:0 0 0 5px;}.media-item .error-div a.dismiss,.describe-toggle-on,.describe-toggle-off{display:block;line-height:36px;float:right;margin-right:20px;}.describe-toggle-off{display:none;}#wpbody-content .media-item{border-bottom-style:solid;border-bottom-width:1px;min-height:36px;position:relative;width:100%;}#wpbody-content .media-single .media-item{border-bottom-style:none;border-bottom-width:0;}#wpbody-content #media-items{border-style:solid solid none;border-width:1px;width:670px;}#wpbody-content #media-items .filename{line-height:36px;overflow:hidden;}.media-item .error-div{padding-left:10px;}.media-item .pinkynail{float:left;margin:2px;max-width:40px;max-height:32px;}.media-item .startopen,.media-item .startclosed{display:none;}.media-item .original{position:relative;height:34px;width:503px;}.media-item .percent{font-weight:bold;}.crunching{display:block;line-height:32px;text-align:right;margin-right:5px;}.progress{position:relative;margin-bottom:-36px;height:36px;}.bar{width:0;height:100%;border-right-width:3px;border-right-style:solid;}.upload-php .fixed .column-parent{width:25%;}.find-box{width:500px;height:300px;overflow:hidden;padding:33px 5px 40px;position:absolute;z-index:1000;}.find-box-head{cursor:move;font-weight:bold;height:2em;line-height:2em;padding:1px 12px;position:absolute;top:5px;width:100%;}.find-box-inside{overflow:auto;width:100%;height:100%;}.find-box-search{padding:12px;border-width:1px;border-style:none none solid;}#find-posts-response{margin:8px 0;padding:0 1px;}#find-posts-response table{width:100%;}#find-posts-response .found-radio{padding:5px 0 0 8px;width:15px;}.find-box-buttons{width:480px;margin:8px;}.find-box-search label{padding-right:6px;}.find-box #resize-se{position:absolute;right:1px;bottom:1px;}#favorite-actions{float:right;margin:11px 12px 0;min-width:130px;position:relative;}#favorite-first{-moz-border-radius:12px;-khtml-border-radius:12px;-webkit-border-radius:12px;border-radius:12px;line-height:15px;padding:3px 30px 4px 12px;border-width:1px;border-style:solid;}#favorite-inside{margin:0;padding:2px 1px;border-width:1px;border-style:solid;position:absolute;z-index:11;display:none;-moz-border-radius:0 0 12px 12px;-webkit-border-bottom-right-radius:12px;-webkit-border-bottom-left-radius:12px;-khtml-border-bottom-right-radius:12px;-khtml-border-bottom-left-radius:12px;border-bottom-right-radius:12px;border-bottom-left-radius:12px;}#favorite-actions a{display:block;text-decoration:none;font-size:11px;}#favorite-inside a{padding:3px 5px 3px 10px;}#favorite-toggle{height:22px;position:absolute;right:0;top:1px;width:28px;}#favorite-actions .slide-down{-moz-border-radius:12px 12px 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;border-bottom:none;}#utc-time,#local-time{padding-left:25px;font-style:italic;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}ul#dismissed-updates{display:none;}form.upgrade{margin-top:8px;}form.upgrade .hint{font-style:italic;font-size:85%;margin:-0.5em 0 2em 0;}#poststuff .inside .the-tagcloud{margin:5px 0 10px;padding:8px;border-width:1px;border-style:solid;line-height:1.8em;word-spacing:3px;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}br.clear{height:2px;line-height:2px;}.swfupload{margin:5px 10px;vertical-align:middle;}table.fixed{table-layout:fixed;}.fixed .column-rating,.fixed .column-visible{width:8%;}.fixed .column-date,.fixed .column-parent,.fixed .column-links{width:10%;}.fixed .column-response,.fixed .column-author,.fixed .column-categories,.fixed .column-tags,.fixed .column-rel,.fixed .column-role{width:15%;}.fixed .column-comments{width:4em;padding-top:8px;text-align:left;}.fixed .column-comments .vers{padding-left:3px;}.fixed .column-comments a{float:left;}.fixed .column-slug{width:25%;}.fixed .column-posts{width:10%;}.fixed .column-icon{width:80px;}#commentsdiv .fixed .column-author,#comments-form .fixed .column-author{width:20%;}.widefat th,.widefat td{overflow:hidden;}.widefat td p{margin:2px 0 .8em;}table .vers,table .column-visible,table .column-rating{text-align:center;}.sorting-indicator{display:none;float:left;width:21px;height:4px;margin-top:5px;}th.sortable a,th.sorted-asc a,th.sorted-desc a{float:left;}th.sorted-asc .sorting-indicator,th.sorted-desc:hover .sorting-indicator,th.sortable:hover .sorting-indicator{display:block;background:url(../images/sort_asc.gif) no-repeat scroll 0 0;}th.sorted-desc .sorting-indicator,th.sorted-asc:hover .sorting-indicator{display:block;background:url(../images/sort_desc.gif) no-repeat scroll 0 0;}.icon32{float:left;height:36px;margin:14px 6px 0 0;width:36px;}.key-labels label{line-height:24px;}.subtitle{font-size:.75em;line-height:1;padding-left:25px;}ol{list-style-type:decimal;margin-left:2em;}.postbox-container{float:left;padding-right:.5%;}.postbox-container .meta-box-sortables{min-height:300px;}.temp-border{border:1px dotted #ccc;}.columns-prefs label{padding:0 5px;}.theme-install-php h4,.plugin-install-php h4{margin:2.5em 0 8px;}p.install-help{margin:8px 0;font-style:italic;}p.popular-tags{-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;border-width:1px;border-style:solid;line-height:2em;padding:8px 12px 12px;text-align:justify;}p.popular-tags a{padding:0 3px;}.stuffbox .editcomment{clear:none;}.ajax-feedback{visibility:hidden;vertical-align:bottom;}.tagsdiv .newtag{width:180px;}.tagsdiv .the-tags{display:block;height:60px;margin:0 auto;overflow:auto;width:260px;}#post-body-content .tagsdiv .the-tags{margin:0 5px;}label,#your-profile label+a{vertical-align:middle;}#misc-publishing-actions label{vertical-align:baseline;}.plugin-update-tr .update-message{margin:5px;padding:3px 5px;border-width:1px;border-style:solid;-moz-border-radius:5px;-khtml-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}.add-new-h2{font-style:normal;margin:0 6px;position:relative;top:-3px;}.describe .image-editor{vertical-align:top;}.imgedit-wrap{position:relative;}.imgedit-settings p{margin:8px 0;}.describe .imgedit-wrap table td{vertical-align:top;padding-top:0;}.imgedit-wrap p,.describe .imgedit-wrap table td{font-size:11px;line-height:18px;}.describe .imgedit-wrap table td.imgedit-settings{padding:0 5px;}td.imgedit-settings input{vertical-align:middle;}.imgedit-wait{position:absolute;top:0;background:#FFF url(../images/wpspin_light.gif) no-repeat scroll 22px 10px;opacity:.7;filter:alpha(opacity=70);width:100%;height:500px;display:none;}.media-disabled,.imgedit-settings .disabled{color:grey;}.imgedit-wait-spin{padding:0 4px 4px;vertical-align:bottom;visibility:hidden;}.imgedit-menu{margin:0 0 12px;min-width:300px;}.imgedit-menu div{float:left;width:32px;height:32px;-moz-border-radius:4px;-khtml-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border-width:1px;border-style:solid;}.imgedit-crop-wrap{position:relative;}.imgedit-crop{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -9px -31px;margin:0 8px 0 0;}.imgedit-crop.disabled:hover{background-position:-9px -31px;}.imgedit-crop:hover{background-position:-9px -1px;}.imgedit-rleft{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -46px -31px;margin:0 3px;}.imgedit-rleft.disabled:hover{background-position:-46px -31px;}.imgedit-rleft:hover{background-position:-46px -1px;}.imgedit-rright{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -77px -31px;margin:0 8px 0 3px;}.imgedit-rright.disabled:hover{background-position:-77px -31px;}.imgedit-rright:hover{background-position:-77px -1px;}.imgedit-flipv{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -115px -31px;margin:0 3px;}.imgedit-flipv.disabled:hover{background-position:-115px -31px;}.imgedit-flipv:hover{background-position:-115px -1px;}.imgedit-fliph{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -147px -31px;margin:0 8px 0 3px;}.imgedit-fliph.disabled:hover{background-position:-147px -31px;}.imgedit-fliph:hover{background-position:-147px -1px;}.imgedit-undo{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -184px -31px;margin:0 3px;}.imgedit-undo.disabled:hover{background-position:-184px -31px;}.imgedit-undo:hover{background-position:-184px -1px;}.imgedit-redo{background:transparent url(../images/imgedit-icons.png) no-repeat scroll -215px -31px;margin:0 8px 0 3px;}.imgedit-redo.disabled:hover{background-position:-215px -31px;}.imgedit-redo:hover{background-position:-215px -1px;}.imgedit-applyto img{margin:0 8px 0 0;}.imgedit-group-top{margin:5px 0;}.imgedit-applyto .imgedit-label{padding:2px 0 0;display:block;}.imgedit-help{display:none;font-style:italic;margin-bottom:8px;}.imgedit-help ul li{font-size:11px;}a.imgedit-help-toggle{text-decoration:none;}#wpbody-content .imgedit-response div{width:600px;margin:8px;}.form-table td.imgedit-response{padding:0;}.imgedit-submit{margin:8px 0;}.imgedit-submit-btn{margin-left:20px;}.imgedit-wrap .nowrap{white-space:nowrap;}span.imgedit-scale-warn{color:red;font-size:20px;font-style:normal;visibility:hidden;vertical-align:middle;}.imgedit-group{border-width:1px;border-style:solid;-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;margin-bottom:8px;padding:2px 10px;}#dashboard_recent_comments div.undo{border-top-style:solid;border-top-width:1px;margin:0 -10px;padding:3px 8px;font-size:11px;}.trash-undo-inside,.spam-undo-inside{margin:1px 8px 1px 0;line-height:16px;}.spam-undo-inside .avatar,.trash-undo-inside .avatar{height:20px;width:20px;margin-right:8px;vertical-align:middle;}.taghint{color:#aaa;margin:15px 0 -24px 12px;}#poststuff .tagsdiv .howto{margin:0 0 6px 8px;}.ajaxtag .newtag{background:transparent;position:relative;}#broken-themes{text-align:left;width:50%;border-spacing:3px;padding:3px;}.describe .del-link{padding-left:5px;}.comment-ays{margin-bottom:0;border-style:solid;border-width:1px;}.comment-ays th{border-right-style:solid;border-right-width:1px;}div#custom-background-image{min-height:100px;border:1px solid #dfdfdf;}div#custom-background-image img{max-width:400px;max-height:300px;}#custom-background label{padding-right:15px;}.appearance_page_custom-header #headimg{border:1px solid #DFDFDF;min-height:100px;width:100%;}.appearance_page_custom-header #upload-form p label{font-size:11px;}.appearance_page_custom-header #available-headers .default-header{float:left;margin:0 20px 20px 0;}.appearance_page_custom-header #available-headers label input{margin-right:10px;}.appearance_page_custom-header #available-headers label img{vertical-align:middle;}.nav-tab{border-style:solid;border-color:#ccc #ccc #f9f9f9;border-width:1px 1px 0;color:#c1c1c1;text-shadow:rgba(255,255,255,1) 0 1px 0;font-size:12px;line-height:16px;display:inline-block;padding:4px 14px 6px;text-decoration:none;margin:0 6px -1px 0;-moz-border-radius:5px 5px 0 0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-khtml-border-top-left-radius:5px;-khtml-border-top-right-radius:5px;border-top-left-radius:5px;border-top-right-radius:5px;}.nav-tab-active{border-width:1px;color:#464646;}.themes-php .wrap h2,.theme-install-php .wrap h2{border-bottom:1px solid #ccc;padding-bottom:0;}h2 .nav-tab{padding:4px 20px 6px;font:italic normal normal 24px/35px Georgia,"Times New Roman","Bitstream Charter",Times,serif;}body.update-php{height:98%;}
\ No newline at end of file
diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index cb84cc3383..dd0663a09d 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -27,6 +27,8 @@ select option {
 	padding: 2px;
 }
 
+.plugins #name {width: 33%}
+
 .plugins .name,
 #pass-strength-result.strong,
 #pass-strength-result.short,
@@ -67,12 +69,11 @@ input.button-highlighted,
 	padding: 0;
 }
 
-.widefat tbody.plugins th.check-column {
+.plugins tbody th.check-column {
 	padding: 7px 0;
 }
 
-.widefat .plugins td,
-.widefat .plugins th {
+.plugins td, .plugins th {
 	border-bottom: 0 none;
 }
 
@@ -115,6 +116,16 @@ input.button-highlighted,
 	margin: 10px 20px 10px 20px;
 }
 
+#loading-items {
+	position: absolute;
+	z-index: 9999;
+	padding: 10px;
+	background-color: #fff;
+	font-weight: bold;
+	text-align: center;
+	opacity: 0.5;
+}
+
 table#availablethemes {
 	border-spacing: 0;
 	border-width: 1px 0;
@@ -714,13 +725,19 @@ div.nav {
 	padding: 2px 4px;
 }
 
-a.page-numbers {
+.tablenav-pages a {
 	border-bottom-style: solid;
 	border-bottom-width: 2px;
 	font-weight: bold;
 	margin-right: 1px;
 	padding: 0 2px;
 }
+.tablenav-pages .current-page {
+	text-align: center;
+}
+.tablenav-pages .next-page {
+	margin-left: 2px;
+}
 
 p.pagenav {
 	margin: 0;
@@ -1346,12 +1363,12 @@ textarea.large-text {
 	width: 99%;
 }
 
-.form-table input.regular-text,
+input.regular-text,
 #adduser .form-field input {
 	width: 25em;
 }
 
-.form-table input.small-text {
+input.small-text {
 	width: 50px;
 }
 
@@ -3240,6 +3257,13 @@ table.fixed {
 .fixed .column-comments {
 	width: 4em;
 	padding-top: 8px;
+	text-align: left;
+}
+.fixed .column-comments .vers {
+	padding-left: 3px;
+}
+.fixed .column-comments a {
+	float: left;
 }
 
 .fixed .column-slug {
@@ -3274,6 +3298,25 @@ table .column-rating {
 	text-align: center;
 }
 
+.sorting-indicator {
+	display: none;
+	float: left;
+	width: 21px;
+	height: 4px;
+	margin-top: 5px;
+}
+th.sortable a, th.sorted-asc a, th.sorted-desc a {
+	float: left;
+}
+th.sorted-asc .sorting-indicator, th.sorted-desc:hover .sorting-indicator, th.sortable:hover .sorting-indicator {
+	display: block;
+	background: url(../images/sort_asc.gif) no-repeat scroll 0 0;
+}
+th.sorted-desc .sorting-indicator, th.sorted-asc:hover .sorting-indicator {
+	display: block;
+	background: url(../images/sort_desc.gif) no-repeat scroll 0 0;
+}
+
 .icon32 {
 	float: left;
 	height: 36px;
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 7f11bef482..9a53d236a6 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -12,65 +12,60 @@ require_once('./admin.php');
 if ( !current_user_can('edit_posts') )
 	wp_die(__('Cheatin&#8217; uh?'));
 
-wp_enqueue_script('admin-comments');
-enqueue_comment_hotkeys_js();
+if ( isset( $_REQUEST['doaction'] ) ||  isset( $_REQUEST['doaction2'] ) || isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+	check_admin_referer( 'bulk-comments' );
 
-$post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
-
-if ( isset($_REQUEST['doaction']) ||  isset($_REQUEST['doaction2']) || isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']) ) {
-	check_admin_referer('bulk-comments');
-
-	if ( (isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2'])) && !empty($_REQUEST['pagegen_timestamp']) ) {
-		$comment_status = $wpdb->escape($_REQUEST['comment_status']);
-		$delete_time = $wpdb->escape($_REQUEST['pagegen_timestamp']);
+	if ( ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) && !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 ( ($_REQUEST['action'] != -1 || $_REQUEST['action2'] != -1) && isset($_REQUEST['delete_comments']) ) {
+	} elseif ( ( $_REQUEST['action'] != -1 || $_REQUEST['action2'] != -1 ) && isset( $_REQUEST['delete_comments'] ) ) {
 		$comment_ids = $_REQUEST['delete_comments'];
-		$doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
-	} elseif ( $_REQUEST['doaction'] == 'undo' && isset($_REQUEST['ids']) ) {
-		$comment_ids = array_map( 'absint', explode(',', $_REQUEST['ids']) );
+		$doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
+	} elseif ( $_REQUEST['doaction'] == 'undo' && isset( $_REQUEST['ids'] ) ) {
+		$comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
 		$doaction = $_REQUEST['action'];
 	} else {
 		wp_redirect( wp_get_referer() );
 	}
 
 	$approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
-	$redirect_to = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids'), wp_get_referer() );
+	$redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
 
-	foreach ($comment_ids as $comment_id) { // Check the permissions on each
-		$_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) );
+	foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
+		$_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id ) );
 
-		if ( !current_user_can('edit_post', $_post_id) )
+		if ( !current_user_can( 'edit_post', $_post_id ) )
 			continue;
 
-		switch( $doaction ) {
+		switch ( $doaction ) {
 			case 'approve' :
-				wp_set_comment_status($comment_id, 'approve');
+				wp_set_comment_status( $comment_id, 'approve' );
 				$approved++;
 				break;
 			case 'unapprove' :
-				wp_set_comment_status($comment_id, 'hold');
+				wp_set_comment_status( $comment_id, 'hold' );
 				$unapproved++;
 				break;
 			case 'spam' :
-				wp_spam_comment($comment_id);
+				wp_spam_comment( $comment_id );
 				$spammed++;
 				break;
 			case 'unspam' :
-				wp_unspam_comment($comment_id);
+				wp_unspam_comment( $comment_id );
 				$unspammed++;
 				break;
 			case 'trash' :
-				wp_trash_comment($comment_id);
+				wp_trash_comment( $comment_id );
 				$trashed++;
 				break;
 			case 'untrash' :
-				wp_untrash_comment($comment_id);
+				wp_untrash_comment( $comment_id );
 				$untrashed++;
 				break;
 			case 'delete' :
-				wp_delete_comment($comment_id);
+				wp_delete_comment( $comment_id );
 				$deleted++;
 				break;
 		}
@@ -91,15 +86,22 @@ if ( isset($_REQUEST['doaction']) ||  isset($_REQUEST['doaction2']) || isset($_R
 	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 );
+		$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $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( $_REQUEST['_wp_http_referer'] ) ) {
+	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) );
 	 exit;
 }
 
+require_once( './includes/default-list-tables.php' );
+
+$table = new WP_Comments_Table;
+
+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));
 else
@@ -118,28 +120,18 @@ add_contextual_help( $current_screen, '<p>' . __('You can manage comments made o
 	'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 require_once('./admin-header.php');
-
-$mode = ( empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
-
-$comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
-if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam', 'trash')) )
-	$comment_status = 'all';
-
-$comment_type = !empty($_GET['comment_type']) ? esc_attr($_GET['comment_type']) : '';
-
-$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
-$search = esc_attr( $search_dirty ); ?>
+?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title );
-if ( isset($_GET['s']) && $_GET['s'] )
-	printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( stripslashes( $_GET['s'] ) ), 50 ) ) . '</span>' ); ?>
+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>
 
 <?php
-if ( isset( $_GET['error'] ) ) {
-	$error = (int) $_GET['error'];
+if ( isset( $_REQUEST['error'] ) ) {
+	$error = (int) $_REQUEST['error'];
 	$error_msg = '';
 	switch ( $error ) {
 		case 1 :
@@ -153,21 +145,21 @@ if ( isset( $_GET['error'] ) ) {
 		echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
 }
 
-if ( isset($_GET['approved']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) || isset($_GET['spammed']) || isset($_GET['unspammed']) || isset($_GET['same']) ) {
-	$approved  = isset( $_GET['approved']  ) ? (int) $_GET['approved']  : 0;
-	$deleted   = isset( $_GET['deleted']   ) ? (int) $_GET['deleted']   : 0;
-	$trashed   = isset( $_GET['trashed']   ) ? (int) $_GET['trashed']   : 0;
-	$untrashed = isset( $_GET['untrashed'] ) ? (int) $_GET['untrashed'] : 0;
-	$spammed   = isset( $_GET['spammed']   ) ? (int) $_GET['spammed']   : 0;
-	$unspammed = isset( $_GET['unspammed'] ) ? (int) $_GET['unspammed'] : 0;
-	$same      = isset( $_GET['same'] )      ? (int) $_GET['same']      : 0;
+if ( 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;
 
 	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 ( $spammed > 0 ) {
-			$ids = isset($_GET['ids']) ? $_GET['ids'] : 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 />';
 		}
 
@@ -175,7 +167,7 @@ if ( isset($_GET['approved']) || isset($_GET['deleted']) || isset($_GET['trashed
 			$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
 
 		if ( $trashed > 0 ) {
-			$ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
+			$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 />';
 		}
 
@@ -204,7 +196,7 @@ if ( isset($_GET['approved']) || isset($_GET['deleted']) || isset($_GET['trashed
 }
 ?>
 
-<form id="comments-form" action="" method="get">
+<form id="comments-form" action="" method="post">
 <ul class="subsubsub">
 <?php
 $status_links = array();
@@ -233,11 +225,11 @@ foreach ( $stati as $status => $label ) {
 		$num_comments->$status = 10;
 	$link = add_query_arg( 'comment_status', $status, $link );
 	if ( $post_id )
-		$link = add_query_arg( 'p', absint( $post_id ), $link );
+		$link = add_query_arg( 'post_ID', absint( $post_id ), $link );
 	/*
 	// I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
-	if ( !empty( $_GET['s'] ) )
-		$link = add_query_arg( 's', esc_attr( stripslashes( $_GET['s'] ) ), $link );
+	if ( !empty( $_REQUEST['s'] ) )
+		$link = add_query_arg( 's', esc_attr( stripslashes( $_REQUEST['s'] ) ), $link );
 	*/
 	$status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf(
 		_n( $label[0], $label[1], $num_comments->$status ),
@@ -258,196 +250,24 @@ unset($status_links);
 	<input type="submit" value="<?php esc_attr_e( 'Search Comments' ); ?>" class="button" />
 </p>
 
-<?php
-$comments_per_page = (int) get_user_option( 'edit_comments_per_page' );
-if ( empty( $comments_per_page ) || $comments_per_page < 1 )
-	$comments_per_page = 20;
-$comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
-
-if ( isset( $_GET['apage'] ) )
-	$page = abs( (int) $_GET['apage'] );
-else
-	$page = 1;
-
-$start = $offset = ( $page - 1 ) * $comments_per_page;
-
-list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 8, $post_id, $comment_type ); // Grab a few extra
-
-$_comment_post_ids = array();
-foreach ( $_comments as $_c ) {
-	$_comment_post_ids[] = $_c->comment_post_ID;
-}
-
-$_comment_pending_count = get_pending_comments_num($_comment_post_ids);
-
-$comments = array_slice($_comments, 0, $comments_per_page);
-$extra_comments = array_slice($_comments, $comments_per_page);
-
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'apage', '%#%' ),
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => ceil($total / $comments_per_page),
-	'current' => $page
-));
-
-?>
-
 <input type="hidden" name="mode" value="<?php echo esc_attr($mode); ?>" />
 <?php if ( $post_id ) : ?>
-<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
+<input type="hidden" name="post_ID" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
 <?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)); ?>" />
 
-<div class="tablenav">
-
-<?php if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-	number_format_i18n( $start + 1 ),
-	number_format_i18n( min( $page * $comments_per_page, $total ) ),
-	'<span class="total-type-count">' . number_format_i18n( $total ) . '</span>',
-	$page_links
-); echo $page_links_text; ?></div>
 <input type="hidden" name="_total" value="<?php echo esc_attr($total); ?>" />
 <input type="hidden" name="_per_page" value="<?php echo esc_attr($comments_per_page); ?>" />
 <input type="hidden" name="_page" value="<?php echo esc_attr($page); ?>" />
-<?php endif; ?>
 
-<?php if ( $comments ) : ?>
-<div class="alignleft actions">
-<select name="action">
-<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option>
-<?php if ( 'all' == $comment_status || 'approved' == $comment_status ): ?>
-<option value="unapprove"><?php _e('Unapprove'); ?></option>
-<?php endif; ?>
-<?php if ( 'all' == $comment_status || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
-<option value="approve"><?php _e('Approve'); ?></option>
-<?php endif; ?>
-<?php if ( 'all' == $comment_status || 'approved' == $comment_status || 'moderated' == $comment_status ): ?>
-<option value="spam"><?php _ex('Mark as Spam', 'comment'); ?></option>
-<?php endif; ?>
-<?php if ( 'trash' == $comment_status ): ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php elseif ( 'spam' == $comment_status ): ?>
-<option value="unspam"><?php _ex('Not Spam', 'comment'); ?></option>
-<?php endif; ?>
-<?php if ( 'trash' == $comment_status || 'spam' == $comment_status || !EMPTY_TRASH_DAYS ): ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php else: ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php endif; ?>
-</select>
-<input type="submit" name="doaction" id="doaction" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary apply" />
-<?php wp_nonce_field('bulk-comments'); ?>
-
-<?php endif; ?>
-
-<select name="comment_type">
-	<option value="all"><?php _e('Show all comment types'); ?></option>
-<?php
-	$comment_types = apply_filters( 'admin_comment_types_dropdown', array(
-		'comment' => __('Comments'),
-		'pings' => __('Pings'),
-	) );
-
-	foreach ( $comment_types as $type => $label ) {
-		echo "	<option value='" . esc_attr($type) . "'";
-		selected( $comment_type, $type );
-		echo ">$label</option>\n";
-	}
-?>
-</select>
-<input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
-
-<?php if ( isset($_GET['apage']) ) { ?>
-	<input type="hidden" name="apage" value="<?php echo esc_attr( absint( $_GET['apage'] ) ); ?>" />
-<?php }
-
-if ( ( 'spam' == $comment_status || 'trash' == $comment_status) && current_user_can ('moderate_comments') ) {
-	wp_nonce_field('bulk-destroy', '_destroy_nonce');
-    if ( 'spam' == $comment_status && current_user_can('moderate_comments') ) { ?>
-		<input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Spam'); ?>" class="button-secondary apply" />
-<?php } elseif ( 'trash' == $comment_status && current_user_can('moderate_comments') ) { ?>
-		<input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php }
-} ?>
-<?php do_action('manage_comments_nav', $comment_status); ?>
-</div>
-
-<br class="clear" />
-
-</div>
-
-<div class="clear"></div>
-<?php if ( $comments ) { ?>
-
-<table class="widefat comments fixed" cellspacing="0">
-<thead>
-	<tr>
-<?php print_column_headers('edit-comments'); ?>
-	</tr>
-</thead>
-
-<tfoot>
-	<tr>
-<?php print_column_headers('edit-comments', false); ?>
-	</tr>
-</tfoot>
-
-<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>
-
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option>
-<?php if ( 'all' == $comment_status || 'approved' == $comment_status ): ?>
-<option value="unapprove"><?php _e('Unapprove'); ?></option>
-<?php endif; ?>
-<?php if ( 'all' == $comment_status || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
-<option value="approve"><?php _e('Approve'); ?></option>
-<?php endif; ?>
-<?php if ( 'all' == $comment_status || 'approved' == $comment_status || 'moderated' == $comment_status ): ?>
-<option value="spam"><?php _ex('Mark as Spam', 'comment'); ?></option>
-<?php endif; ?>
-<?php if ( 'trash' == $comment_status ): ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php endif; ?>
-<?php if ( 'trash' == $comment_status || 'spam' == $comment_status || !EMPTY_TRASH_DAYS ): ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php elseif ( 'spam' == $comment_status ): ?>
-<option value="unspam"><?php _ex('Not Spam', 'comment'); ?></option>
-<?php else: ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php endif; ?>
-</select>
-<input type="submit" name="doaction2" id="doaction2" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary apply" />
-
-<?php if ( 'spam' == $comment_status && current_user_can('moderate_comments') ) { ?>
-<input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Spam'); ?>" class="button-secondary apply" />
-<?php } elseif ( 'trash' == $comment_status && current_user_can('moderate_comments') ) { ?>
-<input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
+<?php if ( isset($_REQUEST['paged']) ) { ?>
+	<input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />
 <?php } ?>
-<?php do_action('manage_comments_nav', $comment_status); ?>
-</div>
+
+<?php if ( $table->has_items() ) { ?>
+
+<?php $table->display_table(); ?>
 
 <br class="clear" />
 </div>
@@ -460,7 +280,7 @@ if ( $page_links )
 	<input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
 	<input type="hidden" name="page" value="<?php echo esc_attr($page); ?>" />
 	<input type="hidden" name="per_page" value="<?php echo esc_attr($comments_per_page); ?>" />
-	<input type="hidden" name="p" value="<?php echo esc_attr( $post_id ); ?>" />
+	<input type="hidden" name="post_ID" value="<?php echo esc_attr( $post_id ); ?>" />
 	<input type="hidden" name="comment_type" value="<?php echo esc_attr( $comment_type ); ?>" />
 	<?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
 </form>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 057aa489d2..160368cc4d 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -9,24 +9,12 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-wp_reset_vars( array('action', 'tag', 'taxonomy', 'post_type') );
+require_once( './includes/default-list-tables.php' );
 
-if ( empty($taxonomy) )
-	$taxonomy = 'post_tag';
-
-if ( !taxonomy_exists($taxonomy) )
-	wp_die(__('Invalid taxonomy'));
-
-$tax = get_taxonomy($taxonomy);
-
-if ( ! current_user_can($tax->cap->manage_terms) )
-	wp_die(__('Cheatin&#8217; uh?'));
+$table = new WP_Terms_Table;
 
 $title = $tax->labels->name;
 
-if ( empty($post_type) || !in_array( $post_type, get_post_types( array('public' => true) ) ) )
-	$post_type = 'post';
-
 if ( 'post' != $post_type ) {
 	$parent_file = "edit.php?post_type=$post_type";
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
@@ -35,33 +23,33 @@ if ( 'post' != $post_type ) {
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
+if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) )
 	$action = 'bulk-delete';
 
-switch($action) {
+switch ( $action ) {
 
 case 'add-tag':
 
-	check_admin_referer('add-tag');
+	check_admin_referer( 'add-tag' );
 
-	if ( !current_user_can($tax->cap->edit_terms) )
-		wp_die(__('Cheatin&#8217; uh?'));
+	if ( !current_user_can( $tax->cap->edit_terms ) )
+		wp_die( __( 'Cheatin&#8217; uh?' ) );
 
-	$ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
+	$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') )
+		if ( false !== strpos( $referer, 'edit-tags.php' ) )
 			$location = $referer;
 	}
 
 	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg('message', 1, $location);
+		$location = add_query_arg( 'message', 1, $location );
 	else
-		$location = add_query_arg('message', 4, $location);
-	wp_redirect($location);
+		$location = add_query_arg( 'message', 4, $location );
+	wp_redirect( $location );
 	exit;
 break;
 
@@ -70,50 +58,50 @@ case 'delete':
 	if ( 'post' != $post_type )
 		$location .= '&post_type=' . $post_type;
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos($referer, 'edit-tags.php') )
+		if ( false !== strpos( $referer, 'edit-tags.php' ) )
 			$location = $referer;
 	}
 
-	if ( !isset( $_GET['tag_ID'] ) ) {
-		wp_redirect($location);
+	if ( !isset( $_REQUEST['tag_ID'] ) ) {
+		wp_redirect( $location );
 		exit;
 	}
 
-	$tag_ID = (int) $_GET['tag_ID'];
-	check_admin_referer('delete-tag_' .  $tag_ID);
+	$tag_ID = (int) $_REQUEST['tag_ID'];
+	check_admin_referer( 'delete-tag_' .  $tag_ID );
 
-	if ( !current_user_can($tax->cap->delete_terms) )
-		wp_die(__('Cheatin&#8217; uh?'));
+	if ( !current_user_can( $tax->cap->delete_terms ) )
+		wp_die( __( 'Cheatin&#8217; uh?' ) );
 
-	wp_delete_term( $tag_ID, $taxonomy);
+	wp_delete_term( $tag_ID, $taxonomy );
 
-	$location = add_query_arg('message', 2, $location);
-	wp_redirect($location);
+	$location = add_query_arg( 'message', 2, $location );
+	wp_redirect( $location );
 	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( $tax->cap->delete_terms ) )
+		wp_die( __( 'Cheatin&#8217; uh?' ) );
 
-	$tags = (array) $_GET['delete_tags'];
-	foreach( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy);
+	$tags = (array) $_REQUEST['delete_tags'];
+	foreach ( $tags as $tag_ID ) {
+		wp_delete_term( $tag_ID, $taxonomy );
 	}
 
 	$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') )
+		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;
@@ -121,47 +109,44 @@ break;
 case 'edit':
 	$title = $tax->labels->edit_item;
 
-	require_once ('admin-header.php');
-	$tag_ID = (int) $_GET['tag_ID'];
+	require_once ( 'admin-header.php' );
+	$tag_ID = (int) $_REQUEST['tag_ID'];
 
-	if ( !current_user_can($tax->cap->edit_terms) )
-		wp_die( __('You are not allowed to edit this item.') );
-
-	$tag = get_term($tag_ID, $taxonomy, OBJECT, 'edit');
-	include('./edit-tag-form.php');
+	$tag = get_term( $tag_ID, $taxonomy, 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( $tax->cap->edit_terms ) )
+		wp_die( __( 'Cheatin&#8217; uh?' ) );
 
-	$ret = wp_update_term($tag_ID, $taxonomy, $_POST);
+	$ret = wp_update_term( $tag_ID, $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') )
+		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($_GET['_wp_http_referer']) ) {
+if ( ! empty($_REQUEST['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
@@ -209,6 +194,9 @@ if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
 
 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.');
@@ -221,11 +209,11 @@ $messages[6] = __('Items deleted.');
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title );
-if ( !empty($_GET['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
+if ( !empty($_REQUEST['s']) )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
 </h2>
 
-<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
+<?php if ( isset($_REQUEST['message']) && ( $msg = (int) $_REQUEST['message'] ) ) : ?>
 <div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
@@ -246,91 +234,11 @@ endif; ?>
 
 <div id="col-right">
 <div class="col-wrap">
-<form id="posts-filter" action="" method="get">
+<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); ?>" />
-<div class="tablenav">
-<?php
-$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
-if ( empty($pagenum) )
-	$pagenum = 1;
 
-$tags_per_page = (int) get_user_option( 'edit_' .  $taxonomy . '_per_page' );
-
-if ( empty($tags_per_page) || $tags_per_page < 1 )
-	$tags_per_page = 20;
-
-if ( 'post_tag' == $taxonomy ) {
-	$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
-	$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
-} elseif ( 'category' == $taxonomy ) {
-	$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
-} else {
-	$tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page );
-}
-
-$searchterms = !empty($_GET['s']) ? trim(stripslashes($_GET['s'])) : '';
-
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'pagenum', '%#%' ),
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => ceil(wp_count_terms($taxonomy, array('search' => $searchterms)) / $tags_per_page),
-	'current' => $pagenum
-));
-
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-<?php wp_nonce_field('bulk-tags'); ?>
-</div>
-
-<br class="clear" />
-</div>
-
-<div class="clear"></div>
-<table class="widefat tag fixed" cellspacing="0">
-	<thead>
-	<tr>
-<?php print_column_headers($current_screen); ?>
-	</tr>
-	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers($current_screen, false); ?>
-	</tr>
-	</tfoot>
-
-	<tbody id="the-list" class="list:tag">
-<?php tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy ); ?>
-	</tbody>
-</table>
-
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
-
-<br class="clear" />
-</div>
+<?php $table->display_table(); ?>
 
 <br class="clear" />
 </form>
@@ -358,7 +266,7 @@ do_action('after-' . $taxonomy . '-table', $taxonomy);
 
 <?php
 
-if ( !is_taxonomy_hierarchical($taxonomy) ) {
+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
@@ -440,7 +348,7 @@ do_action($taxonomy . '_add_form', $taxonomy);
 </div><!-- /col-container -->
 </div><!-- /wrap -->
 
-<?php inline_edit_term_row('edit-tags', $taxonomy); ?>
+<?php $table->inline_edit(); ?>
 
 <?php
 break;
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 5e2407efd3..bbf564b29b 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -7,65 +7,35 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once('./admin.php');
+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;
+require_once( './includes/default-list-tables.php' );
 
-$post_type_object = get_post_type_object($post_type);
-
-if ( !current_user_can($post_type_object->cap->edit_posts) )
-	wp_die(__('Cheatin&#8217; uh?'));
+$table = new WP_Posts_Table;
 
 // Back-compat for viewing comments of an entry
-if ( $_redirect = intval( max( @$_GET['p'], @$_GET['attachment_id'], @$_GET['page_id'] ) ) ) {
+if ( $_redirect = intval( max( @$_REQUEST['p'], @$_REQUEST['attachment_id'], @$_REQUEST['page_id'] ) ) ) {
 	wp_redirect( admin_url('edit-comments.php?p=' . $_redirect ) );
 	exit;
 } else {
 	unset( $_redirect );
 }
 
-if ( 'post' != $post_type ) {
-	$parent_file = "edit.php?post_type=$post_type";
-	$submenu_file = "edit.php?post_type=$post_type";
-	$post_new_file = "post-new.php?post_type=$post_type";
-} else {
-	$parent_file = 'edit.php';
-	$submenu_file = 'edit.php';
-	$post_new_file = 'post-new.php';
-}
-
-$pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
-if ( empty($pagenum) )
-	$pagenum = 1;
-$edit_per_page = 'edit_' . $post_type . '_per_page';
-$per_page = (int) get_user_option( $edit_per_page );
-if ( empty( $per_page ) || $per_page < 1 )
-	$per_page = 20;
-
-$per_page = apply_filters( $edit_per_page, $per_page );
-$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
-
 // Handle bulk actions
-if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
+if ( isset($_REQUEST['doaction']) || isset($_REQUEST['doaction2']) || isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']) || isset($_REQUEST['bulk_edit']) ) {
 	check_admin_referer('bulk-posts');
 	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
 
 	if ( strpos($sendback, 'post.php') !== false )
 		$sendback = admin_url($post_new_file);
 
-	if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
-		$post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_GET['post_status']);
+	if ( isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']) ) {
+		$post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['post_status']);
 		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) );
 		$doaction = 'delete';
-	} elseif ( ( $_GET['action'] != -1 || $_GET['action2'] != -1 ) && ( isset($_GET['post']) || isset($_GET['ids']) ) ) {
-		$post_ids = isset($_GET['post']) ? array_map( 'intval', (array) $_GET['post'] ) : explode(',', $_GET['ids']);
-		$doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
+	} elseif ( ( $_REQUEST['action'] != -1 || $_REQUEST['action2'] != -1 ) && ( isset($_REQUEST['post']) || isset($_REQUEST['ids']) ) ) {
+		$post_ids = isset($_REQUEST['post']) ? array_map( 'intval', (array) $_REQUEST['post'] ) : explode(',', $_REQUEST['ids']);
+		$doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
 	} else {
 		wp_redirect( admin_url("edit.php?post_type=$post_type") );
 	}
@@ -117,7 +87,7 @@ if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delet
 			$sendback = add_query_arg('deleted', $deleted, $sendback);
 			break;
 		case 'edit':
-			$done = bulk_edit_posts($_GET);
+			$done = bulk_edit_posts($_REQUEST);
 
 			if ( is_array($done) ) {
 				$done['updated'] = count( $done['updated'] );
@@ -128,32 +98,27 @@ if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delet
 			break;
 	}
 
-	if ( isset($_GET['action']) )
+	if ( isset($_REQUEST['action']) )
 		$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status',  'post', 'bulk_edit', 'post_view'), $sendback );
 
 	wp_redirect($sendback);
 	exit();
-} elseif ( ! empty($_GET['_wp_http_referer']) ) {
+} elseif ( ! empty($_REQUEST['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
 
-wp_enqueue_script('inline-edit-post');
-
-$user_posts = false;
-if ( !current_user_can($post_type_object->cap->edit_others_posts) ) {
-	$user_posts_count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(1) FROM $wpdb->posts WHERE post_type = '%s' AND post_status NOT IN ('trash', 'auto-draft') AND post_author = %d", $post_type, $current_user->ID) );
-	$user_posts = true;
-	if ( $user_posts_count && empty($_GET['post_status']) && empty($_GET['all_posts']) && empty($_GET['author']) )
-		$_GET['author'] = $current_user->ID;
+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';
 }
 
-$avail_post_stati = wp_edit_posts_query();
-
-if ( $post_type_object->hierarchical )
-	$num_pages = ceil($wp_query->post_count / $per_page);
-else
-	$num_pages = $wp_query->max_num_pages;
+wp_enqueue_script('inline-edit-post');
 
 $title = $post_type_object->labels->name;
 
@@ -190,55 +155,50 @@ if ( 'post' == $post_type ) {
 }
 
 require_once('./admin-header.php');
-
-if ( empty($_GET['mode']) )
-	$mode = 'list';
-else
-	$mode = esc_attr($_GET['mode']); ?>
-
+?>
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="button add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
-if ( isset($_GET['s']) && $_GET['s'] )
+if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
 </h2>
 
 <?php
-if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
-<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View Post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit Post'); ?></a></p></div>
+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($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) ) { ?>
+<?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($_GET['updated']) && (int) $_GET['updated'] ) {
-	printf( _n( '%s post updated.', '%s posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
-	unset($_GET['updated']);
+<?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($_GET['skipped']) && (int) $_GET['skipped'] )
-	unset($_GET['skipped']);
+if ( isset($_REQUEST['skipped']) && (int) $_REQUEST['skipped'] )
+	unset($_REQUEST['skipped']);
 
-if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
-	printf( _n( '%s item not updated, somebody is editing it.', '%s items not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
-	unset($_GET['locked']);
+if ( isset($_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($_GET['deleted']) && (int) $_GET['deleted'] ) {
-	printf( _n( 'Item permanently deleted.', '%s items permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
-	unset($_GET['deleted']);
+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($_GET['trashed']) && (int) $_GET['trashed'] ) {
-	printf( _n( 'Item moved to the Trash.', '%s items moved to the Trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
-	$ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
+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($_GET['trashed']);
+	unset($_REQUEST['trashed']);
 }
 
-if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
-	printf( _n( 'Item restored from the Trash.', '%s items restored from the Trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
-	unset($_GET['undeleted']);
+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'] );
@@ -246,7 +206,7 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated'
 </p></div>
 <?php } ?>
 
-<form id="posts-filter" action="<?php echo admin_url('edit.php'); ?>" method="get">
+<form id="posts-filter" action="" method="post">
 
 <ul class="subsubsub">
 <?php
@@ -256,8 +216,22 @@ $num_posts = wp_count_posts( $post_type, 'readable' );
 $class = '';
 $allposts = '';
 
+$user_posts = false;
+if ( !current_user_can( $post_type_object->cap->edit_others_posts ) ) {
+	$user_posts = true;
+
+	$user_posts_count = $wpdb->get_var( $wpdb->prepare( "
+		SELECT COUNT( 1 ) FROM $wpdb->posts
+		WHERE post_type = '%s' AND post_status NOT IN ( 'trash', 'auto-draft' )
+		AND post_author = %d
+	", $post_type, get_current_user_id() ) );
+
+	if ( $user_posts_count && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) )
+		$_REQUEST['author'] = get_current_user_id();
+}
+
 if ( $user_posts ) {
-	if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user->ID ) )
+	if ( isset( $_REQUEST['author'] ) && ( $_REQUEST['author'] == $current_user->ID ) )
 		$class = ' class="current"';
 	$status_links[] = "<li><a href='edit.php?post_type=$post_type&author=$current_user->ID'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $user_posts_count, 'posts' ), number_format_i18n( $user_posts_count ) ) . '</a>';
 	$allposts = '&all_posts=1';
@@ -269,7 +243,7 @@ $total_posts = array_sum( (array) $num_posts );
 foreach ( get_post_stati( array('show_in_admin_all_list' => false) ) as $state )
 	$total_posts -= $num_posts->$state;
 
-$class = empty($class) && empty($_GET['post_status']) ? ' class="current"' : '';
+$class = empty($class) && empty($_REQUEST['post_status']) ? ' class="current"' : '';
 $status_links[] = "<li><a href='edit.php?post_type=$post_type{$allposts}'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
 
 foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
@@ -283,7 +257,7 @@ foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects')
 	if ( empty( $num_posts->$status_name ) )
 		continue;
 
-	if ( isset($_GET['post_status']) && $status_name == $_GET['post_status'] )
+	if ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] )
 		$class = ' class="current"';
 
 	$status_links[] = "<li><a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( _n( $status->label_count[0], $status->label_count[1], $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
@@ -300,163 +274,14 @@ endif;
 	<input type="submit" value="<?php echo esc_attr( $post_type_object->labels->search_items  ); ?>" class="button" />
 </p>
 
-<input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_GET['post_status']) ? esc_attr($_GET['post_status']) : 'all'; ?>" />
+<input type="hidden" name="post_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; ?>" />
-<input type="hidden" name="mode" value="<?php echo esc_attr($mode); ?>" />
 
-<?php if ( have_posts() ) { ?>
-
-<div class="tablenav">
-<?php
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'paged', '%#%' ),
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => $num_pages,
-	'current' => $pagenum
-));
-
-$is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
-
-?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( $is_trash ) { ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php } else { ?>
-<option value="edit"><?php _e('Edit'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php } else { ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-<?php wp_nonce_field('bulk-posts'); ?>
-
-<?php // view filters
-if ( !is_singular() ) {
-$arc_query = $wpdb->prepare("SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = %s ORDER BY post_date DESC", $post_type);
-
-$arc_result = $wpdb->get_results( $arc_query );
-
-$month_count = count($arc_result);
-
-if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
-$m = isset($_GET['m']) ? (int)$_GET['m'] : 0;
-?>
-<select name='m'>
-<option<?php selected( $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 == $m )
-		$default = ' selected="selected"';
-	else
-		$default = '';
-
-	echo "<option$default value='" . esc_attr("$arc_row->yyear$arc_row->mmonth") . "'>";
-	echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear";
-	echo "</option>\n";
-}
-?>
-</select>
-<?php } ?>
-
-<?php
-if ( is_object_in_taxonomy($post_type, 'category') ) {
-	$dropdown_options = array('show_option_all' => __('View all categories'), 'hide_empty' => 0, 'hierarchical' => 1,
-		'show_count' => 0, 'orderby' => 'name', 'selected' => $cat);
-	wp_dropdown_categories($dropdown_options);
-}
-do_action('restrict_manage_posts');
-?>
-<input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
-<?php }
-
-if ( $is_trash && current_user_can($post_type_object->cap->edit_others_posts) ) { ?>
-<input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php } ?>
-</div>
-
-<?php if ( $page_links ) { ?>
-<div class="tablenav-pages"><?php
-	$count_posts = $post_type_object->hierarchical ? $wp_query->post_count : $wp_query->found_posts;
-	$page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-						number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
-						number_format_i18n( min( $pagenum * $per_page, $count_posts ) ),
-						number_format_i18n( $count_posts ),
-						$page_links
-						);
-	echo $page_links_text;
-	?></div>
-<?php
-}
-
-if ( !$post_type_object->hierarchical ) {
-?>
-
-<div class="view-switch">
-	<a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
-	<a href="<?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
-</div>
-
-<?php } ?>
-<div class="clear"></div>
-</div>
-
-<div class="clear"></div>
-
-<?php include( './edit-post-rows.php' ); ?>
-
-<div class="tablenav">
-
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( $is_trash ) { ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php } else { ?>
-<option value="edit"><?php _e('Edit'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php } else { ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php if ( $is_trash && current_user_can($post_type_object->cap->edit_others_posts) ) { ?>
-<input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php } ?>
-<br class="clear" />
-</div>
-<br class="clear" />
-</div>
-
-<?php } else { // have_posts() ?>
-<div class="clear"></div>
-<p><?php
-if ( isset($_GET['post_status']) && 'trash' == $_GET['post_status'] )
-	echo $post_type_object->labels->not_found_in_trash;
-else
-	echo $post_type_object->labels->not_found;
-?></p>
-<?php } ?>
+<?php $table->display(); ?>
 
 </form>
 
-<?php inline_edit_row( $current_screen ); ?>
+<?php $table->inline_edit(); ?>
 
 <div id="ajax-response"></div>
 <br class="clear" />
diff --git a/wp-admin/images/sort_asc.gif b/wp-admin/images/sort_asc.gif
new file mode 100644
index 0000000000..3b30b3c58e
Binary files /dev/null and b/wp-admin/images/sort_asc.gif differ
diff --git a/wp-admin/images/sort_desc.gif b/wp-admin/images/sort_desc.gif
new file mode 100644
index 0000000000..74157867f2
Binary files /dev/null and b/wp-admin/images/sort_desc.gif differ
diff --git a/wp-admin/includes/default-list-tables.php b/wp-admin/includes/default-list-tables.php
new file mode 100644
index 0000000000..ee81e555a5
--- /dev/null
+++ b/wp-admin/includes/default-list-tables.php
@@ -0,0 +1,4042 @@
+<?php
+
+require_once('list-table.php');
+
+/**
+ * List table classes
+ *
+ * Each list-type admin screen has a class that handles the rendering of the list table.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+class WP_Posts_Table extends WP_List_Table {
+	
+	/**
+	 * Wether the items should be displayed hierarchically or linearly
+	 *
+	 * @since 3.1.0
+	 * @var bool
+	 * @access private
+	 */
+	var $_hierarchical_display;
+
+	function WP_Posts_Table( $context = 'normal' ) {
+		global $post_type_object, $post_type, $avail_post_stati, $wp_query, $per_page, $mode, $current_screen;
+
+		if ( !isset( $_REQUEST['post_type'] ) )
+			$post_type = 'post';
+		elseif ( in_array( $_REQUEST['post_type'], get_post_types( array( 'show_ui' => true ) ) ) )
+			$post_type = $_REQUEST['post_type'];
+		else
+			wp_die( __( 'Invalid post type' ) );
+		$_REQUEST['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?' ) );
+
+		parent::WP_List_Table( array(
+			'screen' => $current_screen,
+			'plural' => 'posts',
+		) );
+
+		if ( 'normal' != $context )
+			return;
+
+		$avail_post_stati = wp_edit_posts_query();
+
+		$this->_hierarchical_display = ( $post_type_object->hierarchical && 0 === strpos( get_query_var( 'orderby' ), 'menu_order' ) );
+
+		$total_items = $this->_hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
+
+		$edit_per_page = 'edit_' . $post_type . '_per_page'; 
+ 		$per_page = (int) get_user_option( $edit_per_page );
+		if ( empty( $per_page ) || $per_page < 1 )
+			$per_page = 20;
+		$per_page = apply_filters( $edit_per_page, $per_page ); 
+ 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type ); 
+
+		if ( $this->_hierarchical_display )
+			$total_pages = ceil( $total_items / $per_page );
+		else
+			$total_pages = $wp_query->max_num_pages;
+
+		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+
+		$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] == 'trash';
+
+		$this->set_pagination_args( array(
+			'total_items' => $total_items,
+			'total_pages' => $total_pages,
+			'per_page' => $per_page
+		) );
+	}
+
+	function has_items() {
+		return have_posts();
+	}
+
+	function no_items() {
+		global $post_type_object;
+
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
+			echo $post_type_object->labels->not_found_in_trash;
+		else
+			echo $post_type_object->labels->not_found;
+	}
+
+	function get_bulk_actions() {
+		$actions = array();
+
+		if ( $this->is_trash )
+			$actions['untrash'] = __( 'Restore' );
+		else
+			$actions['edit'] = __( 'Edit' );
+
+		if ( $this->is_trash || !EMPTY_TRASH_DAYS )
+			$actions['delete'] = __( 'Delete Permanently' );
+		else
+			$actions['trash'] = __( 'Move to Trash' );
+
+		return $actions;
+	}
+
+	function extra_tablenav( $which ) {
+		global $post_type, $post_type_object, $cat;
+
+		if ( 'top' == $which && !is_singular() ) {
+?>
+		<div class="alignleft actions">
+<?php
+			$this->months_dropdown( $post_type );
+
+			if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
+				$dropdown_options = array(
+					'show_option_all' => __( 'View all categories' ),
+					'hide_empty' => 0,
+					'hierarchical' => 1,
+					'show_count' => 0,
+					'orderby' => 'name',
+					'selected' => $cat
+				);
+				wp_dropdown_categories( $dropdown_options );
+			}
+			do_action( 'restrict_manage_posts' );
+?>
+			<input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Filter' ); ?>" class="button-secondary" />
+		</div>
+<?php
+		}
+
+		if ( $this->is_trash && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
+?>
+		<input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e( 'Empty Trash' ); ?>" class="button-secondary apply" />
+<?php
+		}
+	}
+
+	function pagination( $which ) {
+		global $post_type_object, $mode;
+
+		parent::pagination( $which );
+
+		if ( 'top' == $which && !$post_type_object->hierarchical )
+			$this->view_switcher( $mode );
+	}
+
+	function get_table_classes() {
+		global $post_type_object;
+
+		return array( 'widefat', 'fixed', $post_type_object->hierarchical ? 'pages' : 'posts' );
+	}
+
+	function get_columns() {
+		$screen = $this->_screen;
+
+		if ( empty( $screen ) )
+			$post_type = 'post';
+		else
+			$post_type = $screen->post_type;
+
+		$posts_columns = array();
+		$posts_columns['cb'] = '<input type="checkbox" />';
+		/* translators: manage posts column name */
+		$posts_columns['title'] = _x( 'Title', 'column name' );
+		$posts_columns['author'] = __( 'Author' );
+		if ( empty( $post_type ) || is_object_in_taxonomy( $post_type, 'category' ) )
+			$posts_columns['categories'] = __( 'Categories' );
+		if ( empty( $post_type ) || is_object_in_taxonomy( $post_type, 'post_tag' ) )
+			$posts_columns['tags'] = __( 'Tags' );
+		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
+		if ( !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) && ( empty( $post_type ) || post_type_supports( $post_type, 'comments' ) ) )
+			$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
+		$posts_columns['date'] = __( 'Date' );
+
+		if ( 'page' == $post_type )
+			$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
+		else
+			$posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
+		$posts_columns = apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
+
+		return $posts_columns;
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'title'    => 'title',
+			'author'   => 'author',
+			'parent'   => 'parent',
+			'comments' => 'comment_count',
+			'date'     => 'date',
+		);
+	}
+
+	function display_rows( $posts = array() ) {
+		global $wp_query, $post_type_object, $per_page;
+
+		if ( empty( $posts ) )
+			$posts = $wp_query->posts;
+
+		if ( $this->_hierarchical_display ) {
+			$this->_display_rows_hierarchical( $posts, $this->get_pagenum(), $per_page );
+		} else {
+			$this->_display_rows( $posts );
+		}
+	}
+
+	function _display_rows( $posts ) {
+		global $post, $mode;
+
+		add_filter( 'the_title','esc_html' );
+
+		// Create array of post IDs.
+		$post_ids = array();
+
+		foreach ( $posts as $a_post )
+			$post_ids[] = $a_post->ID;
+
+		$comment_pending_count = get_pending_comments_num( $post_ids );
+
+		foreach ( $posts as $post ) {
+			if ( empty( $comment_pending_count[$post->ID] ) )
+				$comment_pending_count[$post->ID] = 0;
+
+			$this->_single_row( $post, $comment_pending_count[$post->ID], $mode );
+		}
+	}
+
+	function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
+		global $wpdb;
+
+		$level = 0;
+
+		if ( ! $pages ) {
+			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
+
+			if ( ! $pages )
+				return false;
+		}
+
+		/*
+		 * arrange pages into two parts: top level pages and children_pages
+		 * children_pages is two dimensional array, eg.
+		 * children_pages[10][] contains all sub-pages whose parent is 10.
+		 * It only takes O( N ) to arrange this and it takes O( 1 ) for subsequent lookup operations
+		 * If searching, ignore hierarchy and treat everything as top level
+		 */
+		if ( empty( $_REQUEST['s'] ) ) {
+
+			$top_level_pages = array();
+			$children_pages = array();
+
+			foreach ( $pages as $page ) {
+
+				// catch and repair bad pages
+				if ( $page->post_parent == $page->ID ) {
+					$page->post_parent = 0;
+					$wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
+					clean_page_cache( $page->ID );
+				}
+
+				if ( 0 == $page->post_parent )
+					$top_level_pages[] = $page;
+				else
+					$children_pages[ $page->post_parent ][] = $page;
+			}
+
+			$pages = &$top_level_pages;
+		}
+
+		$count = 0;
+		$start = ( $pagenum - 1 ) * $per_page;
+		$end = $start + $per_page;
+
+		foreach ( $pages as $page ) {
+			if ( $count >= $end )
+				break;
+
+			if ( $count >= $start )
+				echo "\t" . $this->_single_row_hierarchical( $page, $level );
+
+			$count++;
+
+			if ( isset( $children_pages ) )
+				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+		}
+
+		// if it is the last pagenum and there are orphaned pages, display them with paging as well
+		if ( isset( $children_pages ) && $count < $end ){
+			foreach ( $children_pages as $orphans ){
+				foreach ( $orphans as $op ) {
+					if ( $count >= $end )
+						break;
+					if ( $count >= $start )
+						echo "\t" . $this->_single_row_hierarchical( $op, 0 );
+					$count++;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Given a top level page ID, display the nested hierarchy of sub-pages
+	 * together with paging support
+	 *
+	 * @since unknown
+	 *
+	 * @param unknown_type $children_pages
+	 * @param unknown_type $count
+	 * @param unknown_type $parent
+	 * @param unknown_type $level
+	 * @param unknown_type $pagenum
+	 * @param unknown_type $per_page
+	 */
+	function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
+
+		if ( ! isset( $children_pages[$parent] ) )
+			return;
+
+		$start = ( $pagenum - 1 ) * $per_page;
+		$end = $start + $per_page;
+
+		foreach ( $children_pages[$parent] as $page ) {
+
+			if ( $count >= $end )
+				break;
+
+			// If the page starts in a subtree, print the parents.
+			if ( $count == $start && $page->post_parent > 0 ) {
+				$my_parents = array();
+				$my_parent = $page->post_parent;
+				while ( $my_parent ) {
+					$my_parent = get_post( $my_parent );
+					$my_parents[] = $my_parent;
+					if ( !$my_parent->post_parent )
+						break;
+					$my_parent = $my_parent->post_parent;
+				}
+				$num_parents = count( $my_parents );
+				while ( $my_parent = array_pop( $my_parents ) ) {
+					echo "\t" . $this->_single_row_hierarchical( $my_parent, $level - $num_parents );
+					$num_parents--;
+				}
+			}
+
+			if ( $count >= $start )
+				echo "\t" . $this->_single_row_hierarchical( $page, $level );
+
+			$count++;
+
+			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+		}
+
+		unset( $children_pages[$parent] ); //required in order to keep track of orphans
+	}
+
+	/**
+	 * display one row if the page doesn't have any children
+	 * otherwise, display the row and its children in subsequent rows
+	 *
+	 * @since unknown
+	 *
+	 * @param unknown_type $page
+	 * @param unknown_type $level
+	 */
+	function _single_row_hierarchical( $page, $level = 0 ) {
+		global $post, $current_screen;
+		static $rowclass;
+
+		$post = $page;
+		setup_postdata( $page );
+
+		if ( 0 == $level && (int) $page->post_parent > 0 ) {
+			//sent level 0 by accident, by default, or because we don't know the actual level
+			$find_main_page = (int) $page->post_parent;
+			while ( $find_main_page > 0 ) {
+				$parent = get_page( $find_main_page );
+
+				if ( is_null( $parent ) )
+					break;
+
+				$level++;
+				$find_main_page = (int) $parent->post_parent;
+
+				if ( !isset( $parent_name ) )
+					$parent_name = $parent->post_title;
+			}
+		}
+
+		$page->post_title = esc_html( $page->post_title );
+		$pad = str_repeat( '&#8212; ', $level );
+		$id = (int) $page->ID;
+		$rowclass = 'alternate' == $rowclass ? '' : 'alternate';
+		$title = _draft_or_post_title();
+		$post_type = $page->post_type;
+		$post_type_object = get_post_type_object( $post_type );
+?>
+	<tr id="post-<?php echo $id; ?>" class="<?php echo $rowclass; ?> iedit">
+<?php
+
+	list( $columns, $hidden ) = $this->get_column_headers();
+
+	foreach ( $columns as $column_name => $column_display_name ) {
+		$class = "class=\"$column_name column-$column_name\"";
+
+		$style = '';
+		if ( in_array( $column_name, $hidden ) )
+			$style = ' style="display:none;"';
+
+		$attributes = "$class$style";
+
+		switch ( $column_name ) {
+
+		case 'cb':
+			?>
+			<th scope="row" class="check-column"><?php if ( current_user_can( $post_type_object->cap->edit_post, $page->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
+			<?php
+			break;
+		case 'date':
+			if ( '0000-00-00 00:00:00' == $page->post_date && 'date' == $column_name ) {
+				$t_time = $h_time = __( 'Unpublished' );
+				$time_diff = 0;
+			} else {
+				$t_time = get_the_time( __( 'Y/m/d g:i:s A' ) );
+				$m_time = $page->post_date;
+				$time = get_post_time( 'G', true );
+
+				$time_diff = time() - $time;
+
+				if ( $time_diff > 0 && $time_diff < 24*60*60 )
+					$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+				else
+					$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+			}
+			echo '<td ' . $attributes . '>';
+			echo '<abbr title="' . $t_time . '">' . apply_filters( 'post_date_column_time', $h_time, $page, $column_name, '' ) . '</abbr>';
+			echo '<br />';
+			if ( 'publish' == $page->post_status ) {
+				_e( 'Published' );
+			} elseif ( 'future' == $page->post_status ) {
+				if ( $time_diff > 0 )
+					echo '<strong class="attention">' . __( 'Missed schedule' ) . '</strong>';
+				else
+					_e( 'Scheduled' );
+			} else {
+				_e( 'Last Modified' );
+			}
+			echo '</td>';
+			break;
+		case 'title':
+			$attributes = 'class="post-title page-title column-title"' . $style;
+			$edit_link = get_edit_post_link( $page->ID );
+			?>
+			<td <?php echo $attributes ?>><strong><?php if ( current_user_can( $post_type_object->cap->edit_post, $page->ID ) && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states( $page ); echo isset( $parent_name ) ? ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name ) : ''; ?></strong>
+			<?php
+			$actions = array();
+			if ( current_user_can( $post_type_object->cap->edit_post, $page->ID ) && $post->post_status != 'trash' ) {
+				$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr( __( 'Edit this page' ) ) . '">' . __( 'Edit' ) . '</a>';
+				$actions['inline'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+			}
+			if ( current_user_can( $post_type_object->cap->delete_post, $page->ID ) ) {
+				if ( $post->post_status == 'trash' )
+					$actions['untrash'] = "<a title='" . esc_attr( __( 'Remove this page from the Trash' ) ) . "' href='" . wp_nonce_url( "post.php?post_type=$post_type&amp;action=untrash&amp;post=$page->ID", 'untrash-' . $post->post_type . '_' . $page->ID ) . "'>" . __( 'Restore' ) . "</a>";
+				elseif ( EMPTY_TRASH_DAYS )
+					$actions['trash'] = "<a class='submitdelete' title='" . esc_attr( __( 'Move this page to the Trash' ) ) . "' href='" . get_delete_post_link( $page->ID ) . "'>" . __( 'Trash' ) . "</a>";
+				if ( $post->post_status == 'trash' || !EMPTY_TRASH_DAYS )
+					$actions['delete'] = "<a class='submitdelete' title='" . esc_attr( __( 'Delete this page permanently' ) ) . "' href='" . wp_nonce_url( "post.php?post_type=$post_type&amp;action=delete&amp;post=$page->ID", 'delete-' . $post->post_type . '_' . $page->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			}
+			if ( in_array( $post->post_status, array( 'pending', 'draft' ) ) ) {
+				if ( current_user_can( $post_type_object->cap->edit_post, $page->ID ) )
+					$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $page->ID ) ) ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';
+			} elseif ( $post->post_status != 'trash' ) {
+				$actions['view'] = '<a href="' . get_permalink( $page->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+			}
+			$actions = apply_filters( 'page_row_actions', $actions, $page );
+			$action_count = count( $actions );
+
+			$i = 0;
+			echo '<div class="row-actions">';
+			foreach ( $actions as $action => $link ) {
+				++$i;
+				( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+				echo "<span class='$action'>$link$sep</span>";
+			}
+			echo '</div>';
+
+			get_inline_data( $post );
+			echo '</td>';
+			break;
+
+		case 'comments':
+			?>
+			<td <?php echo $attributes ?>><div class="post-com-count-wrapper">
+			<?php
+			$left = get_pending_comments_num( $page->ID );
+			$pending_phrase = sprintf( __( '%s pending' ), number_format( $left ) );
+			if ( $left )
+				echo '<strong>';
+			comments_number(
+				"<a href='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+				. /* translators: comment count link */ _x( '0', 'comment count' ) . '</span></a>',
+				"<a href='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+				. /* translators: comment count link */ _x( '1', 'comment count' ) . '</span></a>',
+				"<a href='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+				. /* translators: comment count link: % will be substituted by comment count */ _x( '%', 'comment count' ) . '</span></a>'
+			);
+			if ( $left )
+				echo '</strong>';
+			?>
+			</div></td>
+			<?php
+			break;
+
+		case 'author':
+			?>
+			<td <?php echo $attributes ?>><a href="edit.php?post_type=<?php echo $post_type; ?>&amp;author=<?php the_author_meta( 'ID' ); ?>"><?php the_author() ?></a></td>
+			<?php
+			break;
+
+		default:
+			?>
+			<td <?php echo $attributes ?>><?php do_action( 'manage_pages_custom_column', $column_name, $id ); ?></td>
+			<?php
+			break;
+		}
+	}
+?>
+
+	</tr>
+
+<?php
+	}
+
+	function _single_row( $a_post, $pending_comments, $mode ) {
+		global $post, $current_screen;
+		static $rowclass;
+
+		$global_post = $post;
+		$post = $a_post;
+		setup_postdata( $post );
+
+		$rowclass = 'alternate' == $rowclass ? '' : 'alternate';
+		$post_owner = ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
+		$edit_link = get_edit_post_link( $post->ID );
+		$title = _draft_or_post_title();
+		$post_type_object = get_post_type_object( $post->post_type );
+	?>
+		<tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status ); ?> iedit' valign="top">
+	<?php
+
+		list( $columns, $hidden ) = $this->get_column_headers();
+
+		foreach ( $columns as $column_name => $column_display_name ) {
+			$class = "class=\"$column_name column-$column_name\"";
+
+			$style = '';
+			if ( in_array( $column_name, $hidden ) )
+				$style = ' style="display:none;"';
+
+			$attributes = "$class$style";
+
+			switch ( $column_name ) {
+
+			case 'cb':
+			?>
+			<th scope="row" class="check-column"><?php if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
+			<?php
+			break;
+
+			case 'date':
+				if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
+					$t_time = $h_time = __( 'Unpublished' );
+					$time_diff = 0;
+				} else {
+					$t_time = get_the_time( __( 'Y/m/d g:i:s A' ) );
+					$m_time = $post->post_date;
+					$time = get_post_time( 'G', true, $post );
+
+					$time_diff = time() - $time;
+
+					if ( $time_diff > 0 && $time_diff < 24*60*60 )
+						$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+					else
+						$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+				}
+
+				echo '<td ' . $attributes . '>';
+				if ( 'excerpt' == $mode )
+					echo apply_filters( 'post_date_column_time', $t_time, $post, $column_name, $mode );
+				else
+					echo '<abbr title="' . $t_time . '">' . apply_filters( 'post_date_column_time', $h_time, $post, $column_name, $mode ) . '</abbr>';
+				echo '<br />';
+				if ( 'publish' == $post->post_status ) {
+					_e( 'Published' );
+				} elseif ( 'future' == $post->post_status ) {
+					if ( $time_diff > 0 )
+						echo '<strong class="attention">' . __( 'Missed schedule' ) . '</strong>';
+					else
+						_e( 'Scheduled' );
+				} else {
+					_e( 'Last Modified' );
+				}
+				echo '</td>';
+			break;
+
+			case 'title':
+				$attributes = 'class="post-title column-title"' . $style;
+			?>
+			<td <?php echo $attributes ?>><strong><?php if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $title ?></a><?php } else { echo $title; }; _post_states( $post ); ?></strong>
+			<?php
+				if ( 'excerpt' == $mode )
+					the_excerpt();
+
+				$actions = array();
+				if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) && 'trash' != $post->post_status ) {
+					$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ) ) . '">' . __( 'Edit' ) . '</a>';
+					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr( __( 'Edit this item inline' ) ) . '">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+				}
+				if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
+					if ( 'trash' == $post->post_status )
+						$actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash' ) ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-' . $post->post_type . '_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
+					elseif ( EMPTY_TRASH_DAYS )
+						$actions['trash'] = "<a class='submitdelete' title='" . esc_attr( __( 'Move this item to the Trash' ) ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+					if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
+						$actions['delete'] = "<a class='submitdelete' title='" . esc_attr( __( 'Delete this item permanently' ) ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+				}
+				if ( in_array( $post->post_status, array( 'pending', 'draft' ) ) ) {
+					if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) )
+						$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';
+				} elseif ( 'trash' != $post->post_status ) {
+					$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+				}
+				$actions = apply_filters( 'post_row_actions', $actions, $post );
+				$action_count = count( $actions );
+				$i = 0;
+				echo '<div class="row-actions">';
+				foreach ( $actions as $action => $link ) {
+					++$i;
+					( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+					echo "<span class='$action'>$link$sep</span>";
+				}
+				echo '</div>';
+
+				get_inline_data( $post );
+			?>
+			</td>
+			<?php
+			break;
+
+			case 'categories':
+			?>
+			<td <?php echo $attributes ?>><?php
+				$categories = get_the_category();
+				if ( !empty( $categories ) ) {
+					$out = array();
+					foreach ( $categories as $c )
+						$out[] = "<a href='edit.php?post_type={$post->post_type}&amp;category_name={$c->slug}'> " . esc_html( 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 echo $attributes ?>><?php
+				$tags = get_the_tags( $post->ID );
+				if ( !empty( $tags ) ) {
+					$out = array();
+					foreach ( $tags as $c )
+						$out[] = "<a href='edit.php?post_type={$post->post_type}&amp;tag={$c->slug}'> " . esc_html( 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 <?php echo $attributes ?>><div class="post-com-count-wrapper">
+			<?php
+				$pending_phrase = sprintf( __( '%s pending' ), number_format( $pending_comments ) );
+				if ( $pending_comments )
+					echo '<strong>';
+				comments_number(
+					"<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+					. /* translators: comment count link */ _x( '0', 'comment count' ) . '</span></a>',
+					"<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+					. /* translators: comment count link */ _x( '1', 'comment count' ) . '</span></a>',
+					"<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+					. /* translators: comment count link: % will be substituted by comment count */ _x( '%', 'comment count' ) . '</span></a>'
+				);
+				if ( $pending_comments )
+					echo '</strong>';
+			?>
+			</div></td>
+			<?php
+			break;
+
+			case 'author':
+			?>
+			<td <?php echo $attributes ?>><a href="edit.php?post_type=<?php echo $post->post_type; ?>&amp;author=<?php the_author_meta( 'ID' ); ?>"><?php the_author() ?></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( $post_type_object->cap->edit_post, $post->ID ) ) { echo "<a href='$edit_link' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td>
+			<?php
+			break;
+
+			case 'control_delete':
+			?>
+			<td><?php if ( current_user_can( $post_type_object->cap->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 echo $attributes ?>><?php do_action( 'manage_posts_custom_column', $column_name, $post->ID ); ?></td>
+			<?php
+			break;
+		}
+	}
+	?>
+		</tr>
+	<?php
+		$post = $global_post;
+	}
+
+	/**
+	 * Outputs the hidden row displayed when inline editing
+	 *
+	 * @since 3.1
+	 */
+	function inline_edit() {
+		global $mode;
+
+		$screen = $this->_screen;
+
+		$post = get_default_post_to_edit( $screen->post_type );
+		$post_type_object = get_post_type_object( $screen->post_type );
+
+		$taxonomy_names = get_object_taxonomies( $screen->post_type );
+		$hierarchical_taxonomies = array();
+		$flat_taxonomies = array();
+		foreach ( $taxonomy_names as $taxonomy_name ) {
+			$taxonomy = get_taxonomy( $taxonomy_name );
+
+			if ( !$taxonomy->show_ui )
+				continue;
+
+			if ( $taxonomy->hierarchical )
+				$hierarchical_taxonomies[] = $taxonomy;
+			else
+				$flat_taxonomies[] = $taxonomy;
+		}
+
+		list( $columns, $hidden ) = $this->get_column_headers();
+
+		$col_count = count( $columns ) - count( $hidden );
+		$m = ( isset( $mode ) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
+		$can_publish = current_user_can( $post_type_object->cap->publish_posts );
+		$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
+
+	?>
+
+	<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
+		<?php
+		$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
+		$bulk = 0;
+		while ( $bulk < 2 ) { ?>
+
+		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-$screen->post_type ";
+			echo $bulk ? "bulk-edit-row bulk-edit-row-$hclass bulk-edit-$screen->post_type" : "quick-edit-row quick-edit-row-$hclass inline-edit-$screen->post_type";
+		?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
+
+		<fieldset class="inline-edit-col-left"><div class="inline-edit-col">
+			<h4><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></h4>
+
+
+	<?php
+
+	if ( post_type_supports( $screen->post_type, 'title' ) ) :
+		if ( $bulk ) : ?>
+			<div id="bulk-title-div">
+				<div id="bulk-titles"></div>
+			</div>
+
+	<?php else : // $bulk ?>
+
+			<label>
+				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
+			</label>
+
+			<label>
+				<span class="title"><?php _e( 'Slug' ); ?></span>
+				<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
+			</label>
+
+	<?php endif; // $bulk
+	endif; // post_type_supports title ?>
+
+	<?php if ( !$bulk ) : ?>
+			<label><span class="title"><?php _e( 'Date' ); ?></span></label>
+			<div class="inline-edit-date">
+				<?php touch_time( 1, 1, 4, 1 ); ?>
+			</div>
+			<br class="clear" />
+
+	<?php endif; // $bulk
+
+		if ( post_type_supports( $screen->post_type, 'author' ) ) :
+			$authors = get_editable_user_ids( get_current_user_id(), true, $screen->post_type ); // TODO: ROLE SYSTEM
+			$authors_dropdown = '';
+			if ( $authors && count( $authors ) > 1 ) :
+				$users_opt = array( 'include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1, 'echo' => 0 );
+				if ( $bulk )
+					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				$authors_dropdown  = '<label>';
+				$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+				$authors_dropdown .= wp_dropdown_users( $users_opt );
+				$authors_dropdown .= '</label>';
+
+			endif; // authors
+	?>
+
+	<?php if ( !$bulk ) echo $authors_dropdown;
+	endif; // post_type_supports author
+
+	if ( !$bulk ) :
+	?>
+
+			<div class="inline-edit-group">
+				<label class="alignleft">
+					<span class="title"><?php _e( 'Password' ); ?></span>
+					<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
+				</label>
+
+				<em style="margin:5px 10px 0 0" class="alignleft">
+					<?php
+					/* translators: Between password field and private checkbox on post quick edit interface */
+					echo __( '&ndash;OR&ndash;' );
+					?>
+				</em>
+				<label class="alignleft inline-edit-private">
+					<input type="checkbox" name="keep_private" value="private" />
+					<span class="checkbox-title"><?php echo __( 'Private' ); ?></span>
+				</label>
+			</div>
+
+	<?php endif; ?>
+
+		</div></fieldset>
+
+	<?php if ( count( $hierarchical_taxonomies ) && !$bulk ) : ?>
+
+		<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
+
+	<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
+
+			<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?>
+				<span class="catshow"><?php _e( '[more]' ); ?></span>
+				<span class="cathide" style="display:none;"><?php _e( '[less]' ); ?></span>
+			</span>
+			<input type="hidden" name="<?php echo ( $taxonomy->name == 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
+			<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name )?>-checklist">
+				<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ) ?>
+			</ul>
+
+	<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
+
+		</div></fieldset>
+
+	<?php endif; // count( $hierarchical_taxonomies ) && !$bulk ?>
+
+		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
+
+	<?php
+		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
+			echo $authors_dropdown;
+	?>
+
+	<?php if ( $post_type_object->hierarchical ) : ?>
+
+			<label>
+				<span class="title"><?php _e( 'Parent' ); ?></span>
+	<?php
+		$dropdown_args = array( 'post_type' => $post_type_object->name, 'selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __( 'Main Page ( no parent )' ), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title' );
+		if ( $bulk )
+			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		$dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );
+		wp_dropdown_pages( $dropdown_args );
+	?>
+			</label>
+
+	<?php if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
+			if ( !$bulk ) : ?>
+
+			<label>
+				<span class="title"><?php _e( 'Order' ); ?></span>
+				<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
+			</label>
+
+	<?php	endif; // !$bulk ?>
+
+			<label>
+				<span class="title"><?php _e( 'Template' ); ?></span>
+				<select name="page_template">
+	<?php	if ( $bulk ) : ?>
+					<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+	<?php	endif; // $bulk ?>
+					<option value="default"><?php _e( 'Default Template' ); ?></option>
+					<?php page_template_dropdown() ?>
+				</select>
+			</label>
+
+	<?php
+		endif; // post_type_supports page-attributes
+	endif; // $post_type_object->hierarchical ?>
+
+	<?php if ( count( $flat_taxonomies ) && !$bulk ) : ?>
+
+	<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
+
+			<label class="inline-edit-tags">
+				<span class="title"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
+				<textarea cols="22" rows="1" name="tax_input[<?php echo esc_attr( $taxonomy->name )?>]" class="tax_input_<?php echo esc_attr( $taxonomy->name )?>"></textarea>
+			</label>
+
+	<?php endforeach; //$flat_taxonomies as $taxonomy ?>
+
+	<?php endif; // count( $flat_taxonomies ) && !$bulk  ?>
+
+	<?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
+		if ( $bulk ) : ?>
+
+			<div class="inline-edit-group">
+		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+			<label class="alignleft">
+				<span class="title"><?php _e( 'Comments' ); ?></span>
+				<select name="comment_status">
+					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+					<option value="open"><?php _e( 'Allow' ); ?></option>
+					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+				</select>
+			</label>
+		<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+			<label class="alignright">
+				<span class="title"><?php _e( 'Pings' ); ?></span>
+				<select name="ping_status">
+					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+					<option value="open"><?php _e( 'Allow' ); ?></option>
+					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+				</select>
+			</label>
+		<?php endif; ?>
+			</div>
+
+	<?php else : // $bulk ?>
+
+			<div class="inline-edit-group">
+			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+				<label class="alignleft">
+					<input type="checkbox" name="comment_status" value="open" />
+					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+				</label>
+			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+				<label class="alignleft">
+					<input type="checkbox" name="ping_status" value="open" />
+					<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
+				</label>
+			<?php endif; ?>
+			</div>
+
+	<?php endif; // $bulk
+	endif; // post_type_supports comments or pings ?>
+
+			<div class="inline-edit-group">
+				<label class="inline-edit-status alignleft">
+					<span class="title"><?php _e( 'Status' ); ?></span>
+					<select name="_status">
+	<?php if ( $bulk ) : ?>
+						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+	<?php endif; // $bulk ?>
+					<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
+						<option value="publish"><?php _e( 'Published' ); ?></option>
+						<option value="future"><?php _e( 'Scheduled' ); ?></option>
+	<?php if ( $bulk ) : ?>
+						<option value="private"><?php _e( 'Private' ) ?></option>
+	<?php endif; // $bulk ?>
+					<?php endif; ?>
+						<option value="pending"><?php _e( 'Pending Review' ); ?></option>
+						<option value="draft"><?php _e( 'Draft' ); ?></option>
+					</select>
+				</label>
+
+	<?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+
+	<?php	if ( $bulk ) : ?>
+
+				<label class="alignright">
+					<span class="title"><?php _e( 'Sticky' ); ?></span>
+					<select name="sticky">
+						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+						<option value="sticky"><?php _e( 'Sticky' ); ?></option>
+						<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
+					</select>
+				</label>
+
+	<?php	else : // $bulk ?>
+
+				<label class="alignleft">
+					<input type="checkbox" name="sticky" value="sticky" />
+					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+				</label>
+
+	<?php	endif; // $bulk ?>
+
+	<?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_cap' ) ?>
+
+			</div>
+
+		</div></fieldset>
+
+	<?php
+		foreach ( $columns as $column_name => $column_display_name ) {
+			if ( isset( $core_columns[$column_name] ) )
+				continue;
+			do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $screen->post_type );
+		}
+	?>
+		<p class="submit inline-edit-save">
+			<a accesskey="c" href="#inline-edit" title="<?php _e( 'Cancel' ); ?>" class="button-secondary cancel alignleft"><?php _e( 'Cancel' ); ?></a>
+			<?php if ( ! $bulk ) {
+				wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
+				$update_text = __( 'Update' );
+				?>
+				<a accesskey="s" href="#inline-edit" title="<?php _e( 'Update' ); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
+				<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+			<?php } else {
+				$update_text = __( 'Update' );
+			?>
+				<input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo esc_attr( $update_text ); ?>" />
+			<?php } ?>
+			<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
+			<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
+			<br class="clear" />
+		</p>
+		</td></tr>
+	<?php
+		$bulk++;
+		}
+?>
+		</tbody></table></form>
+<?php
+	}
+}
+
+class WP_Media_Table extends WP_List_Table {
+
+	function WP_Media_Table( $context = 'normal' ) {
+		global $wpdb, $wp_query, $detached, $post_mime_types, $avail_post_mime_types;
+
+		if ( isset( $_REQUEST['find_detached'] ) ) {
+			if ( !current_user_can( 'edit_posts' ) )
+				wp_die( __( 'You are not allowed to scan for lost attachments.' ) );
+
+			$lost = $wpdb->get_col( "
+				SELECT ID FROM $wpdb->posts
+				WHERE post_type = 'attachment' AND post_parent > '0'
+				AND post_parent NOT IN (
+					SELECT ID FROM $wpdb->posts
+					WHERE post_type NOT IN ( 'attachment', '" . join( "', '", get_post_types( array( 'public' => false ) ) ) . "' )
+				)
+			" );
+
+			$_REQUEST['detached'] = 1;
+		}
+
+		$detached = isset( $_REQUEST['detached'] );
+
+		parent::WP_List_Table( array(
+			'screen' => $detached ? 'upload-detached' : 'upload',
+			'plural' => 'media'
+		) );
+
+		if ( 'normal' != $context )
+			return;
+
+		$q = $_REQUEST;
+
+		if ( !empty( $lost ) )
+			$q['post__in'] = implode( ',', $lost );
+
+		list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $q );
+
+ 		$this->is_trash = isset( $_REQUEST['status'] ) && 'trash' == $_REQUEST['status'];
+
+		$this->set_pagination_args( array(
+			'total_items' => $wp_query->found_posts,
+			'total_pages' => $wp_query->max_num_pages,
+			'per_page' => $wp_query->query_vars['posts_per_page'],
+		) );
+	}
+
+	function get_bulk_actions() {
+		global $detached;
+
+		$actions = array();
+		$actions['delete'] = __( 'Delete Permanently' );
+		if ( $detached )
+			$actions['attach'] = __( 'Attach to a post' );
+
+		return $actions;
+	}
+
+	function extra_tablenav( $which ) {
+		global $post_type, $detached;
+?>
+		<div class="alignleft actions">
+<?php
+		if ( 'top' == $which && !is_singular() && !$detached && !$this->is_trash ) {
+			$this->months_dropdown( $post_type );
+
+			do_action( 'restrict_manage_posts' );
+?>
+			<input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Filter' ); ?>" class="button-secondary" />
+<?php
+		}
+
+		if ( $detached ) { ?>
+			<input type="submit" id="find_detached" name="find_detached" value="<?php esc_attr_e( 'Scan for lost attachments' ); ?>" class="button-secondary" />
+		<?php } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) { ?>
+			<input type="submit" id="delete_all" name="delete_all" value="<?php esc_attr_e( 'Empty Trash' ); ?>" class="button-secondary apply" />
+		<?php } ?>
+		</div>
+<?php
+	}
+
+	function has_items() {
+		return have_posts();
+	}
+
+	function no_items() {
+		_e( 'No media attachments found.' );
+	}
+
+	function get_columns() {
+		$posts_columns = array();
+		$posts_columns['cb'] = '<input type="checkbox" />';
+		$posts_columns['icon'] = '';
+		/* translators: column name */
+		$posts_columns['title'] = _x( 'File', 'column name' );
+		$posts_columns['author'] = __( 'Author' );
+		//$posts_columns['tags'] = _x( 'Tags', 'column name' );
+		/* translators: column name */
+		if ( 'upload' == $this->_screen->id ) {
+			$posts_columns['parent'] = _x( 'Attached to', 'column name' );
+			$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
+		}
+		/* translators: column name */
+		$posts_columns['date'] = _x( 'Date', 'column name' );
+		$posts_columns = apply_filters( 'manage_media_columns', $posts_columns, 'upload' != $this->_screen->id );
+
+		return $posts_columns;
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'title'    => 'title',
+			'author'   => 'author',
+			'parent'   => 'parent',
+			'comments' => 'comment_count',
+			'date'     => 'date',
+		);
+	}
+
+	function display_rows() {
+		global $detached, $post, $id;
+
+		if ( $detached ) {
+			$this->display_orphans();
+			return;
+		}
+
+		add_filter( 'the_title','esc_html' );
+		$alt = '';
+
+		while ( have_posts() ) : the_post();
+
+			if ( $this->is_trash && $post->post_status != 'trash'
+			||  !$this->is_trash && $post->post_status == 'trash' )
+				continue;
+
+			$alt = ( 'alternate' == $alt ) ? '' : 'alternate';
+			$post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
+			$att_title = _draft_or_post_title();
+?>
+	<tr id='post-<?php echo $id; ?>' class='<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top">
+<?php
+
+list( $columns, $hidden ) = $this->get_column_headers();
+foreach ( $columns as $column_name => $column_display_name ) {
+	$class = "class='$column_name column-$column_name'";
+
+	$style = '';
+	if ( in_array( $column_name, $hidden ) )
+		$style = ' style="display:none;"';
+
+	$attributes = $class . $style;
+
+	switch ( $column_name ) {
+
+	case 'cb':
+?>
+		<th scope="row" class="check-column"><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><input type="checkbox" name="media[]" value="<?php the_ID(); ?>" /><?php } ?></th>
+<?php
+		break;
+
+	case 'icon':
+		$attributes = 'class="column-icon media-icon"' . $style;
+?>
+		<td <?php echo $attributes ?>><?php
+			if ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) {
+				if ( $this->is_trash ) {
+					echo $thumb;
+				} else {
+?>
+				<a href="<?php echo get_edit_post_link( $post->ID, true ); ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ); ?>">
+					<?php echo $thumb; ?>
+				</a>
+
+<?php			}
+			}
+?>
+		</td>
+<?php
+		break;
+
+	case 'title':
+?>
+		<td <?php echo $attributes ?>><strong><?php if ( $this->is_trash ) echo $att_title; else { ?><a href="<?php echo get_edit_post_link( $post->ID, true ); ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ); ?>"><?php echo $att_title; ?></a><?php } ?></strong>
+			<p>
+<?php
+			if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
+				echo esc_html( strtoupper( $matches[1] ) );
+			else
+				echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
+?>
+			</p>
+<?php
+		$actions = array();
+		if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash )
+			$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
+		if ( current_user_can( 'delete_post', $post->ID ) ) {
+			if ( $this->is_trash )
+				$actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-attachment_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
+			elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
+				$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-attachment_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+			if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
+				$delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
+				$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-attachment_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			}
+		}
+		if ( !$this->is_trash ) {
+			$title =_draft_or_post_title( $post->post_parent );
+			$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+		}
+		$actions = apply_filters( 'media_row_actions', $actions, $post );
+		$action_count = count( $actions );
+		$i = 0;
+		echo '<div class="row-actions">';
+		foreach ( $actions as $action => $link ) {
+			$sep = ( ++$i == $action_count ) ? '' : ' | ';
+			echo "<span class='$action'>$link$sep</span>";
+		}
+		echo '</div>';
+?>
+		</td>
+<?php
+		break;
+
+	case 'author':
+?>
+		<td <?php echo $attributes ?>><?php the_author() ?></td>
+<?php
+		break;
+
+	case 'tags':
+?>
+		<td <?php echo $attributes ?>><?php
+		$tags = get_the_tags();
+		if ( !empty( $tags ) ) {
+			$out = array();
+			foreach ( $tags as $c )
+				$out[] = "<a href='edit.php?tag=$c->slug'> " . esc_html( sanitize_term_field( 'name', $c->name, $c->term_id, 'post_tag', 'display' ) ) . "</a>";
+			echo join( ', ', $out );
+		} else {
+			_e( 'No Tags' );
+		}
+?>
+		</td>
+<?php
+		break;
+
+	case 'desc':
+?>
+		<td <?php echo $attributes ?>><?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, $post, false );
+			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 $attributes ?>><?php echo $h_time ?></td>
+<?php
+		break;
+
+	case 'parent':
+		if ( $post->post_parent > 0 ) {
+			if ( get_post( $post->post_parent ) ) {
+				$title =_draft_or_post_title( $post->post_parent );
+			}
+?>
+			<td <?php echo $attributes ?>>
+				<strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>"><?php echo $title ?></a></strong>,
+				<?php echo get_the_time( __( 'Y/m/d' ) ); ?>
+			</td>
+<?php
+		} else {
+?>
+			<td <?php echo $attributes ?>><?php _e( '( Unattached )' ); ?><br />
+			<a class="hide-if-no-js" onclick="findPosts.open( 'media[]','<?php echo $post->ID ?>' );return false;" href="#the-list"><?php _e( 'Attach' ); ?></a></td>
+<?php
+		}
+		break;
+
+	case 'comments':
+		$attributes = 'class="comments column-comments num"' . $style;
+?>
+		<td <?php echo $attributes ?>>
+			<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='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+			. /* translators: comment count link */ _x( '0', 'comment count' ) . '</span></a>',
+			"<a href='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+			. /* translators: comment count link */ _x( '1', 'comment count' ) . '</span></a>',
+			"<a href='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+			. /* translators: comment count link: % will be substituted by comment count */ _x( '%', 'comment count' ) . '</span></a>'
+		);
+		if ( $left )
+			echo '</strong>';
+		?>
+			</div>
+		</td>
+<?php
+		break;
+
+	case 'actions':
+?>
+		<td <?php echo $attributes ?>>
+			<a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ); ?>"><?php _e( 'Edit' ); ?></a> |
+			<a href="<?php the_permalink(); ?>"><?php _e( 'Get permalink' ); ?></a>
+		</td>
+		<?php
+		break;
+
+	default:
+?>
+		<td <?php echo $attributes ?>>
+			<?php do_action( 'manage_media_custom_column', $column_name, $id ); ?>
+		</td>
+<?php
+		break;
+	}
+}
+?>
+	</tr>
+<?php endwhile;
+	}
+
+	function display_orphans() {
+		global $post;
+
+		$class = '';
+
+		while ( have_posts() ) : the_post();
+
+			$class = ( 'alternate' == $class ) ? '' : 'alternate';
+			$att_title = esc_html( _draft_or_post_title( $post->ID ) );
+
+			$edit_link = '<a href="' . get_edit_post_link( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ) . '">%s</a>';
+?>
+	<tr id='post-<?php echo $post->ID; ?>' class='<?php echo $class; ?>' valign="top">
+		<th scope="row" class="check-column">
+		<?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?>
+			<input type="checkbox" name="media[]" value="<?php echo esc_attr( $post->ID ); ?>" />
+		<?php } ?>
+		</th>
+
+		<td class="media-icon">
+		<?php if ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) {
+			printf( $edit_link, $thumb );
+		} ?>
+		</td>
+
+		<td class="media column-media">
+			<strong><?php printf( $edit_link, $att_title ); ?></strong><br />
+<?php
+			if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
+				echo esc_html( strtoupper( $matches[1] ) );
+			else
+				echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
+?>
+			<div class="row-actions">
+<?php
+			$actions = array();
+			if ( current_user_can( 'edit_post', $post->ID ) )
+				$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
+			if ( current_user_can( 'delete_post', $post->ID ) )
+				if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+					$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-attachment_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+				} else {
+					$delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+					$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-attachment_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+				}
+			$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+			if ( current_user_can( 'edit_post', $post->ID ) )
+				$actions['attach'] = '<a href="#the-list" onclick="findPosts.open( \'media[]\',\''.$post->ID.'\' );return false;" class="hide-if-no-js">'.__( 'Attach' ).'</a>';
+			$actions = apply_filters( 'media_row_actions', $actions, $post );
+
+			$action_count = count( $actions );
+			$i = 0;
+			foreach ( $actions as $action => $link ) {
+				$sep = ( ++$i == $action_count ) ? '' : ' | ';
+				echo "<span class='$action'>$link$sep</span>";
+			}
+?>
+			</div>
+		</td>
+		<td class="author column-author">
+			<?php $author = get_userdata( $post->post_author ); echo $author->display_name; ?>
+		</td>
+<?php
+		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 class="date column-date"><?php echo $h_time ?></td>
+	</tr>
+<?php
+		endwhile;
+	}
+}
+
+class WP_Terms_Table extends WP_List_Table {
+
+	var $callback_args;
+
+	function WP_Terms_Table( $context = 'normal' ) {
+		global $post_type, $taxonomy, $tax, $current_screen;
+
+		parent::WP_List_Table( array(
+			'screen' => $current_screen,
+			'plural' => 'tags',
+			'singular' => 'tag',
+		) );
+
+		if ( 'normal' != $context )
+			return;
+
+		wp_reset_vars( array( 'action', 'tag', 'taxonomy', 'post_type' ) );
+
+		if ( empty( $taxonomy ) )
+			$taxonomy = 'post_tag';
+
+		if ( !taxonomy_exists( $taxonomy ) )
+			wp_die( __( 'Invalid taxonomy' ) );
+
+		$tax = get_taxonomy( $taxonomy );
+
+		if ( ! current_user_can( $tax->cap->manage_terms ) )
+			wp_die( __( 'Cheatin&#8217; uh?' ) );
+
+		if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'public' => true ) ) ) )
+			$post_type = 'post';
+
+		$tags_per_page = (int) get_user_option( 'edit_' .  $taxonomy . '_per_page' );
+
+		if ( empty( $tags_per_page ) || $tags_per_page < 1 )
+			$tags_per_page = 20;
+
+		if ( 'post_tag' == $taxonomy ) {
+			$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+			$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
+		} elseif ( 'category' == $taxonomy ) {
+			$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
+		} else {
+			$tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page );
+		}
+
+		$search = !empty( $_REQUEST['s'] ) ? trim( stripslashes( $_REQUEST['s'] ) ) : '';
+
+		$args = array(
+			'search' => $search,
+			'page' => $this->get_pagenum(),
+			'number' => $tags_per_page,
+		);
+
+		if ( !empty( $_REQUEST['orderby'] ) )
+			$args['orderby'] = trim( stripslashes( $_REQUEST['orderby'] ) );
+
+		if ( !empty( $_REQUEST['order'] ) )
+			$args['order'] = trim( stripslashes( $_REQUEST['order'] ) );
+
+		$this->callback_args = $args;
+		
+		$this->set_pagination_args( array(
+			'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ),
+			'per_page' => $tags_per_page,		
+		) );
+	}
+
+	function get_bulk_actions() {
+		$actions = array();
+		$actions['delete'] = __( 'Delete' );
+
+		return $actions;
+	}
+
+	function get_columns() {
+		global $taxonomy;
+
+		$columns = array(
+			'cb'          => '<input type="checkbox" />',
+			'name'        => __( 'Name' ),
+			'description' => __( 'Description' ),
+			'slug'        => __( 'Slug' ),
+		);
+
+		if ( 'link_category' == $taxonomy )
+			$columns['links'] = __( 'Links' );
+		else
+			$columns['posts'] = __( 'Posts' );
+
+		return $columns;
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'name'        => 'name',
+			'description' => 'description',
+			'slug'        => 'slug',
+			'posts'       => 'count',
+			'links'       => 'count'
+		);
+	}
+
+	function display_rows() {
+		global $taxonomy;
+
+		$args = wp_parse_args( $this->callback_args, array(
+			'page' => 1,
+			'number' => 20,
+			'search' => '',
+			'hide_empty' => 0
+		) );
+
+		extract( $args, EXTR_SKIP );
+
+		$args['offset'] = $offset = ( $page - 1 ) * $number;
+
+		// convert it to table rows
+		$out = '';
+		$count = 0;
+		if ( is_taxonomy_hierarchical( $taxonomy ) && !isset( $orderby ) ) {
+			// We'll need the full set of terms then.
+			$args['number'] = $args['offset'] = 0;
+
+			$terms = get_terms( $taxonomy, $args );
+			if ( !empty( $search ) ) // Ignore children on searches.
+				$children = array();
+			else
+				$children = _get_term_hierarchy( $taxonomy );
+
+			// Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
+			$out .= $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
+		} else {
+			$terms = get_terms( $taxonomy, $args );
+			foreach ( $terms as $term )
+				$out .= $this->single_row( $term, 0, $taxonomy );
+			$count = $number; // Only displaying a single page.
+		}
+
+		echo $out;
+	}
+
+	function _rows( $taxonomy, $terms, &$children, $start = 0, $per_page = 20, &$count, $parent = 0, $level = 0 ) {
+
+		$end = $start + $per_page;
+
+		$output = '';
+		foreach ( $terms as $key => $term ) {
+
+			if ( $count >= $end )
+				break;
+
+			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) )
+				continue;
+
+			// If the page starts in a subtree, print the parents.
+			if ( $count == $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
+				$my_parents = $parent_ids = array();
+				$p = $term->parent;
+				while ( $p ) {
+					$my_parent = get_term( $p, $taxonomy );
+					$my_parents[] = $my_parent;
+					$p = $my_parent->parent;
+					if ( in_array( $p, $parent_ids ) ) // Prevent parent loops.
+						break;
+					$parent_ids[] = $p;
+				}
+				unset( $parent_ids );
+
+				$num_parents = count( $my_parents );
+				while ( $my_parent = array_pop( $my_parents ) ) {
+					$output .=  "\t" . $this->single_row( $my_parent, $level - $num_parents, $taxonomy );
+					$num_parents--;
+				}
+			}
+
+			if ( $count >= $start )
+				$output .= "\t" . $this->single_row( $term, $level, $taxonomy );
+
+			++$count;
+
+			unset( $terms[$key] );
+
+			if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) )
+				$output .= $this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+		}
+
+		return $output;
+	}
+
+	function single_row( $tag, $level, $taxonomy = 'post_tag' ) {
+		global $post_type, $current_screen;
+		static $row_class = '';
+		$row_class = ( $row_class == '' ? ' class="alternate"' : '' );
+
+		$count = number_format_i18n( $tag->count );
+		$tax = get_taxonomy( $taxonomy );
+
+		if ( 'post_tag' == $taxonomy ) {
+			$tagsel = 'tag';
+		} elseif ( 'category' == $taxonomy ) {
+			$tagsel = 'category_name';
+		} elseif ( ! empty( $tax->query_var ) ) {
+			$tagsel = $tax->query_var;
+		} else {
+			$tagsel = $taxonomy;
+		}
+
+		$pad = str_repeat( '&#8212; ', max( 0, $level ) );
+		$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
+		$qe_data = get_term( $tag->term_id, $taxonomy, object, 'edit' );
+		$edit_link = "edit-tags.php?action=edit&amp;taxonomy=$taxonomy&amp;post_type=$post_type&amp;tag_ID=$tag->term_id";
+
+		$out = '';
+		$out .= '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
+
+		$default_term = get_option( 'default_' . $taxonomy );
+
+		list( $columns, $hidden ) = $this->get_column_headers();
+
+		foreach ( $columns as $column_name => $column_display_name ) {
+			$class = "class=\"$column_name column-$column_name\"";
+
+			$style = '';
+			if ( in_array( $column_name, $hidden ) )
+				$style = ' style="display:none;"';
+
+			$attributes = "$class$style";
+
+			switch ( $column_name ) {
+				case 'cb':
+					if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
+						$out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>';
+					else
+						$out .= '<th scope="row" class="check-column">&nbsp;</th>';
+					break;
+				case 'name':
+					$out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
+					$actions = array();
+					if ( current_user_can( $tax->cap->edit_terms ) ) {
+						$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+						$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+					}
+					if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
+						$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
+
+					$actions = apply_filters( 'tag_row_actions', $actions, $tag );
+					$actions = apply_filters( "${taxonomy}_row_actions", $actions, $tag );
+
+					$action_count = count( $actions );
+					$i = 0;
+					$out .= '<div class="row-actions">';
+					foreach ( $actions as $action => $link ) {
+						++$i;
+						( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+						$out .= "<span class='$action'>$link$sep</span>";
+					}
+					$out .= '</div>';
+					$out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
+					$out .= '<div class="name">' . $qe_data->name . '</div>';
+					$out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';
+					$out .= '<div class="parent">' . $qe_data->parent . '</div></div></td>';
+					break;
+				case 'description':
+					$out .= "<td $attributes>$tag->description</td>";
+					break;
+				case 'slug':
+					$out .= "<td $attributes>" . apply_filters( 'editable_slug', $tag->slug ) . "</td>";
+					break;
+				case 'posts':
+					$attributes = 'class="posts column-posts num"' . $style;
+					$out .= "<td $attributes><a href='edit.php?$tagsel=$tag->slug&amp;post_type=$post_type'>$count</a></td>";
+					break;
+				case 'links':
+					$attributes = 'class="links column-links num"' . $style;
+					$out .= "<td $attributes>$count</td>";
+					break;
+				default:
+					$out .= "<td $attributes>";
+					$out .= apply_filters( "manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id );
+					$out .= "</td>";
+			}
+		}
+
+		$out .= "</tr>\n";
+
+		return $out;
+	}
+
+	/**
+	 * Outputs the hidden row displayed when inline editing
+	 *
+	 * @since 3.1
+	 */
+	function inline_edit() {
+		global $tax;
+
+		if ( ! current_user_can( $tax->cap->edit_terms ) )
+			return;
+
+		list( $columns, $hidden ) = $this->get_column_headers();
+
+		$col_count = count( $columns ) - count( $hidden );
+		?>
+
+	<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
+		<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>">
+
+			<fieldset><div class="inline-edit-col">
+				<h4><?php _e( 'Quick Edit' ); ?></h4>
+
+				<label>
+					<span class="title"><?php _e( 'Name' ); ?></span>
+					<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
+				</label>
+	<?php if ( !is_multisite() ) { ?>
+				<label>
+					<span class="title"><?php _e( 'Slug' ); ?></span>
+					<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
+				</label>
+	<?php } ?>
+
+			</div></fieldset>
+	<?php
+
+		$core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true );
+
+		foreach ( $columns as $column_name => $column_display_name ) {
+			if ( isset( $core_columns[$column_name] ) )
+				continue;
+			do_action( 'quick_edit_custom_box', $column_name, $type, $tax->taxonomy );
+		}
+
+	?>
+
+		<p class="inline-edit-save submit">
+			<a accesskey="c" href="#inline-edit" title="<?php _e( 'Cancel' ); ?>" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></a>
+			<?php $update_text = $tax->labels->update_item; ?>
+			<a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
+			<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+			<span class="error" style="display:none;"></span>
+			<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
+			<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $tax->name ); ?>" />
+			<br class="clear" />
+		</p>
+		</td></tr>
+		</tbody></table></form>
+	<?php
+	}
+}
+
+class WP_Users_Table extends WP_List_Table {
+
+	function WP_Users_Table( $context = 'normal' ) {
+		global $role, $usersearch;
+
+		parent::WP_List_Table( array(
+			'screen' => 'users',
+			'plural' => 'users'
+		) );
+
+		if ( 'normal' != $context )
+			return;
+
+		$usersearch = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
+
+		$role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
+
+		$users_per_page = (int) get_user_option( 'users_per_page' );
+		if ( empty( $users_per_page ) || $users_per_page < 1 )
+			$users_per_page = 20;
+		$users_per_page = apply_filters( 'users_per_page', $users_per_page );
+
+		$paged = $this->get_pagenum();
+
+		$args = array(
+			'number' => $users_per_page,
+			'offset' => ( $paged-1 ) * $users_per_page,
+			'role' => $role,
+			'search' => $usersearch
+		);
+
+		if ( isset( $_REQUEST['orderby'] ) )
+			$args['orderby'] = $_REQUEST['orderby'];
+
+		if ( isset( $_REQUEST['order'] ) )
+			$args['order'] = $_REQUEST['order'];
+
+		// Query the user IDs for this page
+		$wp_user_search = new WP_User_Query( $args );
+
+		$this->items = $wp_user_search->get_results();
+		
+		$this->set_pagination_args( array(
+			'total_items' => $wp_user_search->get_total(),
+			'per_page' => $users_per_page,		
+		) );
+	}
+
+	function no_items() {
+		_e( 'No matching users were found.' );
+	}
+
+	function get_bulk_actions() {
+		$actions = array();
+
+		if ( !is_multisite() && current_user_can( 'delete_users' ) )
+			$actions['delete'] = __( 'Delete' );
+		else
+			$actions['remove'] = __( 'Remove' );
+
+		return $actions;
+	}
+
+	function extra_tablenav( $which ) {
+		if ( 'top' != $which )
+			return;
+?>
+	<div class="alignleft actions">
+		<label class="screen-reader-text" for="new_role"><?php _e( 'Change role to&hellip;' ) ?></label>
+		<select name="new_role" id="new_role">
+			<option value=''><?php _e( 'Change role to&hellip;' ) ?></option>
+			<?php wp_dropdown_roles(); ?>
+		</select>
+		<input type="submit" value="<?php esc_attr_e( 'Change' ); ?>" name="changeit" class="button-secondary" />
+	</div>
+<?php
+	}
+
+	function get_columns() {
+		return array(
+			'cb'       => '<input type="checkbox" />',
+			'username' => __( 'Login' ),
+			'name'     => __( 'Name' ),
+			'email'    => __( 'E-mail' ),
+			'role'     => __( 'Role' ),
+			'posts'    => __( 'Posts' )
+		);
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'username' => 'login',
+			'name'     => 'name',
+			'email'    => 'email',
+			'posts'    => 'post_count',
+		);
+	}
+
+	function display_rows() {
+		// Query the post counts for this page
+		$post_counts = count_many_users_posts( array_keys( $this->items ) );
+
+		$style = '';
+		foreach ( $this->items as $userid => $user_object ) {
+			$roles = $user_object->roles;
+			$role = array_shift( $roles );
+
+			if ( is_multisite() && empty( $role ) )
+				continue;
+
+			$style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
+			echo "\n\t", $this->single_row( $user_object, $style, $role, $post_counts[ $userid ] );
+		}
+	}
+
+	/**
+	 * Generate HTML for a single row on the users.php admin panel.
+	 *
+	 * @since 2.1.0
+	 *
+	 * @param object $user_object
+	 * @param string $style Optional. Attributes added to the TR element.  Must be sanitized.
+	 * @param string $role Key for the $wp_roles array.
+	 * @param int $numposts Optional. Post count to display for this user.  Defaults to zero, as in, a new user has made zero posts.
+	 * @return string
+	 */
+	function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
+		global $wp_roles;
+
+		if ( !( is_object( $user_object ) && is_a( $user_object, 'WP_User' ) ) )
+			$user_object = new WP_User( (int) $user_object );
+		$user_object = sanitize_user_object( $user_object, 'display' );
+		$email = $user_object->user_email;
+		$url = $user_object->user_url;
+		$short_url = str_replace( 'http://', '', $url );
+		$short_url = str_replace( 'www.', '', $short_url );
+		if ( '/' == substr( $short_url, -1 ) )
+			$short_url = substr( $short_url, 0, -1 );
+		if ( strlen( $short_url ) > 35 )
+			$short_url = substr( $short_url, 0, 32 ).'...';
+		$checkbox = '';
+		// Check if the user for this row is editable
+		if ( current_user_can( 'list_users' ) ) {
+			// Set up the user editing link
+			// TODO: make profile/user-edit determination a separate function
+			if ( get_current_user_id() == $user_object->ID ) {
+				$edit_link = 'profile.php';
+			} else {
+				$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( esc_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) );
+			}
+			$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
+
+			// Set up the hover actions for this user
+			$actions = array();
+
+			if ( current_user_can( 'edit_user',  $user_object->ID ) ) {
+				$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
+				$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+			} else {
+				$edit = "<strong>$user_object->user_login</strong><br />";
+			}
+
+			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
+				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
+			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
+				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			$actions = apply_filters( 'user_row_actions', $actions, $user_object );
+			$action_count = count( $actions );
+			$i = 0;
+			$edit .= '<div class="row-actions">';
+			foreach ( $actions as $action => $link ) {
+				++$i;
+				( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+				$edit .= "<span class='$action'>$link$sep</span>";
+			}
+			$edit .= '</div>';
+
+			// Set up the checkbox ( because the user is editable, otherwise its empty )
+			$checkbox = "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
+
+		} else {
+			$edit = '<strong>' . $user_object->user_login . '</strong>';
+		}
+		$role_name = isset( $wp_roles->role_names[$role] ) ? translate_user_role( $wp_roles->role_names[$role] ) : __( 'None' );
+		$r = "<tr id='user-$user_object->ID'$style>";
+		$avatar = get_avatar( $user_object->ID, 32 );
+
+		list( $columns, $hidden ) = $this->get_column_headers();
+
+		foreach ( $columns as $column_name => $column_display_name ) {
+			$class = "class=\"$column_name column-$column_name\"";
+
+			$style = '';
+			if ( in_array( $column_name, $hidden ) )
+				$style = ' style="display:none;"';
+
+			$attributes = "$class$style";
+
+			switch ( $column_name ) {
+				case 'cb':
+					$r .= "<th scope='row' class='check-column'>$checkbox</th>";
+					break;
+				case 'username':
+					$r .= "<td $attributes>$avatar $edit</td>";
+					break;
+				case 'name':
+					$r .= "<td $attributes>$user_object->first_name $user_object->last_name</td>";
+					break;
+				case 'email':
+					$r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __( 'E-mail: %s' ), $email ) . "'>$email</a></td>";
+					break;
+				case 'role':
+					$r .= "<td $attributes>$role_name</td>";
+					break;
+				case 'posts':
+					$attributes = 'class="posts column-posts num"' . $style;
+					$r .= "<td $attributes>";
+					if ( $numposts > 0 ) {
+						$r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>";
+						$r .= $numposts;
+						$r .= '</a>';
+					} else {
+						$r .= 0;
+					}
+					$r .= "</td>";
+					break;
+				default:
+					$r .= "<td $attributes>";
+					$r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
+					$r .= "</td>";
+			}
+		}
+		$r .= '</tr>';
+
+		return $r;
+	}
+}
+
+class WP_Comments_Table extends WP_List_Table {
+
+	function WP_Comments_Table( $context = 'normal' ) {
+		global $comments, $extra_comments, $total_comments, $post_id, $comment_status, $mode;
+
+		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
+
+		parent::WP_List_Table( array(
+			'screen' => 'edit-comments',
+			'plural' => 'comments'
+		) );
+
+		if ( 'normal' != $context )
+			return;
+
+		$post_id = isset( $_REQUEST['post_ID'] ) ? absint( $_REQUEST['post_ID'] ) : 0;
+
+		$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
+		if ( !in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) )
+			$comment_status = 'all';
+
+		$comment_type = !empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : '';
+
+		$search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
+
+		if ( isset( $_POST['num'] ) )
+			$comments_per_page = $_POST['num'];
+		else
+			$comments_per_page = (int) get_user_option( 'edit_comments_per_page' );
+
+		if ( empty( $comments_per_page ) || $comments_per_page < 1 )
+			$comments_per_page = 20;
+		$comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
+
+		$page = $this->get_pagenum();
+
+		$start = $offset = ( $page - 1 ) * $comments_per_page;
+
+		$args = array(
+			'status' => ( 'moderated' == $comment_status ) ? 'hold' : $comment_status, // TODO: replace all instances of 'moderated' with 'hold'
+			'search' => $search,
+			'offset' => $start,
+			'number' => $comments_per_page + 8, // Grab a few extra
+			'post_id' => $post_id,
+			'plural' => $comment_type,
+			'orderby' => @$_REQUEST['orderby'],
+			'order' => @$_REQUEST['order'],
+		);
+
+		$_comments = get_comments( $args );
+
+		update_comment_cache( $_comments );
+
+		$args['count'] = true;
+		$args['offset'] = 0;
+		$args['number'] = 0;
+		$total_comments = get_comments( $args );
+
+		$_comment_post_ids = array();
+		foreach ( $_comments as $_c ) {
+			$_comment_post_ids[] = $_c->comment_post_ID;
+		}
+
+		$_comment_pending_count = get_pending_comments_num( $_comment_post_ids );
+
+		$this->items = array_slice( $_comments, 0, $comments_per_page );
+		$this->extra_items = array_slice( $_comments, $comments_per_page );
+
+		$this->set_pagination_args( array(
+			'total_items' => $total_comments,
+			'per_page' => $comments_per_page,
+		) );
+	}
+
+	function get_bulk_actions() {
+		global $comment_status;
+
+		$actions = array();
+		if ( in_array( $comment_status, array( 'all', 'approved' ) ) )
+			$actions['unapprove'] = __( 'Unapprove' );
+		if ( in_array( $comment_status, array( 'all', 'moderated', 'spam' ) ) )
+			$actions['approve'] = __( 'Approve' );
+		if ( in_array( $comment_status, array( 'all', 'moderated', 'approved' ) ) )
+			$actions['spam'] = _x( 'Mark as Spam', 'comment' );
+
+		if ( 'trash' == $comment_status )
+			$actions['untrash'] = __( 'Restore' );
+		elseif ( 'spam' == $comment_status )
+			$actions['unspam'] = _x( 'Not Spam', 'comment' );
+
+		if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS )
+			$actions['delete'] = __( 'Delete Permanently' );
+		else
+			$actions['trash'] = __( 'Move to Trash' );
+
+		return $actions;
+	}
+
+	function extra_tablenav( $which ) {
+		global $comment_status, $comment_type;
+?>
+		<div class="alignleft actions">
+<?php
+		if ( 'top' == $which ) {
+?>
+			<select name="comment_type">
+				<option value="all"><?php _e( 'Show all comment types' ); ?></option>
+<?php
+				$comment_types = apply_filters( 'admin_comment_types_dropdown', array(
+					'comment' => __( 'Comments' ),
+					'pings' => __( 'Pings' ),
+				) );
+
+				foreach ( $comment_types as $type => $label )
+					echo "\t<option value='" . esc_attr( $type ) . "'" . selected( $comment_type, $type, false ) . ">$label</option>\n";
+			?>
+			</select>
+			<input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Filter' ); ?>" class="button-secondary" />
+<?php
+		}
+
+		if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) {
+			wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
+			$title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
+?>
+			<input type="submit" name="delete_all" id="delete_all" value="<?php echo $title ?>" class="button-secondary apply" />
+<?php
+		}
+?>
+		</div>
+<?php
+		do_action( 'manage_comments_nav', $comment_status );
+	}
+
+	function get_columns() {
+		return array(
+			'cb'       => '<input type="checkbox" />',
+			'author'   => __( 'Author' ),
+			/* translators: column name */
+			'comment'  => _x( 'Comment', 'column name' ),
+			'response' => __( 'In Response To' )
+		);
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'author'   => 'comment_author',
+			'comment'  => 'comment_content',
+			'response' => 'comment_post_ID'
+		);
+	}
+
+	function display_table() {
+		extract( $this->_args );
+
+		$this->display_tablenav( 'top' );
+
+?>
+<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0">
+	<thead>
+	<tr>
+		<?php $this->print_column_headers(); ?>
+	</tr>
+	</thead>
+
+	<tfoot>
+	<tr>
+		<?php $this->print_column_headers( false ); ?>
+	</tr>
+	</tfoot>
+
+	<tbody id="the-comment-list" class="list:comment">
+		<?php $this->display_rows( $this->items ); ?>
+	</tbody>
+
+	<tbody id="the-extra-comment-list" class="list:comment" style="display: none;">
+		<?php $this->display_rows( $this->extra_items ); ?>
+	</tbody>
+</table>
+<?php
+
+		$this->display_tablenav( 'bottom' );
+	}
+
+	function display_rows( $items = array() ) {
+		global $mode, $comment_status;
+
+		if ( empty( $items ) )
+			$items = $this->items;
+
+		foreach ( $items as $comment )
+			$this->single_row( $comment->comment_ID, $mode, $comment_status );
+	}
+
+	function single_row( $comment_id, $mode, $comment_status, $checkbox = true, $from_ajax = false ) {
+		global $comment, $post, $_comment_pending_count;
+		$comment = get_comment( $comment_id );
+		$post = get_post( $comment->comment_post_ID );
+		$the_comment_status = wp_get_comment_status( $comment->comment_ID );
+		$post_type_object = get_post_type_object( $post->post_type );
+		$user_can = current_user_can( $post_type_object->cap->edit_post, $post->ID );
+
+		$comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
+		$author_url = get_comment_author_url();
+		if ( 'http://' == $author_url )
+			$author_url = '';
+		$author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
+		if ( strlen( $author_url_display ) > 50 )
+			$author_url_display = substr( $author_url_display, 0, 49 ) . '...';
+
+		$ptime = date( 'G', strtotime( $comment->comment_date ) );
+		if ( ( abs( time() - $ptime ) ) < 86400 )
+			$ptime = sprintf( __( '%s ago' ), human_time_diff( $ptime ) );
+		else
+			$ptime = mysql2date( __( 'Y/m/d \a\t g:i A' ), $comment->comment_date );
+
+		if ( $user_can ) {
+			$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
+			$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
+
+			$url = "comment.php?post_ID=$post->ID&c=$comment->comment_ID";
+
+			$approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" );
+			$unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" );
+			$spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" );
+			$unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" );
+			$trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" );
+			$untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" );
+			$delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" );
+		}
+
+		echo "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>";
+
+		list( $columns, $hidden ) = $this->get_column_headers();
+
+		foreach ( $columns as $column_name => $column_display_name ) {
+			$class = "class=\"$column_name column-$column_name\"";
+
+			$style = '';
+			if ( in_array( $column_name, $hidden ) )
+				$style = ' style="display:none;"';
+
+			$attributes = "$class$style";
+
+			switch ( $column_name ) {
+				case 'cb':
+					if ( !$checkbox ) break;
+					echo '<th scope="row" class="check-column">';
+					if ( $user_can ) echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
+					echo '</th>';
+					break;
+				case 'comment':
+					echo "<td $attributes>";
+					echo '<div id="submitted-on">';
+					/* translators: 2: comment date, 3: comment time */
+					printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
+						/* translators: comment date format. See http://php.net/date */ get_comment_date( __( 'Y/m/d' ) ),
+						/* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
+
+					if ( $comment->comment_parent ) {
+						$parent = get_comment( $comment->comment_parent );
+						$parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
+						$name = get_comment_author( $parent->comment_ID );
+						printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
+					}
+
+					echo '</div>';
+					comment_text();
+					if ( $user_can ) { ?>
+					<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
+					<textarea class="comment" rows="1" cols="1"><?php echo esc_html( apply_filters( 'comment_edit_pre', $comment->comment_content ) ); ?></textarea>
+					<div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
+					<div class="author"><?php echo esc_attr( $comment->comment_author ); ?></div>
+					<div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
+					<div class="comment_status"><?php echo $comment->comment_approved; ?></div>
+					</div>
+					<?php
+					}
+
+					if ( $user_can ) {
+						// preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
+						$actions = array(
+							'approve' => '', 'unapprove' => '',
+							'reply' => '',
+							'quickedit' => '',
+							'edit' => '',
+							'spam' => '', 'unspam' => '',
+							'trash' => '', 'untrash' => '', 'delete' => ''
+						);
+
+						if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
+							if ( 'approved' == $the_comment_status )
+								$actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+							else if ( 'unapproved' == $the_comment_status )
+								$actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+						} else {
+							$actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+							$actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+						}
+
+						if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
+							$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+						} elseif ( 'spam' == $the_comment_status ) {
+							$actions['unspam'] = "<a href='$unspam_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1 vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</a>';
+						} elseif ( 'trash' == $the_comment_status ) {
+							$actions['untrash'] = "<a href='$untrash_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1 vim-z vim-destructive'>" . __( 'Restore' ) . '</a>';
+						}
+
+						if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) {
+							$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::delete=1 delete vim-d vim-destructive'>" . __( 'Delete Permanently' ) . '</a>';
+						} else {
+							$actions['trash'] = "<a href='$trash_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
+						}
+
+						if ( 'trash' != $the_comment_status ) {
+							$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
+							$actions['quickedit'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+							if ( 'spam' != $the_comment_status )
+								$actions['reply'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
+						}
+
+						$actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
+
+						$i = 0;
+						echo '<div class="row-actions">';
+						foreach ( $actions as $action => $link ) {
+							++$i;
+							( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
+
+							// Reply and quickedit need a hide-if-no-js span when not added with ajax
+							if ( ( 'reply' == $action || 'quickedit' == $action ) && ! $from_ajax )
+								$action .= ' hide-if-no-js';
+							elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) {
+								if ( '1' == get_comment_meta( $comment_id, '_wp_trash_meta_status', true ) )
+									$action .= ' approve';
+								else
+									$action .= ' unapprove';
+							}
+
+							echo "<span class='$action'>$sep$link</span>";
+						}
+						echo '</div>';
+					}
+
+					echo '</td>';
+					break;
+				case 'author':
+					echo "<td $attributes><strong>"; comment_author(); echo '</strong><br />';
+					if ( !empty( $author_url ) )
+						echo "<a title='$author_url' href='$author_url'>$author_url_display</a><br />";
+					if ( $user_can ) {
+						if ( !empty( $comment->comment_author_email ) ) {
+							comment_author_email_link();
+							echo '<br />';
+						}
+						echo '<a href="edit-comments.php?s=';
+						comment_author_IP();
+						echo '&amp;mode=detail';
+						if ( 'spam' == $comment_status )
+							echo '&amp;comment_status=spam';
+						echo '">';
+						comment_author_IP();
+						echo '</a>';
+					} //current_user_can
+					echo '</td>';
+					break;
+				case 'date':
+					echo "<td $attributes>" . get_comment_date( __( 'Y/m/d \a\t g:ia' ) ) . '</td>';
+					break;
+				case 'response':
+					if ( 'single' !== $mode ) {
+						if ( isset( $_comment_pending_count[$post->ID] ) ) {
+							$pending_comments = $_comment_pending_count[$post->ID];
+						} else {
+							$_comment_pending_count_temp = get_pending_comments_num( array( $post->ID ) );
+							$pending_comments = $_comment_pending_count[$post->ID] = $_comment_pending_count_temp[$post->ID];
+						}
+						if ( $user_can ) {
+							$post_link = "<a href='" . get_edit_post_link( $post->ID ) . "'>";
+							$post_link .= get_the_title( $post->ID ) . '</a>';
+						} else {
+							$post_link = get_the_title( $post->ID );
+						}
+						echo "<td $attributes>\n";
+						echo '<div class="response-links"><span class="post-com-count-wrapper">';
+						echo $post_link . '<br />';
+						$pending_phrase = esc_attr( sprintf( __( '%s pending' ), number_format( $pending_comments ) ) );
+						if ( $pending_comments )
+							echo '<strong>';
+						comments_number(
+							"<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+							. /* translators: comment count link */ _x( '0', 'comment count' ) . '</span></a>',
+							"<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+							. /* translators: comment count link */ _x( '1', 'comment count' ) . '</span></a>',
+							"<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
+							. /* translators: comment count link: % will be substituted by comment count */ _x( '%', 'comment count' ) . '</span></a>'
+						);
+						if ( $pending_comments )
+							echo '</strong>';
+						echo '</span> ';
+						echo "<a href='" . get_permalink( $post->ID ) . "'>#</a>";
+						echo '</div>';
+						if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) )
+							echo $thumb;
+						echo '</td>';
+					}
+					break;
+				default:
+					echo "<td $attributes>\n";
+					do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
+					echo "</td>\n";
+					break;
+			}
+		}
+		echo "</tr>\n";
+	}
+}
+
+class WP_Links_Table extends WP_List_Table {
+
+	function WP_Links_Table() {
+		global $cat_id, $s, $orderby, $order;
+
+		wp_reset_vars( array( 'action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'orderby', 'order', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]', 's' ) );
+
+		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
+
+		if ( 'all' != $cat_id )
+			$args['category'] = $cat_id;
+		if ( !empty( $s ) )
+			$args['search'] = $s;
+		if ( !empty( $orderby ) )
+			$args['orderby'] = $orderby;
+		if ( !empty( $order ) )
+			$args['order'] = $order;
+
+		$this->items = get_bookmarks( $args );
+
+		parent::WP_List_Table( array(
+			'screen' => 'link-manager',
+			'plural' => 'bookmarks',
+		) );
+	}
+
+	function no_items() {
+		_e( 'No links found.' );
+	}
+
+	function get_bulk_actions() {
+		$actions = array();
+		$actions['delete'] = __( 'Delete' );
+
+		return $actions;
+	}
+
+	function extra_tablenav( $which ) {
+		global $cat_id;
+
+		if ( 'top' != $which )
+			return;
+?>
+		<div class="alignleft actions">
+<?php
+			$dropdown_options = array(
+				'selected' => $cat_id,
+				'name' => 'cat_id',
+				'taxonomy' => 'link_category',
+				'show_option_all' => __( 'View all categories' ),
+				'hide_empty' => true,
+				'hierarchical' => 1,
+				'show_count' => 0,
+				'orderby' => 'name',
+			);
+			wp_dropdown_categories( $dropdown_options );
+?>
+			<input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Filter' ); ?>" class="button-secondary" />
+		</div>
+<?php
+	}
+
+	function get_columns() {
+		return array(
+			'cb'         => '<input type="checkbox" />',
+			'name'       => __( 'Name' ),
+			'url'        => __( 'URL' ),
+			'categories' => __( 'Categories' ),
+			'rel'        => __( 'Relationship' ),
+			'visible'    => __( 'Visible' ),
+			'rating'     => __( 'Rating' )
+		);
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'name'    => 'name',
+			'url'     => 'url',
+			'visible' => 'visible',
+			'rating'  => 'rating'
+		);
+	}
+
+	function display_rows() {
+		global $cat_id;
+
+		$alt = 0;
+
+		foreach ( $this->items as $link ) {
+			$link = sanitize_bookmark( $link );
+			$link->link_name = esc_attr( $link->link_name );
+			$link->link_category = wp_get_link_cats( $link->link_id );
+
+			$short_url = str_replace( 'http://', '', $link->link_url );
+			$short_url = preg_replace( '/^www\./i', '', $short_url );
+			if ( '/' == substr( $short_url, -1 ) )
+				$short_url = substr( $short_url, 0, -1 );
+			if ( strlen( $short_url ) > 35 )
+				$short_url = substr( $short_url, 0, 32 ).'...';
+
+			$visible = ( $link->link_visible == 'Y' ) ? __( 'Yes' ) : __( 'No' );
+			$rating  = $link->link_rating;
+			$style = ( $alt++ % 2 ) ? '' : ' class="alternate"';
+
+			$edit_link = get_edit_bookmark_link( $link );
+?>
+		<tr id="link-<?php echo $link->link_id; ?>" valign="middle" <?php echo $style; ?>>
+<?php
+
+			list( $columns, $hidden ) = $this->get_column_headers();
+
+			foreach ( $columns as $column_name => $column_display_name ) {
+				$class = "class='column-$column_name'";
+
+				$style = '';
+				if ( in_array( $column_name, $hidden ) )
+					$style = ' style="display:none;"';
+
+				$attributes = $class . $style;
+
+				switch ( $column_name ) {
+					case 'cb':
+						echo '<th scope="row" class="check-column"><input type="checkbox" name="linkcheck[]" value="'. esc_attr( $link->link_id ) .'" /></th>';
+						break;
+
+					case 'name':
+						echo "<td $attributes><strong><a class='row-title' href='$edit_link' title='" . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ) . "'>$link->link_name</a></strong><br />";
+						$actions = array();
+						$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+						$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ) . "' onclick=\"if ( confirm( '" . esc_js( sprintf( __( "You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ) . "' ) ) { return true;}return false;\">" . __( 'Delete' ) . "</a>";
+						$action_count = count( $actions );
+						$i = 0;
+						echo '<div class="row-actions">';
+						foreach ( $actions as $action => $linkaction ) {
+							++$i;
+							( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+							echo "<span class='$action'>$linkaction$sep</span>";
+						}
+						echo '</div>';
+						echo '</td>';
+						break;
+					case 'url':
+						echo "<td $attributes><a href='$link->link_url' title='".sprintf( __( 'Visit %s' ), $link->link_name )."'>$short_url</a></td>";
+						break;
+					case 'categories':
+						?><td <?php echo $attributes ?>><?php
+						$cat_names = array();
+						foreach ( $link->link_category as $category ) {
+							$cat = get_term( $category, 'link_category', OBJECT, 'display' );
+							if ( is_wp_error( $cat ) )
+								echo $cat->get_error_message();
+							$cat_name = $cat->name;
+							if ( $cat_id != $category )
+								$cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
+							$cat_names[] = $cat_name;
+						}
+						echo implode( ', ', $cat_names );
+						?></td><?php
+						break;
+					case 'rel':
+						?><td <?php echo $attributes ?>><?php echo empty( $link->link_rel ) ? '<br />' : $link->link_rel; ?></td><?php
+						break;
+					case 'visible':
+						?><td <?php echo $attributes ?>><?php echo $visible; ?></td><?php
+						break;
+					case 'rating':
+	 					?><td <?php echo $attributes ?>><?php echo $rating; ?></td><?php
+						break;
+					default:
+						?>
+						<td <?php echo $attributes ?>><?php do_action( 'manage_link_custom_column', $column_name, $link->link_id ); ?></td>
+						<?php
+						break;
+				}
+			}
+?>
+		</tr>
+<?php
+		}
+	}
+}
+
+class WP_Sites_Table extends WP_List_Table {
+
+	function WP_Sites_Table() {
+		global $s, $mode, $wpdb;
+
+		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
+
+		parent::WP_List_Table( array(
+			'callback' => 'site_rows',
+			'screen' => 'ms-sites',
+		) );
+
+		$pagenum = $this->get_pagenum();
+
+		$per_page = (int) get_user_option( 'ms_sites_per_page' );
+		if ( empty( $per_page ) || $per_page < 1 )
+			$per_page = 20;
+
+		$per_page = apply_filters( 'ms_sites_per_page', $per_page );
+
+		$s = isset( $_REQUEST['s'] ) ? stripslashes( trim( $_REQUEST[ 's' ] ) ) : '';
+		$like_s = esc_sql( like_escape( $s ) );
+
+		$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
+
+		if ( isset( $_REQUEST['searchaction'] ) ) {
+			if ( 'name' == $_REQUEST['searchaction'] ) {
+				$query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$like_s}%' OR {$wpdb->blogs}.path LIKE '%{$like_s}%' ) ";
+			} elseif ( 'id' == $_REQUEST['searchaction'] ) {
+				$query .= " AND {$wpdb->blogs}.blog_id = '{$like_s}' ";
+			} elseif ( 'ip' == $_REQUEST['searchaction'] ) {
+				$query = "SELECT *
+					FROM {$wpdb->blogs}, {$wpdb->registration_log}
+					WHERE site_id = '{$wpdb->siteid}'
+					AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
+					AND {$wpdb->registration_log}.IP LIKE ( '%{$like_s}%' )";
+			}
+		}
+
+		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : 'id';
+		if ( $order_by == 'registered' ) {
+			$query .= ' ORDER BY registered ';
+		} elseif ( $order_by == 'lastupdated' ) {
+			$query .= ' ORDER BY last_updated ';
+		} elseif ( $order_by == 'blogname' ) {
+			$query .= ' ORDER BY domain ';
+		} else {
+			$order_by = 'id';
+			$query .= " ORDER BY {$wpdb->blogs}.blog_id ";
+		}
+
+		$order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+		$query .= $order;
+
+		$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+
+		$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
+		$this->items = $wpdb->get_results( $query, ARRAY_A );
+
+		$this->set_pagination_args( array(
+			'total_items' => $total,
+			'per_page' => $per_page,
+		) );
+	}
+
+	function no_items() {
+		_e( 'No sites found.' );
+	}
+
+	function get_bulk_actions() {
+		$actions = array();
+		$actions['delete'] = __( 'Delete' );
+		$actions['spam'] = _x( 'Mark as Spam', 'site' );
+		$actions['notspam'] = _x( 'Not Spam', 'site' );
+
+		return $actions;
+	}
+
+	function pagination( $which ) {
+		global $mode;
+
+		parent::pagination( $which );
+
+		if ( 'top' == $which )
+			$this->view_switcher( $mode );
+	}
+
+	function get_columns() {
+		$blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' );
+		$sites_columns = array(
+			'cb'          => '<input type="checkbox" />',
+			'blogname'    => $blogname_columns,
+			'lastupdated' => __( 'Last Updated' ),
+			'registered'  => _x( 'Registered', 'site' ),
+			'users'       => __( 'Users' )
+		);
+
+		if ( has_filter( 'wpmublogsaction' ) )
+			$sites_columns['plugins'] = __( 'Actions' );
+
+		$sites_columns = apply_filters( 'wpmu_blogs_columns', $sites_columns );
+
+		return $sites_columns;
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'id'          => 'id',
+			'blogname'    => 'blogname',
+			'lastupdated' => 'lastupdated',
+			'registered'  => 'registered',
+		);
+	}
+
+	function display_rows() {
+		global $current_site, $mode;
+
+		$status_list = array(
+			'archived' => array( 'site-archived', __( 'Archived' ) ),
+			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
+			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
+			'mature'   => array( 'site-mature', __( 'Mature' ) )
+		);
+
+		$class = '';
+		foreach ( $this->items as $blog ) {
+			$class = ( 'alternate' == $class ) ? '' : 'alternate';
+			reset( $status_list );
+
+			$blog_states = array();
+			foreach ( $status_list as $status => $col ) {
+				if ( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
+					$class = $col[0];
+					$blog_states[] = $col[1];
+				}
+			}
+			$blog_state = '';
+			if ( ! empty( $blog_states ) ) {
+				$state_count = count( $blog_states );
+				$i = 0;
+				$blog_state .= ' - ';
+				foreach ( $blog_states as $state ) {
+					++$i;
+					( $i == $state_count ) ? $sep = '' : $sep = ', ';
+					$blog_state .= "<span class='post-state'>$state$sep</span>";
+				}
+			}
+			echo "<tr class='$class'>";
+
+			$blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path'];
+
+			list( $columns, $hidden ) = $this->get_column_headers();
+
+			foreach ( $columns as $column_name => $column_display_name ) {
+				switch ( $column_name ) {
+					case 'cb': ?>
+						<th scope="row" class="check-column">
+							<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
+						</th>
+					<?php
+					break;
+
+					case 'id': ?>
+						<th valign="top" scope="row">
+							<?php echo $blog['blog_id'] ?>
+						</th>
+					<?php
+					break;
+
+					case 'blogname': ?>
+						<td class="column-title">
+							<a href="<?php echo esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
+							<?php
+							if ( 'list' != $mode )
+								echo '<p>' . sprintf( _x( '%1$s &#8211; <em>%2$s</em>', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '</p>';
+
+							// Preordered.
+							$actions = array(
+								'edit' => '', 'backend' => '',
+								'activate' => '', 'deactivate' => '',
+								'archive' => '', 'unarchive' => '',
+								'spam' => '', 'unspam' => '',
+								'delete' => '',
+								'visit' => '',
+							);
+
+							$actions['edit']	= '<span class="edit"><a href="' . esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a></span>';
+							$actions['backend']	= "<span class='backend'><a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>';
+							if ( $current_site->blog_id != $blog['blog_id'] ) {
+								if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
+									$actions['activate']	= '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
+								else
+									$actions['deactivate']	= '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
+
+								if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
+									$actions['unarchive']	= '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' .  $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
+								else
+									$actions['archive']	= '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';
+
+								if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
+									$actions['unspam']	= '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a></span>';
+								else
+									$actions['spam']	= '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '">' . _x( 'Spam', 'site' ) . '</a></span>';
+
+								$actions['delete']	= '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>';
+							}
+
+							$actions['visit']	= "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a></span>';
+							$actions = array_filter( $actions );
+							if ( count( $actions ) ) : ?>
+							<div class="row-actions">
+								<?php echo implode( ' | ', $actions ); ?>
+							</div>
+							<?php endif; ?>
+						</td>
+					<?php
+					break;
+
+					case 'lastupdated': ?>
+						<td valign="top">
+							<?php
+							if ( 'list' == $mode )
+								$date = 'Y/m/d';
+							else
+								$date = 'Y/m/d \<\b\r \/\> g:i:s a';
+							echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( __( $date ), $blog['last_updated'] ); ?>
+						</td>
+					<?php
+					break;
+				case 'registered': ?>
+						<td valign="top">
+						<?php
+						if ( $blog['registered'] == '0000-00-00 00:00:00' )
+							echo '&#x2014;';
+						else
+							echo mysql2date( __( $date ), $blog['registered'] );
+						?>
+						</td>
+				<?php
+				break;
+					case 'users': ?>
+						<td valign="top">
+							<?php
+							$blogusers = get_users_of_blog( $blog['blog_id'] );
+							if ( is_array( $blogusers ) ) {
+								$blogusers_warning = '';
+								if ( count( $blogusers ) > 5 ) {
+									$blogusers = array_slice( $blogusers, 0, 5 );
+									$blogusers_warning = __( 'Only showing first 5 users.' ) . ' <a href="' . esc_url( get_admin_url( $blog['blog_id'], 'users.php' ) ) . '">' . __( 'More' ) . '</a>';
+								}
+								foreach ( $blogusers as $key => $val ) {
+									echo '<a href="' . esc_url( admin_url( 'user-edit.php?user_id=' . $val->user_id ) ) . '">' . esc_html( $val->user_login ) . '</a> ';
+									if ( 'list' != $mode )
+										echo '( ' . $val->user_email . ' )';
+									echo '<br />';
+								}
+								if ( $blogusers_warning != '' )
+									echo '<strong>' . $blogusers_warning . '</strong><br />';
+							}
+							?>
+						</td>
+					<?php
+					break;
+
+					case 'plugins': ?>
+						<?php if ( has_filter( 'wpmublogsaction' ) ) { ?>
+						<td valign="top">
+							<?php do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
+						</td>
+						<?php } ?>
+					<?php break;
+
+					default: ?>
+						<?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?>
+						<td valign="top">
+							<?php do_action( 'manage_blogs_custom_column', $column_name, $blog['blog_id'] ); ?>
+						</td>
+						<?php } ?>
+					<?php break;
+				}
+			}
+			?>
+			</tr>
+			<?php
+		}
+	}
+}
+
+class WP_MS_Users_Table extends WP_List_Table {
+
+	function WP_MS_Users_Table() {
+		global $s, $mode, $wpdb;
+
+		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
+
+		parent::WP_List_Table( array(
+			'screen' => 'ms-users',
+		) );
+
+		$pagenum = $this->get_pagenum();
+
+		$per_page = (int) get_user_option( 'ms_users_per_page' );
+		if ( empty( $per_page ) || $per_page < 1 )
+			$per_page = 20;
+
+		$per_page = apply_filters( 'ms_users_per_page', $per_page );
+
+		$s = isset( $_REQUEST['s'] ) ? stripslashes( trim( $_REQUEST[ 's' ] ) ) : '';
+		$like_s = esc_sql( like_escape( $s ) );
+
+		$query = "SELECT * FROM {$wpdb->users}";
+
+		if ( !empty( $like_s ) ) {
+			$query .= " WHERE user_login LIKE '%$like_s%' OR user_email LIKE '%$like_s%'";
+		}
+
+		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : 'id';
+		if ( $order_by == 'email' ) {
+			$query .= ' ORDER BY user_email ';
+		} elseif ( $order_by == 'login' ) {
+			$query .= ' ORDER BY user_login ';
+		} elseif ( $order_by == 'name' ) {
+			$query .= ' ORDER BY display_name ';
+		} elseif ( $order_by == 'registered' ) {
+			$query .= ' ORDER BY user_registered ';
+		} else {
+			$order_by = 'id';
+			$query .= ' ORDER BY ID ';
+		}
+
+		$order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC';
+		$query .= $order;
+
+		$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( ID )', $query ) );
+
+		$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
+
+		$this->items = $wpdb->get_results( $query, ARRAY_A );
+
+		$num_pages = ceil( $total / $per_page );
+
+		$this->set_pagination_args( array(
+			'total_items' => $total,
+			'per_page' => $per_page,
+		) );
+	}
+
+	function get_bulk_actions() {
+		$actions = array();
+		$actions['delete'] = __( 'Delete' );
+		$actions['spam'] = _x( 'Mark as Spam', 'user' );
+		$actions['notspam'] = _x( 'Not Spam', 'user' );
+
+		return $actions;
+	}
+
+	function no_items() {
+		_e( 'No users found.' );
+	}
+
+	function pagination( $which ) {
+		global $mode;
+
+		parent::pagination ( $which );
+
+		if ( 'top' == $which )
+			$this->view_switcher( $mode );
+	}
+
+	function get_columns() {
+		$users_columns = array(
+			'cb'         => '<input type="checkbox" />',
+			'login'      => __( 'Login' ),
+			'name'       => __( 'Name' ),
+			'email'      => __( 'E-mail' ),
+			'registered' => _x( 'Registered', 'user' ),
+			'blogs'      => __( 'Sites' )
+		);
+		$users_columns = apply_filters( 'wpmu_users_columns', $users_columns );
+
+		return $users_columns;
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'id'         => 'id',
+			'login'      => 'login',
+			'name'       => 'name',
+			'email'      => 'email',
+			'registered' => 'registered',
+		);
+	}
+
+	function display_rows() {
+		global $current_site, $mode;
+
+		$class = '';
+		$super_admins = get_super_admins();
+		foreach ( $this->items as $user ) {
+			$class = ( 'alternate' == $class ) ? '' : 'alternate';
+
+			$status_list = array( 'spam' => 'site-spammed', 'deleted' => 'site-deleted' );
+
+			foreach ( $status_list as $status => $col ) {
+				if ( $user[$status] )
+					$class = $col;
+			}
+
+			?>
+			<tr class="<?php echo $class; ?>">
+			<?php
+
+			list( $columns, $hidden ) = $this->get_column_headers();
+
+			foreach ( $columns as $column_name => $column_display_name ) :
+				switch ( $column_name ) {
+					case 'cb': ?>
+						<th scope="row" class="check-column">
+							<input type="checkbox" id="blog_<?php echo $user['ID'] ?>" name="allusers[]" value="<?php echo esc_attr( $user['ID'] ) ?>" />
+						</th>
+					<?php
+					break;
+
+					case 'id': ?>
+						<th valign="top" scope="row">
+							<?php echo $user['ID'] ?>
+						</th>
+					<?php
+					break;
+
+					case 'login':
+						$avatar	= get_avatar( $user['user_email'], 32 );
+						$edit_link = ( get_current_user_id() == $user['ID'] ) ? 'profile.php' : 'user-edit.php?user_id=' . $user['ID'];
+						?>
+						<td class="username column-username">
+							<?php echo $avatar; ?><strong><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user['user_login'] ); ?></a><?php
+							if ( in_array( $user['user_login'], $super_admins ) )
+								echo ' - ' . __( 'Super admin' );
+							?></strong>
+							<br/>
+							<div class="row-actions">
+								<span class="edit"><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>"><?php _e( 'Edit' ); ?></a></span>
+								<?php if ( ! in_array( $user['user_login'], $super_admins ) ) { ?>
+								| <span class="delete"><a href="<?php echo $delete	= esc_url( admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'ms-edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) ) ); ?>" class="delete"><?php _e( 'Delete' ); ?></a></span>
+								<?php } ?>
+							</div>
+						</td>
+					<?php
+					break;
+
+					case 'name': ?>
+						<td class="name column-name"><?php echo $user['display_name'] ?></td>
+					<?php
+					break;
+
+					case 'email': ?>
+						<td class="email column-email"><a href="mailto:<?php echo $user['user_email'] ?>"><?php echo $user['user_email'] ?></a></td>
+					<?php
+					break;
+
+					case 'registered':
+						if ( 'list' == $mode )
+							$date = 'Y/m/d';
+						else
+							$date = 'Y/m/d \<\b\r \/\> g:i:s a';
+					?>
+						<td><?php echo mysql2date( __( $date ), $user['user_registered'] ); ?></td>
+					<?php
+					break;
+
+					case 'blogs':
+						$blogs = get_blogs_of_user( $user['ID'], true );
+						?>
+						<td>
+							<?php
+							if ( is_array( $blogs ) ) {
+								foreach ( (array) $blogs as $key => $val ) {
+									$path	= ( $val->path == '/' ) ? '' : $val->path;
+									echo '<a href="'. esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
+									echo ' <small class="row-actions">';
+
+									// Edit
+									echo '<a href="'. esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a> | ';
+
+									// View
+									echo '<a ';
+									if ( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
+										echo 'style="background-color: #faa" ';
+									echo 'href="' .  esc_url( get_home_url( $val->userblog_id ) )  . '">' . __( 'View' ) . '</a>';
+
+									echo '</small><br />';
+								}
+							}
+							?>
+						</td>
+					<?php
+					break;
+
+					default: ?>
+						<td><?php do_action( 'manage_users_custom_column', $column_name, $user['ID'] ); ?></td>
+					<?php
+					break;
+				}
+			endforeach
+			?>
+			</tr>
+			<?php
+		}
+	}
+}
+
+class WP_Plugins_Table extends WP_List_Table {
+
+	function WP_Plugins_Table() {
+		global $status, $plugins, $totals, $page, $orderby, $order, $s;
+
+		parent::WP_List_Table( array(
+			'screen' => 'plugins',
+			'plural' => 'plugins',
+		) );
+
+		wp_reset_vars( array( 'orderby', 'order', 's' ) );
+
+		$default_status = get_user_option( 'plugins_last_view' );
+		if ( empty( $default_status ) )
+			$default_status = 'all';
+		$status = isset( $_REQUEST['plugin_status'] ) ? $_REQUEST['plugin_status'] : $default_status;
+		if ( !in_array( $status, array( 'all', 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins', 'search' ) ) )
+			$status = 'all';
+		if ( $status != $default_status && 'search' != $status )
+			update_user_meta( get_current_user_id(), 'plugins_last_view', $status );
+
+		$page = $this->get_pagenum();
+
+		$plugins = array(
+			'all' => apply_filters( 'all_plugins', get_plugins() ),
+			'search' => array(),
+			'active' => array(),
+			'inactive' => array(),
+			'recent' => array(),
+			'recently_activated' => get_option( 'recently_activated', array() ),
+			'upgrade' => array(),
+			'mustuse' => array(),
+			'dropins' => array()
+		);
+
+		if ( ! is_multisite() || ( is_network_admin() && current_user_can('manage_network_plugins') ) ) {
+			if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) )
+				$plugins['mustuse'] = get_mu_plugins();
+			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
+				$plugins['dropins'] = get_dropins();
+		}
+
+		set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), 86400 );
+
+		// Clean out any plugins which were deactivated over a week ago.
+		foreach ( $plugins['recently_activated'] as $key => $time )
+			if ( $time + ( 7*24*60*60 ) < time() ) //1 week
+				unset( $plugins['recently_activated'][$key] );
+		update_option( 'recently_activated', $plugins['recently_activated'] );
+		$current = get_site_transient( 'update_plugins' );
+
+		foreach ( array( 'all', 'mustuse', 'dropins' ) as $type ) {
+			foreach ( (array) $plugins[$type] as $plugin_file => $plugin_data ) {
+				// Translate, Apply Markup, Sanitize HTML
+				$plugins[$type][$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
+			}
+		}
+
+		foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+			// Filter into individual sections
+			if ( is_plugin_active_for_network($plugin_file) && !is_network_admin() ) {
+				unset( $plugins['all'][ $plugin_file ] );
+				continue;
+			} elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
+				$plugins['network'][ $plugin_file ] = $plugin_data;
+			} elseif ( is_plugin_active( $plugin_file ) ) {
+				$plugins['active'][ $plugin_file ] = $plugin_data;
+			} else {
+				if ( !is_network_admin() && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
+					$plugins['recent'][ $plugin_file ] = $plugin_data;
+				$plugins['inactive'][ $plugin_file ] = $plugin_data;
+			}
+
+			if ( isset( $current->response[ $plugin_file ] ) )
+				$plugins['upgrade'][ $plugin_file ] = $plugin_data;
+		}
+
+		if ( !current_user_can( 'update_plugins' ) )
+			$plugins['upgrade'] = array();
+
+		if ( $s ) {
+			function _search_plugins_filter_callback( $plugin ) {
+				static $term;
+				if ( is_null( $term ) )
+					$term = stripslashes( $_REQUEST['s'] );
+
+				foreach ( $plugin as $value )
+					if ( stripos( $value, $term ) !== false )
+						return true;
+
+				return false;
+			}
+			$status = 'search';
+			$plugins['search'] = array_filter( $plugins['all'], '_search_plugins_filter_callback' );
+		}
+
+		$totals = array();
+		foreach ( $plugins as $type => $list )
+			$totals[ $type ] = count( $list );
+
+		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+			$status = 'all';
+
+		$this->items = $plugins[ $status ];
+		$total_this_page = $totals[ $status ];
+
+		if ( $orderby ) {
+			$orderby = ucfirst( $orderby );
+			$order = strtoupper( $order );
+
+			function _order_plugins_callback( $plugin_a, $plugin_b ) {
+				global $orderby, $order;
+
+				$a = $plugin_a[$orderby];
+				$b = $plugin_b[$orderby];
+
+				if ( $a == $b )
+					return 0;
+
+				if ( 'DESC' == $order )
+					return ( $a < $b ) ? 1 : -1;
+				else
+					return ( $a < $b ) ? -1 : 1;
+			}
+			uasort( $this->items, '_order_plugins_callback' );
+		}
+
+		$plugins_per_page = (int) get_user_option( 'plugins_per_page' );
+		if ( empty( $plugins_per_page ) || $plugins_per_page < 1 )
+			$plugins_per_page = 999;
+		$plugins_per_page = apply_filters( 'plugins_per_page', $plugins_per_page );
+
+		$start = ( $page - 1 ) * $plugins_per_page;
+
+		if ( $total_this_page > $plugins_per_page )
+			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+
+		$this->set_pagination_args( array(
+			'total_items' => $total_this_page,
+			'per_page' => $plugins_per_page,
+		) );
+	}
+
+	function no_items() {
+		global $plugins;
+
+		if ( !empty( $plugins['all'] ) )
+			_e( 'No plugins found.' );
+		else
+			_e( 'You do not appear to have any plugins available at this time.' );
+	}
+
+	function get_columns() {
+		global $status;
+
+		return array(
+			'cb'          => !in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
+			'name'        => __( 'Plugin' ),
+			'description' => __( 'Description' ),
+		);
+	}
+
+	function get_sortable_columns() {
+		return array(
+			'name'         => 'name',
+			'description'  => 'description',
+		);
+	}
+
+	function display_tablenav( $which ) {
+		global $status;
+
+		if ( !in_array( $status, array( 'mustuse', 'dropins' ) ) )
+			parent::display_tablenav( $which );
+	}
+
+	function get_bulk_actions() {
+		global $status;
+
+		$actions = array();
+		if ( 'active' != $status )
+			$actions['activate-selected'] = __( 'Activate' );
+		if ( is_multisite() && 'network' != $status )
+			$actions['network-activate-selected'] = __( 'Network Activate' );
+		if ( 'inactive' != $status && 'recent' != $status )
+			$actions['deactivate-selected'] = __( 'Deactivate' );
+		if ( current_user_can( 'update_plugins' ) )
+			$actions['update-selected'] = __( 'Update' );
+		if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
+			$actions['delete-selected'] = __( 'Delete' );
+
+		return $actions;
+	}
+
+	function bulk_actions( $which ) {
+		global $status;
+
+		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
+			return;
+
+		parent::bulk_actions( $which );
+	}
+
+	function extra_tablenav( $which ) {
+		global $status;
+
+		if ( 'recently_activated' == $status ) { ?>
+			<div class="alignleft actions">
+				<input type="submit" name="clear-recent-list" value="<?php esc_attr_e( 'Clear List' ) ?>" class="button-secondary" />
+			</div>
+		<?php }
+	}
+
+	function display_rows() {
+		global $status, $page;
+
+		$context = $status;
+
+		foreach ( $this->items as $plugin_file => $plugin_data ) {
+			// preorder
+			$actions = array(
+				'network_deactivate' => '', 'deactivate' => '',
+				'network_only' => '', 'activate' => '',
+				'network_activate' => '',
+				'edit' => '',
+				'delete' => '',
+			);
+
+			if ( 'mustuse' == $context ) {
+				if ( is_multisite() && !is_network_admin() )
+					continue;
+				$is_active = true;
+			} elseif ( 'dropins' == $context ) {
+				if ( is_multisite() && !is_network_admin() )
+					continue;
+				$dropins = _get_dropins();
+				$plugin_name = $plugin_file;
+				if ( $plugin_file != $plugin_data['Name'] )
+					$plugin_name .= '<br/>' . $plugin_data['Name'];
+				if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
+					$is_active = true;
+					$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
+				} elseif ( constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
+					$is_active = true;
+					$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
+				} else {
+					$is_active = false;
+					$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="attention">' . __('Inactive:') . '</span></strong> ' . sprintf( __( 'Requires <code>%s</code> in <code>wp-config.php</code>.' ), "define('" . $dropins[ $plugin_file ][1] . "', true);" ) . '</p>';
+				}
+				if ( $plugin_data['Description'] )
+					$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			} else {
+				$is_active_for_network = is_plugin_active_for_network($plugin_file);
+				if ( is_network_admin() )
+					$is_active = $is_active_for_network;
+				else
+					$is_active = is_plugin_active( $plugin_file );
+
+				if ( $is_active_for_network && !is_super_admin() && !is_network_admin() )
+					continue;
+
+				if ( is_network_admin() ) {
+					if ( $is_active_for_network ) {
+						if ( current_user_can( 'manage_network_plugins' ) )
+							$actions['network_deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
+					} else {
+						if ( current_user_can( 'manage_network_plugins' ) )
+							$actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
+						if ( current_user_can('delete_plugins') )
+							$actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+					}
+				} else {
+					if ( $is_active ) {
+						$actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
+					} else {
+						if ( is_network_only_plugin( $plugin_file ) && !is_network_admin() )
+							continue;
+
+						$actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
+
+						if ( current_user_can('delete_plugins') )
+							$actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+					} // end if $is_active
+				 } // end if is_network_admin()
+
+				if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
+					$actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
+			} // end if $context
+
+			$actions = apply_filters( 'plugin_action_links', array_filter( $actions ), $plugin_file, $plugin_data, $context );
+			$actions = apply_filters( "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context );
+
+			$class = $is_active ? 'active' : 'inactive';
+			$checkbox = in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' />";
+			if ( 'dropins' != $status ) {
+				$description = '<p>' . $plugin_data['Description'] . '</p>';
+				$plugin_name = $plugin_data['Name'];
+			}
+			echo "
+		<tr class='$class'>
+			<th scope='row' class='check-column'>$checkbox</th>
+			<td class='plugin-title'><strong>$plugin_name</strong></td>
+			<td class='desc'>$description</td>
+		</tr>
+		<tr class='$class second'>
+			<td></td>
+			<td class='plugin-title'>";
+			echo '<div class="row-actions-visible">';
+			foreach ( $actions as $action => $link ) {
+				$sep = end( $actions ) == $link ? '' : ' | ';
+				echo "<span class='$action'>$link$sep</span>";
+			}
+			echo "</div></td>
+			<td class='desc'>";
+			$plugin_meta = array();
+			if ( !empty( $plugin_data['Version'] ) )
+				$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+			if ( !empty( $plugin_data['Author'] ) ) {
+				$author = $plugin_data['Author'];
+				if ( !empty( $plugin_data['AuthorURI'] ) )
+					$author = '<a href="' . $plugin_data['AuthorURI'] . '" title="' . __( 'Visit author homepage' ) . '">' . $plugin_data['Author'] . '</a>';
+				$plugin_meta[] = sprintf( __( 'By %s' ), $author );
+			}
+			if ( ! empty( $plugin_data['PluginURI'] ) )
+				$plugin_meta[] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . __( 'Visit plugin site' ) . '">' . __( 'Visit plugin site' ) . '</a>';
+
+			$plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
+			echo implode( ' | ', $plugin_meta );
+			echo "</td>
+		</tr>\n";
+
+			do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
+			do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status );
+		}
+	}
+}
+
+class WP_Plugin_Install_Table extends WP_List_Table {
+
+	function WP_Plugin_Install_Table() {
+		include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+
+		global $tabs, $tab, $paged, $type, $term;
+
+		parent::WP_List_Table( array(
+			'screen' => 'plugin-install',
+		) );
+
+		wp_reset_vars( array( 'tab' ) );
+
+		$paged = $this->get_pagenum();
+
+		$per_page = 30;
+
+		// These are the tabs which are shown on the page
+		$tabs = array();
+		$tabs['dashboard'] = __( 'Search' );
+		if ( 'search' == $tab )
+			$tabs['search']	= __( 'Search Results' );
+		$tabs['upload'] = __( 'Upload' );
+		$tabs['featured'] = _x( 'Featured','Plugin Installer' );
+		$tabs['popular']  = _x( 'Popular','Plugin Installer' );
+		$tabs['new']      = _x( 'Newest','Plugin Installer' );
+		$tabs['updated']  = _x( 'Recently Updated','Plugin Installer' );
+
+		$nonmenu_tabs = array( 'plugin-information' ); //Valid actions to perform which do not have a Menu item.
+
+		$tabs = apply_filters( 'install_plugins_tabs', $tabs );
+		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
+
+		// If a non-valid menu tab has been selected, And its not a non-menu action.
+		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
+			$tab = key( $tabs );
+
+		$args = array( 'page' => $paged, 'per_page' => $per_page );
+
+		switch ( $tab ) {
+			case 'search':
+				$type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : '';
+				$term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
+
+				switch ( $type ) {
+					case 'tag':
+						$args['tag'] = sanitize_title_with_dashes( $term );
+						break;
+					case 'term':
+						$args['search'] = $term;
+						break;
+					case 'author':
+						$args['author'] = $term;
+						break;
+				}
+
+				add_action( 'install_plugins_table_header', 'install_search_form' );
+				break;
+
+			case 'featured':
+			case 'popular':
+			case 'new':
+			case 'updated':
+				$args['browse'] = $tab;
+				break;
+
+			default:
+				$args = false;
+		}
+
+		if ( !$args )
+			return;
+
+		$api = plugins_api( 'query_plugins', $args );
+
+		if ( is_wp_error( $api ) )
+			wp_die( $api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+
+		$this->items = $api->plugins;
+
+		$this->set_pagination_args( array(
+			'total_items' => $api->info['results'],
+			'per_page' => $per_page,
+		) );
+	}
+
+	function no_items() {
+		_e( 'No plugins match your request.' );
+	}
+
+	function display_tablenav( $which ) {
+		if ( 'top' ==  $which ) { ?>
+			<div class="tablenav">
+				<div class="alignleft actions">
+					<?php do_action( 'install_plugins_table_header' ); ?>
+				</div>
+				<?php $this->pagination( $which ); ?>
+				<br class="clear" />
+			</div>
+		<?php } else { ?>
+			<div class="tablenav">
+				<?php $this->pagination( $which ); ?>
+				<br class="clear" />
+			</div>
+		<?php
+		}
+	}
+
+	function get_table_classes() {
+		extract( $this->_args );
+
+		return array( 'widefat', $plural );
+	}
+
+	function get_columns() {
+		return array(
+			'name'        => __( 'Name' ),
+			'version'     => __( 'Version' ),
+			'rating'      => __( 'Rating' ),
+			'description' => __( 'Description' ),
+		);
+	}
+
+	function display_rows() {
+		$plugins_allowedtags = array(
+			'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
+			'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
+			'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
+			'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
+		);
+
+		foreach ( (array) $this->items as $plugin ) {
+			if ( is_object( $plugin ) )
+				$plugin = (array) $plugin;
+
+			$title = wp_kses( $plugin['name'], $plugins_allowedtags );
+			//Limit description to 400char, and remove any HTML.
+			$description = strip_tags( $plugin['description'] );
+			if ( strlen( $description ) > 400 )
+				$description = mb_substr( $description, 0, 400 ) . '&#8230;';
+			//remove any trailing entities
+			$description = preg_replace( '/&[^;\s]{0,6}$/', '', $description );
+			//strip leading/trailing & multiple consecutive lines
+			$description = trim( $description );
+			$description = preg_replace( "|(\r?\n)+|", "\n", $description );
+			//\n => <br>
+			$description = nl2br( $description );
+			$version = wp_kses( $plugin['version'], $plugins_allowedtags );
+
+			$name = strip_tags( $title . ' ' . $version );
+
+			$author = $plugin['author'];
+			if ( ! empty( $plugin['author'] ) )
+				$author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '.</cite>';
+
+			$author = wp_kses( $author, $plugins_allowedtags );
+
+			$action_links = array();
+			$action_links[] = '<a href="' . admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
+								'&amp;TB_iframe=true&amp;width=600&amp;height=550' ) . '" class="thickbox" title="' .
+								esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '">' . __( 'Details' ) . '</a>';
+
+			if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
+				$status = install_plugin_install_status( $plugin );
+
+				switch ( $status['status'] ) {
+					case 'install':
+						if ( $status['url'] )
+							$action_links[] = '<a class="install-now" href="' . $status['url'] . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+						break;
+					case 'update_available':
+						if ( $status['url'] )
+							$action_links[] = '<a href="' . $status['url'] . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $status['version'] ) ) . '">' . sprintf( __( 'Update Now' ), $status['version'] ) . '</a>';
+						break;
+					case 'latest_installed':
+					case 'newer_installed':
+						$action_links[] = '<span title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . __( 'Installed' ) . '</span>';
+						break;
+				}
+			}
+
+			$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
+		?>
+		<tr>
+			<td class="name"><strong><?php echo $title; ?></strong>
+				<div class="action-links"><?php if ( !empty( $action_links ) ) echo implode( ' | ', $action_links ); ?></div>
+			</td>
+			<td class="vers"><?php echo $version; ?></td>
+			<td class="vers">
+				<div class="star-holder" title="<?php printf( _n( '( based on %s rating )', '( based on %s ratings )', $plugin['num_ratings'] ), number_format_i18n( $plugin['num_ratings'] ) ) ?>">
+					<div class="star star-rating" style="width: <?php echo esc_attr( $plugin['rating'] ) ?>px"></div>
+					<div class="star star5"><img src="<?php echo admin_url( 'images/star.gif' ); ?>" alt="<?php _e( '5 stars' ) ?>" /></div>
+					<div class="star star4"><img src="<?php echo admin_url( 'images/star.gif' ); ?>" alt="<?php _e( '4 stars' ) ?>" /></div>
+					<div class="star star3"><img src="<?php echo admin_url( 'images/star.gif' ); ?>" alt="<?php _e( '3 stars' ) ?>" /></div>
+					<div class="star star2"><img src="<?php echo admin_url( 'images/star.gif' ); ?>" alt="<?php _e( '2 stars' ) ?>" /></div>
+					<div class="star star1"><img src="<?php echo admin_url( 'images/star.gif' ); ?>" alt="<?php _e( '1 star' ) ?>" /></div>
+				</div>
+			</td>
+			<td class="desc"><?php echo $description, $author; ?></td>
+		</tr>
+		<?php
+		}
+	}
+}
+
+class WP_Themes_Table extends WP_List_Table {
+
+	function WP_Themes_Table() {
+		global $ct;
+
+		$ct = current_theme_info();
+
+		$themes = get_allowed_themes();
+		unset( $themes[$ct->name] );
+		uksort( $themes, "strnatcasecmp" );
+
+		$per_page = 15;
+		$page = $this->get_pagenum( 'pagenum' );
+
+		$start = $offset = ( $page - 1 ) * $per_page;
+
+		$this->items = array_slice( $themes, $start, $per_page );
+
+		parent::__construct( array(
+			'screen' => 'themes',
+		) );
+
+		$this->set_pagination_args( array(
+			'query_var' => 'pagenum',
+			'total_items' => count( $themes ),
+			'per_page' => $per_page,
+		) );
+	}
+
+	function no_items() {
+		if ( current_user_can( 'install_themes' ) )
+			printf( __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the <em><a href="%s">Install Themes</a></em> tab above.' ), 'theme-install.php' );
+		else
+			printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
+	}
+
+	function display_table() {
+?>
+		<div class="tablenav">
+			<?php $this->pagination( 'top' ); ?>
+			<br class="clear" />
+		</div>
+
+		<table id="availablethemes" cellspacing="0" cellpadding="0">
+			<tbody id="the-list" class="list:themes">
+				<?php $this->display_rows(); ?>
+			</tbody>
+		</table>
+
+		<div class="tablenav">
+			<?php $this->pagination( 'bottom' ); ?>
+			<br class="clear" />
+		</div>
+<?php
+	}
+
+	function get_columns() {
+		return array();
+	}
+
+	function display_rows() {
+		$themes = $this->items;
+		$theme_names = array_keys( $themes );
+		natcasesort( $theme_names );
+
+		$table = array();
+		$rows = ceil( count( $theme_names ) / 3 );
+		for ( $row = 1; $row <= $rows; $row++ )
+			for ( $col = 1; $col <= 3; $col++ )
+				$table[$row][$col] = array_shift( $theme_names );
+
+		foreach ( $table as $row => $cols ) {
+?>
+<tr>
+<?php
+foreach ( $cols as $col => $theme_name ) {
+	$class = array( 'available-theme' );
+	if ( $row == 1 ) $class[] = 'top';
+	if ( $col == 1 ) $class[] = 'left';
+	if ( $row == $rows ) $class[] = 'bottom';
+	if ( $col == 3 ) $class[] = 'right';
+?>
+	<td class="<?php echo join( ' ', $class ); ?>">
+<?php if ( !empty( $theme_name ) ) :
+	$template = $themes[$theme_name]['Template'];
+	$stylesheet = $themes[$theme_name]['Stylesheet'];
+	$title = $themes[$theme_name]['Title'];
+	$version = $themes[$theme_name]['Version'];
+	$description = $themes[$theme_name]['Description'];
+	$author = $themes[$theme_name]['Author'];
+	$screenshot = $themes[$theme_name]['Screenshot'];
+	$stylesheet_dir = $themes[$theme_name]['Stylesheet Dir'];
+	$template_dir = $themes[$theme_name]['Template Dir'];
+	$parent_theme = $themes[$theme_name]['Parent Theme'];
+	$theme_root = $themes[$theme_name]['Theme Root'];
+	$theme_root_uri = $themes[$theme_name]['Theme Root URI'];
+	$preview_link = esc_url( get_option( 'home' ) . '/' );
+	if ( is_ssl() )
+		$preview_link = str_replace( 'http://', 'https://', $preview_link );
+	$preview_link = htmlspecialchars( add_query_arg( array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), $preview_link ) );
+	$preview_text = esc_attr( sprintf( __( 'Preview of &#8220;%s&#8221;' ), $title ) );
+	$tags = $themes[$theme_name]['Tags'];
+	$thickbox_class = 'thickbox thickbox-preview';
+	$activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=".urlencode( $template )."&amp;stylesheet=".urlencode( $stylesheet ), 'switch-theme_' . $template );
+	$activate_text = esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) );
+	$actions = array();
+	$actions[] = '<a href="' . $activate_link .  '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>';
+	$actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $theme_name ) ) . '">' . __( 'Preview' ) . '</a>';
+	if ( current_user_can( 'delete_themes' ) )
+		$actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet ) . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $theme_name ) ) . "' );" . '">' . __( 'Delete' ) . '</a>';
+	$actions = apply_filters( 'theme_action_links', $actions, $themes[$theme_name] );
+
+	$actions = implode ( ' | ', $actions );
+?>
+		<a href="<?php echo $preview_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
+<?php if ( $screenshot ) : ?>
+			<img src="<?php echo $theme_root_uri . '/' . $stylesheet . '/' . $screenshot; ?>" alt="" />
+<?php endif; ?>
+		</a>
+<h3><?php
+	/* translators: 1: theme title, 2: theme version, 3: theme author */
+	printf( __( '%1$s %2$s by %3$s' ), $title, $version, $author ) ; ?></h3>
+<p class="description"><?php echo $description; ?></p>
+<span class='action-links'><?php echo $actions ?></span>
+	<?php if ( current_user_can( 'edit_themes' ) && $parent_theme ) {
+	/* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
+	<p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme ); ?></p>
+<?php } else { ?>
+	<p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ) ); ?></p>
+<?php } ?>
+<?php if ( $tags ) : ?>
+<p><?php _e( 'Tags:' ); ?> <?php echo join( ', ', $tags ); ?></p>
+<?php endif; ?>
+		<?php theme_update_available( $themes[$theme_name] ); ?>
+<?php endif; // end if not empty theme_name ?>
+	</td>
+<?php } // end foreach $cols ?>
+</tr>
+<?php } // end foreach $table
+	}
+}
+
+class WP_Theme_Install_Table extends WP_List_Table {
+
+	function WP_Theme_Install_Table() {
+		include( ABSPATH . 'wp-admin/includes/theme-install.php' );
+
+		global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
+
+		parent::WP_List_Table( array(
+			'screen' => 'theme-install',
+		) );
+
+		wp_reset_vars( array( 'tab' ) );
+
+		$paged = $this->get_pagenum();
+
+		$per_page = 30;
+
+		// These are the tabs which are shown on the page,
+		$tabs = array();
+		$tabs['dashboard'] = __( 'Search' );
+		if ( 'search' == $tab )
+			$tabs['search']	= __( 'Search Results' );
+		$tabs['upload'] = __( 'Upload' );
+		$tabs['featured'] = _x( 'Featured','Theme Installer' );
+		//$tabs['popular']  = _x( 'Popular','Theme Installer' );
+		$tabs['new']      = _x( 'Newest','Theme Installer' );
+		$tabs['updated']  = _x( 'Recently Updated','Theme Installer' );
+
+		$nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
+
+		$tabs = apply_filters( 'install_themes_tabs', $tabs );
+		$nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
+
+		// If a non-valid menu tab has been selected, And its not a non-menu action.
+		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) )
+			$tab = key( $tabs );
+
+		$args = array( 'page' => $paged, 'per_page' => $per_page, 'fields' => $theme_field_defaults );
+
+		switch ( $tab ) {
+			case 'search':
+				$type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : '';
+				$term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
+
+				switch ( $type ) {
+					case 'tag':
+						$terms = explode( ',', $term );
+						$terms = array_map( 'trim', $terms );
+						$terms = array_map( 'sanitize_title_with_dashes', $terms );
+						$args['tag'] = $terms;
+						break;
+					case 'term':
+						$args['search'] = $term;
+						break;
+					case 'author':
+						$args['author'] = $term;
+						break;
+				}
+
+				if ( !empty( $_POST['features'] ) ) {
+					$terms = $_POST['features'];
+					$terms = array_map( 'trim', $terms );
+					$terms = array_map( 'sanitize_title_with_dashes', $terms );
+					$args['tag'] = $terms;
+					$_REQUEST['s'] = implode( ',', $terms );
+					$_REQUEST['type'] = 'tag';
+				}
+
+				add_action( 'install_themes_table_header', 'install_theme_search_form' );
+				break;
+
+			case 'featured':
+			//case 'popular':
+			case 'new':
+			case 'updated':
+				$args['browse'] = $tab;
+				break;
+
+			default:
+				$args = false;
+		}
+
+		if ( !$args )
+			return;
+
+		$api = themes_api( 'query_themes', $args );
+
+		if ( is_wp_error( $api ) )
+			wp_die( $api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+
+		$this->items = $api->themes;
+
+		$this->set_pagination_args( array(
+			'total_items' => $api->info['results'],
+			'per_page' => $per_page,
+		) );
+	}
+
+	function no_items() {
+		_e( 'No themes match your request.' );
+	}
+	
+	function get_columns() {
+		return array();
+	}
+
+	function display_table() {
+?>
+		<div class="tablenav">
+			<div class="alignleft actions">
+				<?php do_action( 'install_themes_table_header' ); ?>
+			</div>
+			<?php $this->pagination( 'top' ); ?>
+			<br class="clear" />
+		</div>
+
+		<table id="availablethemes" cellspacing="0" cellpadding="0">
+			<tbody id="the-list" class="list:themes">
+				<?php $this->display_rows(); ?>
+			</tbody>
+		</table>
+
+		<div class="tablenav">
+			<?php $this->pagination( 'bottom' ); ?>
+			<br class="clear" />
+		</div>
+<?php
+	}
+
+	function display_rows() {
+		$themes = $this->items;
+
+		$rows = ceil( count( $themes ) / 3 );
+		$table = array();
+		$theme_keys = array_keys( $themes );
+		for ( $row = 1; $row <= $rows; $row++ )
+			for ( $col = 1; $col <= 3; $col++ )
+				$table[$row][$col] = array_shift( $theme_keys );
+
+		foreach ( $table as $row => $cols ) {
+			echo "\t<tr>\n";
+			foreach ( $cols as $col => $theme_index ) {
+				$class = array( 'available-theme' );
+				if ( $row == 1 ) $class[] = 'top';
+				if ( $col == 1 ) $class[] = 'left';
+				if ( $row == $rows ) $class[] = 'bottom';
+				if ( $col == 3 ) $class[] = 'right';
+				?>
+				<td class="<?php echo join( ' ', $class ); ?>"><?php
+					if ( isset( $themes[$theme_index] ) )
+						display_theme( $themes[$theme_index] );
+				?></td>
+			<?php } // end foreach $cols
+			echo "\t</tr>\n";
+		} // end foreach $table
+	}
+}
+
diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php
new file mode 100644
index 0000000000..9eb129d7eb
--- /dev/null
+++ b/wp-admin/includes/list-table.php
@@ -0,0 +1,599 @@
+<?php
+
+/**
+ * Base class for displaying a list of items as an ajaxified html table
+ *
+ * @package WordPress
+ * @since 3.1.0
+ */
+class WP_List_Table {
+
+	/**
+	 * The current list of items
+	 *
+	 * @since 3.1.0
+	 * @var array
+	 * @access protected
+	 */
+	var $items;
+
+	/**
+	 * Various information about the current table
+	 *
+	 * @since 3.1.0
+	 * @var array
+	 * @access private
+	 */
+	var $_args;
+
+	/**
+	 * Various information needed for displaying the pagination
+	 *
+	 * @since 3.1.0
+	 * @var array
+	 * @access private
+	 */
+	var $_pagination_args = array();
+
+	/**
+	 * The current screen
+	 *
+	 * @since 3.1.0
+	 * @var object
+	 * @access private
+	 */
+	var $_screen;
+
+	/**
+	 * Cached bulk actions
+	 *
+	 * @since 3.1.0
+	 * @var array
+	 * @access private
+	 */
+	var $_actions;
+
+	/**
+	 * Cached pagination output
+	 *
+	 * @since 3.1.0
+	 * @var string
+	 * @access private
+	 */
+	var $_pagination;
+
+	/**
+	 * Constructor. The child class should call this constructor from it's own constructor
+	 *
+	 * @param array $args An associative array with information about the current table
+	 * @access protected
+	 */
+	function WP_List_Table( $args ) {
+
+		$args = wp_parse_args( $args, array(
+			'screen' => '',
+			'plural' => '',
+			'singular' => '',
+			'ajax' => true
+		) );
+
+		$this->_screen = $args['screen'];
+
+		if ( is_string( $this->_screen ) )
+			$this->_screen = convert_to_screen( $this->_screen );
+
+		if ( !$args['plural'] )
+			$args['plural'] = $this->_screen->base;
+
+		$this->_args = $args;
+
+		if ( $args['ajax'] ) {
+			wp_enqueue_script( 'admin-table' );
+			add_action( 'admin_footer', array( $this, '_js_vars' ) );
+		}
+	}
+
+	/**
+	 * An internal method that sets all the necessary pagination arguments
+	 *
+	 * @param array $args An associative array with information about the pagination
+	 * @access protected
+	 */
+	function set_pagination_args( $args ) {
+		$args = wp_parse_args( $args, array(
+			'query_var' => 'paged',
+			'total_items' => 0,
+			'total_pages' => 0,
+			'per_page' => 0,
+		) );
+
+		if ( !$args['total_pages'] && $args['per_page'] > 0 )
+			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+
+		$this->_pagination_args = $args;
+	}
+
+	/**
+	 * Wether the table has items to display or not
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @return bool
+	 */
+	function has_items() {
+		return !empty( $this->items );
+	}
+
+	/**
+	 * Message to be displayed when there are no items
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 */
+	function no_items() {
+		_e( 'No items found.' );
+	}
+
+	/**
+	 * Get an associative array ( option_name => option_title ) with the list
+	 * of bulk actions available on this table.
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 *
+	 * @return array
+	 */
+	function get_bulk_actions() {
+		return array();
+	}
+
+	/**
+	 * Display the bulk actions dropdown.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 */
+	function bulk_actions() {
+
+		if ( is_null( $this->_actions ) ) {
+			$this->_actions = $this->get_bulk_actions();
+			$this->_actions = apply_filters( 'bulk_actions-' . $this->_screen->base, $this->_actions );
+			$two = '';
+		}
+		else {
+			$two = '2';
+		}
+
+		if ( empty( $this->_actions ) )
+			return;
+
+		echo "<select name='action$two'>\n";
+		echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
+		foreach ( $this->_actions as $name => $title )
+			echo "\t<option value='$name'>$title</option>\n";
+		echo "</select>\n";
+
+		echo "<input type='submit' value='" . esc_attr__( 'Apply' ) . "' name='doaction$two' id='doaction$two' class='button-secondary action' />\n";
+	}
+
+	/**
+	 * Display a monthly dropdown for filtering items
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 */
+	function months_dropdown( $post_type ) {
+		global $wpdb, $wp_locale;
+
+		$months = $wpdb->get_results( $wpdb->prepare( "
+			SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+			FROM $wpdb->posts
+			WHERE post_type = %s
+			ORDER BY post_date DESC
+		", $post_type ) );
+
+		$month_count = count( $months );
+
+		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+			return;
+
+		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
+?>
+		<select name='m'>
+			<option<?php selected( $m, 0 ); ?> value='0'><?php _e( 'Show all dates' ); ?></option>
+<?php
+		foreach ( $months as $arc_row ) {
+			if ( 0 == $arc_row->year )
+				continue;
+
+			$month = zeroise( $arc_row->month, 2 );
+			$year = $arc_row->year;
+
+			printf( "<option %s value='%s'>%s</option>\n",
+				selected( $m, $year . $month, false ),
+				esc_attr( $arc_row->year . $month ),
+				$wp_locale->get_month( $month ) . " $year"
+			);
+		}
+?>
+		</select>
+<?php
+	}
+
+	/**
+	 * Display a view switcher
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 */
+	function view_switcher( $current_mode ) {
+		$modes = array(
+			'list'    => __( 'List View' ),
+			'excerpt' => __( 'Excerpt View' )
+		);
+
+?>
+		<input type="hidden" name="mode" value="<?php echo esc_attr( $current_mode ); ?>" />
+		<div class="view-switch">
+<?php
+			foreach ( $modes as $mode => $title ) {
+				$class = ( $current_mode == $mode ) ? 'class="current"' : '';
+				echo "<a href='" . esc_url( add_query_arg( 'mode', $mode, $_SERVER['REQUEST_URI'] ) ) . "' $class><img id='view-switch-$mode' src='" . esc_url( includes_url( 'images/blank.gif' ) ) . "' width='20' height='20' title='$title' alt='$title' /></a>\n";
+			}
+		?>
+		</div>
+<?php
+	}
+
+	/**
+	 * Get the current page number
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 *
+	 * @return int
+	 */
+	function get_pagenum( $query_var = 'paged' ) {
+		$pagenum = isset( $_REQUEST[$query_var] ) ? absint( $_REQUEST[$query_var] ) : 0;
+	
+		return max( 1, $pagenum );
+	}
+
+	/**
+	 * Display the pagination.
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 */
+	function pagination() {
+		if ( $this->_pagination ) {
+			echo $this->_pagination;
+			return;
+		}
+
+		if ( empty( $this->_pagination_args ) )
+			return;
+
+		extract( $this->_pagination_args );
+
+		if ( $total_pages < 2 )
+			return;
+
+		$output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
+
+		$current = $this->get_pagenum( $query_var );
+
+		$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+
+		$page_links = array();
+
+		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
+			'first-page',
+			esc_attr__( 'Go to the first page' ),
+			esc_url( remove_query_arg( $query_var, $current_url ) ),
+			'&laquo;&laquo;'
+		);
+
+		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
+			'prev-page',
+			esc_attr__( 'Go to the previous page' ),
+			esc_url( add_query_arg( $query_var, max( 1, $current-1 ), $current_url ) ),
+			'&laquo;'
+		);
+
+		$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='%s' value='%s' size='%d' />",
+			esc_attr__( 'Current page' ),
+			esc_attr( $query_var ),
+			number_format_i18n( $current ),
+			strlen( $total_pages )
+		);
+		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
+		$page_links[] = sprintf( _x( '%s of %s', 'paging' ), $html_current_page, $html_total_pages );
+
+		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
+			'next-page',
+			esc_attr__( 'Go to the next page' ),
+			esc_url( add_query_arg( $query_var, min( $total_pages, $current+1 ), $current_url ) ),
+			'&raquo;'
+		);
+
+		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
+			'last-page',
+			esc_attr__( 'Go to the last page' ),
+			esc_url( add_query_arg( $query_var, $total_pages, $current_url ) ),
+			'&raquo;&raquo;'
+		);
+
+		$output .= join( "\n", $page_links );
+
+		$this->_pagination = "<div class='tablenav-pages'>$output</div>";
+
+		echo $this->_pagination;
+	}
+
+	/**
+	 * Get a list of columns. The format is internal_name => title
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 *
+	 * @return array
+	 */
+	function get_columns() {
+		die( 'function WP_List_Table::get_columns() must be over-ridden in a sub-class.' );
+	}
+
+	/**
+	 * Get a list of sortable columns. The format is internal_name => orderby
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 *
+	 * @return array
+	 */
+	function get_sortable_columns() {
+		return array();
+	}
+
+	/**
+	 * Get a list of hidden columns.
+	 *
+	 * @since 3.1.0
+	 * @access private
+	 *
+	 * @return array
+	 */
+	function get_hidden_columns() {
+		return (array) get_user_option( 'manage' . $this->_screen->id. 'columnshidden' );
+	}
+
+	/**
+	 * Get a list of all, hidden and sortable columns, with filter applied
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 *
+	 * @return array
+	 */
+	function get_column_headers() {
+		if ( !isset( $this->_column_headers ) ) {
+			$columns = apply_filters( 'manage_' . $this->_screen->id . '_columns', $this->get_columns() );
+			$sortable = apply_filters( 'manage_' . $this->_screen->id . '_sortable_columns', $this->get_sortable_columns() );
+			$hidden = $this->get_hidden_columns();
+
+			$this->_column_headers = array( $columns, $hidden, $sortable );
+		}
+
+		return $this->_column_headers;
+	}
+
+	/**
+	 * Print column headers, accounting for hidden and sortable columns.
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 */
+	function print_column_headers( $with_id = true ) {
+		$screen = $this->_screen;
+
+		list( $columns, $hidden, $sortable ) = $this->get_column_headers();
+
+		$styles = array();
+
+		$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+
+		if ( isset( $_GET['orderby'] ) )
+			$current_orderby = $_GET['orderby'];
+		else
+			$current_orderby = '';
+
+		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
+			$current_order = 'desc';
+		else
+			$current_order = 'asc';
+
+		foreach ( $columns as $column_key => $column_display_name ) {
+			$class = array( 'manage-column', "column-$column_key" );
+
+			$style = '';
+			if ( in_array( $column_key, $hidden ) )
+				$style = 'display:none;';
+
+			if ( isset( $styles[$screen->id] ) && isset( $styles[$screen->id][$column_key] ) )
+				$style .= ' ' . $styles[$screen->id][$column_key];
+			$style = ' style="' . $style . '"';
+
+			if ( 'cb' == $column_key )
+				$class[] = 'check-column';
+			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
+				$class[] = 'num';
+
+			if ( isset( $sortable[$column_key] ) ) {
+				$orderby = $sortable[$column_key];
+				if ( $current_orderby == $orderby ) {
+					$order = 'asc' == $current_order ? 'desc' : 'asc';
+					$class[] = "sorted-$current_order";
+				} else {
+					$order = 'asc';
+					$class[] = 'sortable';
+				}
+				$column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ) . '">' . $column_display_name . '</a>';
+				$column_display_name .= '<div class="sorting-indicator"></div>';
+			}
+
+			$id = $with_id ? "id='$column_key'" : '';
+
+			if ( !empty( $class ) )
+				$class = "class='" . join( ' ', $class ) . "'";
+
+			echo "<th scope='col' $id $class $style>$column_display_name</th>";
+		}
+	}
+
+	/**
+	 * Display the table or a message if there are no items
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 */
+	function display() {
+		if ( $this->has_items() ) {
+			$this->display_table();
+		} else {
+			echo '<br class="clear">';
+			echo '<p>';
+			$this->no_items();
+			echo '</p>';
+		}
+	}
+
+	/**
+	 * Get a list of CSS classes for the <table> tag
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 *
+	 * @return array
+	 */	
+	function get_table_classes() {
+		extract( $this->_args );
+
+		return array( 'widefat', 'fixed', $plural );
+	}
+
+	/**
+	 * Display the full table
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 */
+	function display_table() {
+		extract( $this->_args );
+
+		$this->display_tablenav( 'top' );
+
+?>
+<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0">
+	<thead>
+	<tr>
+		<?php $this->print_column_headers(); ?>
+	</tr>
+	</thead>
+
+	<tfoot>
+	<tr>
+		<?php $this->print_column_headers( false ); ?>
+	</tr>
+	</tfoot>
+
+	<tbody id="the-list"<?php if ( $singular ) echo " class='list:$singular'"; ?>>
+		<?php $this->display_rows(); ?>
+	</tbody>
+</table>
+<?php
+
+		$this->display_tablenav( 'bottom' );
+	}
+
+	/**
+	 * Generate the table navigation above or below the table
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 */
+	function display_tablenav( $which ) {
+		if ( 'top' == $which )
+			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+?>
+	<div class="tablenav">
+
+		<div class="alignleft actions">
+			<?php $this->bulk_actions( $which ); ?>
+		</div>
+
+	<?php
+		$this->extra_tablenav( $which );
+		$this->pagination( $which );
+	?>
+
+		<br class="clear">
+	</div>
+
+	<br class="clear">
+<?php
+	}
+
+	/**
+	 * Extra controls to be displayed between bulk actions and pagination
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 */
+	function extra_tablenav( $which ) {}
+
+	/**
+	 * Generate the <tbody> part of the table
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 */
+	function display_rows() {
+		die( 'function WP_List_Table::display_rows() must be over-ridden in a sub-class.' );
+	}
+
+	/**
+	 * Handle an incoming ajax request ( called from admin-ajax.php )
+	 *
+	 * @access public
+	 */
+	function ajax_response() {
+		extract( $this->_args );
+		extract( $this->_pagination_args );
+
+		ob_start();
+		$this->display_rows();
+		$rows = ob_get_clean();
+
+		die( json_encode( array(
+			'rows' => $rows,
+			'total_items' => sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ),
+			'total_pages' => $total_pages
+		) ) );
+	}
+
+	/**
+	 * Send required variables to JavaScript land
+	 *
+	 * @access private
+	 */
+	function _js_vars() {
+		extract( $this->_args );
+
+		$class = get_class( $this );
+
+		printf( "<script type='text/javascript'>list_args = %s;</script>\n",
+			json_encode( compact( 'screen', 'class' ) )
+		);
+	}
+}
diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 1ecb3a05ca..dac85370ea 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -344,6 +344,7 @@ function set_screen_options() {
 		switch ( $map_option ) {
 			case 'edit_per_page':
 			case 'ms_sites_per_page':
+			case 'users_per_page':
 			case 'ms_users_per_page':
 			case 'edit_comments_per_page':
 			case 'upload_per_page':
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 8c0b44b876..31a63680a9 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -78,48 +78,7 @@ function install_popular_tags( $args = array() ) {
 
 	return $tags;
 }
-add_action('install_plugins_search', 'install_search', 10, 1);
 
-/**
- * Display search results and display as tag cloud.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_search($page) {
-	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
-	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-
-	$args = array();
-
-	switch( $type ){
-		case 'tag':
-			$args['tag'] = sanitize_title_with_dashes($term);
-			break;
-		case 'term':
-			$args['search'] = $term;
-			break;
-		case 'author':
-			$args['author'] = $term;
-			break;
-	}
-
-	$args['page'] = $page;
-
-	$api = plugins_api('query_plugins', $args);
-
-	if ( is_wp_error($api) )
-		wp_die($api);
-
-	add_action('install_plugins_table_header', 'install_search_form');
-
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-
-	return;
-}
-
-add_action('install_plugins_dashboard', 'install_dashboard');
 function install_dashboard() {
 	?>
 	<p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> or upload a plugin in .zip format via this page.') ?></p>
@@ -150,6 +109,7 @@ function install_dashboard() {
 	}
 	echo '</p><br class="clear" />';
 }
+add_action('install_plugins_dashboard', 'install_dashboard');
 
 /**
  * Display search form for searching plugins.
@@ -160,7 +120,8 @@ function install_search_form(){
 	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
 	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
 
-	?><form id="search-plugins" method="post" action="<?php echo admin_url('plugin-install.php?tab=search'); ?>">
+	?><form id="search-plugins" method="get" action="">
+		<input type="hidden" name="tab" value="search" />
 		<select name="type" id="typeselector">
 			<option value="term"<?php selected('term', $type) ?>><?php _e('Term'); ?></option>
 			<option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option>
@@ -168,43 +129,10 @@ function install_search_form(){
 		</select>
 		<input type="text" name="s" value="<?php echo esc_attr($term) ?>" />
 		<label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
-		<input type="submit" id="plugin-search-input" name="search" value="<?php esc_attr_e('Search Plugins'); ?>" class="button" />
+		<input type="submit" id="plugin-search-input" value="<?php esc_attr_e('Search Plugins'); ?>" class="button" />
 	</form><?php
 }
 
-add_action('install_plugins_featured', 'install_featured', 10, 1);
-/**
- * Display featured plugins.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_featured($page = 1) {
-	$args = array('browse' => 'featured', 'page' => $page);
-	$api = plugins_api('query_plugins', $args);
-	if ( is_wp_error($api) )
-		wp_die($api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __('Try again') . '</a>');
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-}
-
-add_action('install_plugins_popular', 'install_popular', 10, 1);
-/**
- * Display popular plugins.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_popular($page = 1) {
-	$args = array('browse' => 'popular', 'page' => $page);
-	$api = plugins_api('query_plugins', $args);
-	if ( is_wp_error($api) )
-		wp_die($api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __('Try again') . '</a>');
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-}
-
-add_action('install_plugins_upload', 'install_plugins_upload', 10, 1);
 /**
  * Upload from zip
  * @since 2.8.0
@@ -223,39 +151,7 @@ function install_plugins_upload( $page = 1 ) {
 	</form>
 <?php
 }
-
-add_action('install_plugins_new', 'install_new', 10, 1);
-/**
- * Display new plugins.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_new($page = 1) {
-	$args = array('browse' => 'new', 'page' => $page);
-	$api = plugins_api('query_plugins', $args);
-	if ( is_wp_error($api) )
-		wp_die($api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __('Try again') . '</a>');
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-}
-add_action('install_plugins_updated', 'install_updated', 10, 1);
-
-
-/**
- * Display recently updated plugins.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_updated($page = 1) {
-	$args = array('browse' => 'updated', 'page' => $page);
-	$api = plugins_api('query_plugins', $args);
-	if ( is_wp_error($api) )
-		wp_die($api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __('Try again') . '</a>');
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-}
+add_action('install_plugins_upload', 'install_plugins_upload', 10, 1);
 
 /**
  * Display plugin content based on plugin list.
@@ -263,153 +159,18 @@ function install_updated($page = 1) {
  * @since 2.7.0
  *
  * @param array $plugins List of plugins.
- * @param string $page
- * @param int $totalpages Number of pages.
+ * @param int $total_plugins Number of plugins.
  */
-function display_plugins_table($plugins, $page = 1, $totalpages = 1){
-	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
-	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
+function display_plugins_table() {
+	global $table;
 
-	$plugins_allowedtags = array('a' => array('href' => array(),'title' => array(), 'target' => array()),
-								'abbr' => array('title' => array()),'acronym' => array('title' => array()),
-								'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
-								'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array());
-
-?>
-	<div class="tablenav">
-		<div class="alignleft actions">
-		<?php do_action('install_plugins_table_header'); ?>
-		</div>
-		<?php
-			$url = esc_url($_SERVER['REQUEST_URI']);
-			if ( ! empty($term) )
-				$url = add_query_arg('s', $term, $url);
-			if ( ! empty($type) )
-				$url = add_query_arg('type', $type, $url);
-
-			$page_links = paginate_links( array(
-				'base' => add_query_arg('paged', '%#%', $url),
-				'format' => '',
-				'prev_text' => __('&laquo;'),
-				'next_text' => __('&raquo;'),
-				'total' => $totalpages,
-				'current' => $page
-			));
-
-			if ( $page_links )
-				echo "\t\t<div class='tablenav-pages'>$page_links</div>";
-?>
-		<br class="clear" />
-	</div>
-	<table class="widefat" id="install-plugins" cellspacing="0">
-		<thead>
-			<tr>
-				<th scope="col" class="name"><?php _e('Name'); ?></th>
-				<th scope="col" class="num"><?php _e('Version'); ?></th>
-				<th scope="col" class="num"><?php _e('Rating'); ?></th>
-				<th scope="col" class="desc"><?php _e('Description'); ?></th>
-			</tr>
-		</thead>
-
-		<tfoot>
-			<tr>
-				<th scope="col" class="name"><?php _e('Name'); ?></th>
-				<th scope="col" class="num"><?php _e('Version'); ?></th>
-				<th scope="col" class="num"><?php _e('Rating'); ?></th>
-				<th scope="col" class="desc"><?php _e('Description'); ?></th>
-			</tr>
-		</tfoot>
-
-		<tbody class="plugins">
-		<?php
-			if ( empty($plugins) )
-				echo '<tr><td colspan="5">', __('No plugins match your request.'), '</td></tr>';
-
-			foreach ( (array) $plugins as $plugin ){
-				if ( is_object($plugin) )
-					$plugin = (array) $plugin;
-
-				$title = wp_kses($plugin['name'], $plugins_allowedtags);
-				//Limit description to 400char, and remove any HTML.
-				$description = strip_tags($plugin['description']);
-				if ( strlen($description) > 400 )
-					$description = mb_substr($description, 0, 400) . '&#8230;';
-				//remove any trailing entities
-				$description = preg_replace('/&[^;\s]{0,6}$/', '', $description);
-				//strip leading/trailing & multiple consecutive lines
-				$description = trim($description);
-				$description = preg_replace("|(\r?\n)+|", "\n", $description);
-				//\n => <br>
-				$description = nl2br($description);
-				$version = wp_kses($plugin['version'], $plugins_allowedtags);
-
-				$name = strip_tags($title . ' ' . $version);
-
-				$author = $plugin['author'];
-				if ( ! empty($plugin['author']) )
-					$author = ' <cite>' . sprintf( __('By %s'), $author ) . '.</cite>';
-
-				$author = wp_kses($author, $plugins_allowedtags);
-
-				$action_links = array();
-				$action_links[] = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-									'&amp;TB_iframe=true&amp;width=600&amp;height=550') . '" class="thickbox" title="' .
-									esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '">' . __('Details') . '</a>';
-
-				if ( current_user_can('install_plugins') || current_user_can('update_plugins') ) {
-					$status = install_plugin_install_status($plugin);
-
-					switch ( $status['status'] ) {
-						case 'install':
-							if ( $status['url'] )
-								$action_links[] = '<a class="install-now" href="' . $status['url'] . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __('Install Now') . '</a>';
-							break;
-						case 'update_available':
-							if ( $status['url'] )
-								$action_links[] = '<a href="' . $status['url'] . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $status['version'] ) ) . '">' . sprintf( __('Update Now'), $status['version'] ) . '</a>';
-							break;
-						case 'latest_installed':
-						case 'newer_installed':
-							$action_links[] = '<span title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . __('Installed') . '</span>';
-							break;
-					}
-				}
-
-				$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
-			?>
-			<tr>
-				<td class="name"><strong><?php echo $title; ?></strong>
-					<div class="action-links"><?php if ( !empty($action_links) ) echo implode(' | ', $action_links); ?></div>
-				</td>
-				<td class="vers"><?php echo $version; ?></td>
-				<td class="vers">
-					<div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $plugin['num_ratings']), number_format_i18n($plugin['num_ratings'])) ?>">
-						<div class="star star-rating" style="width: <?php echo esc_attr($plugin['rating']) ?>px"></div>
-						<div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div>
-						<div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div>
-						<div class="star star3"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('3 stars') ?>" /></div>
-						<div class="star star2"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('2 stars') ?>" /></div>
-						<div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div>
-					</div>
-				</td>
-				<td class="desc"><?php echo $description, $author; ?></td>
-			</tr>
-			<?php
-			}
-			?>
-		</tbody>
-	</table>
-
-	<div class="tablenav">
-		<?php if ( $page_links )
-				echo "\t\t<div class='tablenav-pages'>$page_links</div>"; ?>
-		<br class="clear" />
-	</div>
-
-<?php
+	$table->display();
 }
-
-add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
+add_action('install_plugins_search', 'display_plugins_table');
+add_action('install_plugins_featured', 'display_plugins_table');
+add_action('install_plugins_popular', 'display_plugins_table');
+add_action('install_plugins_new', 'display_plugins_table');
+add_action('install_plugins_updated', 'display_plugins_table');
 
 /**
  * Determine the status we can perform on a plugin.
@@ -608,3 +369,5 @@ function install_plugin_information() {
 	iframe_footer();
 	exit;
 }
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
+
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 6448c9e91c..08d2e478c6 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -880,16 +880,15 @@ function wp_edit_posts_query( $q = false ) {
 		$perm = 'readable';
 	}
 
-	if ( isset($q['post_status']) && 'pending' === $q['post_status'] ) {
+	if ( isset($q['orderby']) )
+		$orderby = $q['orderby'];
+	elseif ( isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft')) )
+		$orderby = 'modified';
+
+	if ( isset($q['order']) )
+		$order = $q['order'];
+	elseif ( isset($q['post_status']) && 'pending' == $q['post_status'] )
 		$order = 'ASC';
-		$orderby = 'modified';
-	} elseif ( isset($q['post_status']) && 'draft' === $q['post_status'] ) {
-		$order = 'DESC';
-		$orderby = 'modified';
-	} else {
-		$order = 'DESC';
-		$orderby = 'date';
-	}
 
 	$per_page = 'edit_' . $post_type . '_per_page';
 	$posts_per_page = (int) get_user_option( $per_page );
@@ -902,7 +901,7 @@ function wp_edit_posts_query( $q = false ) {
 	$query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
 
 	// Hierarchical types require special args.
-	if ( is_post_type_hierarchical( $post_type ) ) {
+	if ( is_post_type_hierarchical( $post_type ) && !isset($orderby) ) {
 		$query['orderby'] = 'menu_order title';
 		$query['order'] = 'asc';
 		$query['posts_per_page'] = -1;
@@ -973,11 +972,21 @@ function wp_edit_attachments_query( $q = false ) {
 	if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) )
 		unset($q['post_mime_type']);
 
+	if ( isset($q['detached']) )
+		add_filter('posts_where', '_edit_attachments_query_helper');
+
 	wp($q);
 
+	if ( isset($q['detached']) )
+		remove_filter('posts_where', '_edit_attachments_query_helper');
+
 	return array($post_mime_types, $avail_post_mime_types);
 }
 
+function _edit_attachments_query_helper($where) {
+	return $where .= ' AND post_parent < 1';
+}
+
 /**
  * {@internal Missing Short Description}}
  *
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index e81d4943d1..4bbaad8289 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -8,169 +8,6 @@
  * @subpackage Administration
  */
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7
- *
- * Outputs the HTML for the hidden table rows used in Categories, Link Categories and Tags quick edit.
- *
- * @param string $type "edit-tags", "categoried" or "edit-link-categories"
- * @param string $taxonomy The taxonomy of the row.
- * @return
- */
-function inline_edit_term_row($type, $taxonomy) {
-
-	$tax = get_taxonomy($taxonomy);
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
-		return;
-
-	$columns = get_column_headers($type);
-	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) );
-	$col_count = count($columns) - count($hidden);
-	?>
-
-<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
-	<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>">
-
-		<fieldset><div class="inline-edit-col">
-			<h4><?php _e( 'Quick Edit' ); ?></h4>
-
-			<label>
-				<span class="title"><?php _e( 'Name' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
-			</label>
-<?php if ( !is_multisite() ) { ?>
-			<label>
-				<span class="title"><?php _e( 'Slug' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
-			</label>
-<?php } ?>
-
-		</div></fieldset>
-
-<?php
-
-	$core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true );
-
-	foreach ( $columns as $column_name => $column_display_name ) {
-		if ( isset( $core_columns[$column_name] ) )
-			continue;
-		do_action( 'quick_edit_custom_box', $column_name, $type, $taxonomy );
-	}
-
-?>
-
-	<p class="inline-edit-save submit">
-		<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
-		<?php $update_text = $tax->labels->update_item; ?>
-		<a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
-		<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-		<span class="error" style="display:none;"></span>
-		<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
-		<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $tax->name ); ?>" />
-		<br class="clear" />
-	</p>
-	</td></tr>
-	</tbody></table></form>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $category
- * @param unknown_type $name_override
- * @return unknown
- */
-function link_cat_row( $category, $name_override = false ) {
-	static $row_class = '';
-
-	if ( !$category = get_term( $category, 'link_category', OBJECT, 'display' ) )
-		return false;
-	if ( is_wp_error( $category ) )
-		return $category;
-
-	$default_cat_id = (int) get_option( 'default_link_category' );
-	$name = ( $name_override ? $name_override : $category->name );
-	$edit_link = "link-category.php?action=edit&amp;cat_ID=$category->term_id";
-	if ( current_user_can( 'manage_categories' ) ) {
-		$edit = "<a class='row-title' href='$edit_link' title='" . esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $category->name)) . "'>$name</a><br />";
-		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-		if ( $default_cat_id != $category->term_id )
-			$actions['delete'] = "<a class='delete:the-list:link-cat-$category->term_id submitdelete' href='" . wp_nonce_url("link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id) . "'>" . __('Delete') . '</a>';
-		$actions = apply_filters('link_cat_row_actions', $actions, $category);
-		$action_count = count($actions);
-		$i = 0;
-		$edit .= '<div class="row-actions">';
-		foreach ( $actions as $action => $link ) {
-			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-			$edit .= "<span class='$action'>$link$sep</span>";
-		}
-		$edit .= '</div>';
-	} else {
-		$edit = $name;
-	}
-
-	$row_class = 'alternate' == $row_class ? '' : 'alternate';
-	$qe_data = get_term_to_edit($category->term_id, 'link_category');
-
-	$category->count = number_format_i18n( $category->count );
-	$count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count;
-	$output = "<tr id='link-cat-$category->term_id' class='iedit $row_class'>";
-	$columns = get_column_headers('edit-link-categories');
-	$hidden = get_hidden_columns('edit-link-categories');
-	foreach ( $columns as $column_name => $column_display_name ) {
-		$class = "class=\"$column_name column-$column_name\"";
-
-		$style = '';
-		if ( in_array($column_name, $hidden) )
-			$style = ' style="display:none;"';
-
-		$attributes = "$class$style";
-
-		switch ($column_name) {
-			case 'cb':
-				$output .= "<th scope='row' class='check-column'>";
-				if ( absint( get_option( 'default_link_category' ) ) != $category->term_id ) {
-					$output .= "<input type='checkbox' name='delete[]' value='$category->term_id' />";
-				} else {
-					$output .= "&nbsp;";
-				}
-				$output .= "</th>";
-				break;
-			case 'name':
-				$output .= "<td $attributes>$edit";
-				$output .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
-				$output .= '<div class="name">' . $qe_data->name . '</div>';
-				$output .= '<div class="slug">' . apply_filters('editable_slug', $qe_data->slug) . '</div>';
-				$output .= '<div class="cat_parent">' . $qe_data->parent . '</div></div></td>';
-				break;
-			case 'description':
-				$output .= "<td $attributes>$category->description</td>";
-				break;
-			case 'slug':
-				$output .= "<td $attributes>" . apply_filters('editable_slug', $category->slug) . '</td>';
-				break;
-			case 'links':
-				$attributes = 'class="links column-links num"' . $style;
-				$output .= "<td $attributes>$count</td>";
-				break;
-			default:
-				$output .= "<td $attributes>";
-				$output .= apply_filters('manage_link_categories_custom_column', '', $column_name, $category->term_id);
-				$output .= "</td>";
-		}
-	}
-	$output .= '</tr>';
-
-	return $output;
-}
 
 //
 // Category Checklists
@@ -233,7 +70,7 @@ function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $select
 			'popular_cats' => $popular_cats,
 			'walker' => $walker,
 			'checked_ontop' => $checked_ontop
-	));
+  ));
 }
 
 /**
@@ -288,7 +125,7 @@ function wp_terms_checklist($post_id = 0, $args = array()) {
 		$checked_categories = array();
 		$keys = array_keys( $categories );
 
-		foreach ( $keys as $k ) {
+		foreach( $keys as $k ) {
 			if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
 				$checked_categories[] = $categories[$k];
 				unset( $categories[$k] );
@@ -340,7 +177,7 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech
 
 		<li id="<?php echo $id; ?>" class="popular-category">
 			<label class="selectit">
-			<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php echo $disabled; ?>/>
+			<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php echo $disabled ?>/>
 				<?php echo esc_html( apply_filters( 'the_category', $term->name ) ); ?>
 			</label>
 		</li>
@@ -382,795 +219,6 @@ function wp_link_category_checklist( $link_id = 0 ) {
 	}
 }
 
-// Tag stuff
-
-// Returns a single tag row (see tag_rows below)
-// Note: this is also used in admin-ajax.php!
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $tag
- * @param unknown_type $class
- * @return unknown
- */
-function _tag_row( $tag, $level, $taxonomy = 'post_tag' ) {
-		global $post_type, $current_screen;
-		static $row_class = '';
-		$row_class = ($row_class == '' ? ' class="alternate"' : '');
-
-		$count = number_format_i18n( $tag->count );
-		$tax = get_taxonomy($taxonomy);
-
-		if ( 'post_tag' == $taxonomy ) {
-			$tagsel = 'tag';
-		} elseif ( 'category' == $taxonomy ) {
-			$tagsel = 'category_name';
-		} elseif ( ! empty($tax->query_var) ) {
-			$tagsel = $tax->query_var;
-		} else {
-			$tagsel = $taxonomy;
-		}
-
-		$pad = str_repeat( '&#8212; ', max(0, $level) );
-		$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
-		$qe_data = get_term($tag->term_id, $taxonomy, object, 'edit');
-		$edit_link = "edit-tags.php?action=edit&amp;taxonomy=$taxonomy&amp;post_type=$post_type&amp;tag_ID=$tag->term_id";
-
-		$out = '';
-		$out .= '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
-
-
-		$columns = get_column_headers($current_screen);
-		$hidden = get_hidden_columns($current_screen);
-		$default_term = get_option('default_' . $taxonomy);
-		foreach ( $columns as $column_name => $column_display_name ) {
-			$class = "class=\"$column_name column-$column_name\"";
-
-			$style = '';
-			if ( in_array($column_name, $hidden) )
-				$style = ' style="display:none;"';
-
-			$attributes = "$class$style";
-
-			switch ($column_name) {
-				case 'cb':
-					if ( current_user_can($tax->cap->delete_terms) && $tag->term_id != $default_term )
-						$out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>';
-					else
-						$out .= '<th scope="row" class="check-column">&nbsp;</th>';
-					break;
-				case 'name':
-					$out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $name)) . '">' . $name . '</a></strong><br />';
-					$actions = array();
-					if ( current_user_can($tax->cap->edit_terms) ) {
-						$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-						$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-					}
-					if ( current_user_can($tax->cap->delete_terms) && $tag->term_id != $default_term )
-						$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "'>" . __('Delete') . '</a>';
-
-					$actions = apply_filters('tag_row_actions', $actions, $tag);
-					$actions = apply_filters("${taxonomy}_row_actions", $actions, $tag);
-
-					$action_count = count($actions);
-					$i = 0;
-					$out .= '<div class="row-actions">';
-					foreach ( $actions as $action => $link ) {
-						++$i;
-						( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-						$out .= "<span class='$action'>$link$sep</span>";
-					}
-					$out .= '</div>';
-					$out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
-					$out .= '<div class="name">' . $qe_data->name . '</div>';
-					$out .= '<div class="slug">' . apply_filters('editable_slug', $qe_data->slug) . '</div>';
-					$out .= '<div class="parent">' . $qe_data->parent . '</div></div></td>';
-					break;
-				case 'description':
-					$out .= "<td $attributes>$tag->description</td>";
-					break;
-				case 'slug':
-					$out .= "<td $attributes>" . apply_filters('editable_slug', $tag->slug) . '</td>';
-					break;
-				case 'posts':
-					$attributes = 'class="posts column-posts num"' . $style;
-					$out .= "<td $attributes><a href='edit.php?$tagsel=$tag->slug&amp;post_type=$post_type'>$count</a></td>";
-					break;
-				default:
-					$out .= "<td $attributes>";
-					$out .= apply_filters("manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id);
-					$out .= "</td>";
-			}
-		}
-
-		$out .= "</tr>\n";
-
-		return $out;
-}
-
-// Outputs appropriate rows for the Nth page of the Tag Management screen,
-// assuming M tags displayed at a time on the page
-// Returns the number of tags displayed
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $page
- * @param unknown_type $pagesize
- * @param unknown_type $searchterms
- * @return unknown
- */
-function tag_rows( $page = 1, $pagesize = 20, $searchterms = '', $taxonomy = 'post_tag' ) {
-
-	// Get a page worth of tags
-	$start = ($page - 1) * $pagesize;
-
-	$args = array('offset' => $start, 'number' => $pagesize, 'hide_empty' => 0);
-
-	if ( !empty( $searchterms ) )
-		$args['search'] = $searchterms;
-
-	// convert it to table rows
-	$out = '';
-	$count = 0;
-	if ( is_taxonomy_hierarchical($taxonomy) ) {
-		// We'll need the full set of terms then.
-		$args['number'] = $args['offset'] = 0;
-
-		$terms = get_terms( $taxonomy, $args );
-		if ( !empty( $searchterms ) ) // Ignore children on searches.
-			$children = array();
-		else
-			$children = _get_term_hierarchy($taxonomy);
-
-		// Some funky recursion to get the job done(Paging & parents mainly) is contained within, Skip it for non-hierarchical taxonomies for performance sake
-		$out .= _term_rows($taxonomy, $terms, $children, $page, $pagesize, $count);
-	} else {
-		$terms = get_terms( $taxonomy, $args );
-		foreach ( $terms as $term )
-			$out .= _tag_row( $term, 0, $taxonomy );
-		$count = $pagesize; // Only displaying a single page.
-	}
-
-	echo $out;
-	return $count;
-}
-
-function _term_rows( $taxonomy, $terms, &$children, $page = 1, $per_page = 20, &$count, $parent = 0, $level = 0 ) {
-
-	$start = ($page - 1) * $per_page;
-	$end = $start + $per_page;
-
-	$output = '';
-	foreach ( $terms as $key => $term ) {
-
-		if ( $count >= $end )
-			break;
-
-		if ( $term->parent != $parent && empty($_GET['s']) )
-			continue;
-
-		// If the page starts in a subtree, print the parents.
-		if ( $count == $start && $term->parent > 0 && empty($_GET['s']) ) {
-			$my_parents = $parent_ids = array();
-			$p = $term->parent;
-			while ( $p ) {
-				$my_parent = get_term( $p, $taxonomy );
-				$my_parents[] = $my_parent;
-				$p = $my_parent->parent;
-				if ( in_array($p, $parent_ids) ) // Prevent parent loops.
-					break;
-				$parent_ids[] = $p;
-			}
-			unset($parent_ids);
-
-			$num_parents = count($my_parents);
-			while ( $my_parent = array_pop($my_parents) ) {
-				$output .= "\t" . _tag_row( $my_parent, $level - $num_parents, $taxonomy );
-				$num_parents--;
-			}
-		}
-
-		if ( $count >= $start )
-			$output .= "\t" . _tag_row( $term, $level, $taxonomy );
-
-		++$count;
-
-		unset($terms[$key]);
-
-		if ( isset($children[$term->term_id]) && empty($_GET['s']) )
-			$output .= _term_rows( $taxonomy, $terms, $children, $page, $per_page, $count, $term->term_id, $level + 1 );
-	}
-
-	return $output;
-}
-
-// define the columns to display, the syntax is 'internal name' => 'display name'
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function wp_manage_posts_columns( $screen = '') {
-	if ( empty($screen) )
-		$post_type = 'post';
-	else
-		$post_type = $screen->post_type;
-
-	$posts_columns = array();
-	$posts_columns['cb'] = '<input type="checkbox" />';
-	/* translators: manage posts column name */
-	$posts_columns['title'] = _x('Title', 'column name');
-	$posts_columns['author'] = __('Author');
-	if ( empty($post_type) || is_object_in_taxonomy($post_type, 'category') )
-		$posts_columns['categories'] = __('Categories');
-	if ( empty($post_type) || is_object_in_taxonomy($post_type, 'post_tag') )
-		$posts_columns['tags'] = __('Tags');
-	$post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
-	if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
-		$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
-	$posts_columns['date'] = __('Date');
-
-	if ( 'page' == $post_type )
-		$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
-	else
-		$posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
-	$posts_columns = apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
-
-	return $posts_columns;
-}
-
-// define the columns to display, the syntax is 'internal name' => 'display name'
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function wp_manage_media_columns() {
-	$posts_columns = array();
-	$posts_columns['cb'] = '<input type="checkbox" />';
-	$posts_columns['icon'] = '';
-	/* translators: column name */
-	$posts_columns['media'] = _x('File', 'column name');
-	$posts_columns['author'] = __('Author');
-	//$posts_columns['tags'] = _x('Tags', 'column name');
-	/* translators: column name */
-	$posts_columns['parent'] = _x('Attached to', 'column name');
-	$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
-	//$posts_columns['comments'] = __('Comments');
-	/* translators: column name */
-	$posts_columns['date'] = _x('Date', 'column name');
-	$posts_columns = apply_filters('manage_media_columns', $posts_columns);
-
-	return $posts_columns;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function wp_manage_pages_columns() {
-	return wp_manage_posts_columns();
-}
-
-/**
- * Get the column headers for a screen
- *
- * @since unknown
- *
- * @param string|object $screen The screen you want the headers for
- * @return array Containing the headers in the format id => UI String
- */
-function get_column_headers($screen) {
-	global $_wp_column_headers;
-
-	if ( !isset($_wp_column_headers) )
-		$_wp_column_headers = array();
-
-	if ( is_string($screen) )
-		$screen = convert_to_screen($screen);
-
-	// Store in static to avoid running filters on each call
-	if ( isset($_wp_column_headers[$screen->id]) )
-		return $_wp_column_headers[$screen->id];
-
-	switch ($screen->base) {
-		case 'edit':
-			 $_wp_column_headers[$screen->id] = wp_manage_posts_columns( $screen );
-			 break;
-		case 'edit-comments':
-			$_wp_column_headers[$screen->id] = array(
-				'cb' => '<input type="checkbox" />',
-				'author' => __('Author'),
-				/* translators: column name */
-				'comment' => _x('Comment', 'column name'),
-				//'date' => __('Submitted'),
-				'response' => __('In Response To')
-			);
-
-			break;
-		case 'link-manager':
-			$_wp_column_headers[$screen->id] = array(
-				'cb' => '<input type="checkbox" />',
-				'name' => __('Name'),
-				'url' => __('URL'),
-				'categories' => __('Categories'),
-				'rel' => __('Relationship'),
-				'visible' => __('Visible'),
-				'rating' => __('Rating')
-			);
-
-			break;
-		case 'upload':
-			$_wp_column_headers[$screen->id] = wp_manage_media_columns();
-			break;
-		case 'categories':
-			$_wp_column_headers[$screen->id] = array(
-				'cb' => '<input type="checkbox" />',
-				'name' => __('Name'),
-				'description' => __('Description'),
-				'slug' => __('Slug'),
-				'posts' => __('Posts')
-			);
-
-			break;
-		case 'edit-link-categories':
-			$_wp_column_headers[$screen->id] = array(
-				'cb' => '<input type="checkbox" />',
-				'name' => __('Name'),
-				'description' => __('Description'),
-				'slug' => __('Slug'),
-				'links' => __('Links')
-			);
-
-			break;
-		case 'edit-tags':
-			$_wp_column_headers[$screen->id] = array(
-				'cb' => '<input type="checkbox" />',
-				'name' => __('Name'),
-				'description' => __('Description'),
-				'slug' => __('Slug'),
-				'posts' => __('Posts')
-			);
-
-			break;
-		case 'users':
-			$_wp_column_headers[$screen->id] = array(
-				'cb' => '<input type="checkbox" />',
-				'username' => __('Username'),
-				'name' => __('Name'),
-				'email' => __('E-mail'),
-				'role' => __('Role'),
-				'posts' => __('Posts')
-			);
-			break;
-		default :
-			$_wp_column_headers[$screen->id] = array();
-	}
-
-	$_wp_column_headers[$screen->id] = apply_filters('manage_' . $screen->id . '_columns', $_wp_column_headers[$screen->id]);
-	return $_wp_column_headers[$screen->id];
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $screen
- * @param unknown_type $id
- */
-function print_column_headers( $screen, $id = true ) {
-	if ( is_string($screen) )
-		$screen = convert_to_screen($screen);
-
-	$columns = get_column_headers( $screen );
-	$hidden = get_hidden_columns($screen);
-	$styles = array();
-
-	foreach ( $columns as $column_key => $column_display_name ) {
-		$class = ' class="manage-column';
-
-		$class .= " column-$column_key";
-
-		if ( 'cb' == $column_key )
-			$class .= ' check-column';
-		elseif ( in_array($column_key, array('posts', 'comments', 'links')) )
-			$class .= ' num';
-
-		$class .= '"';
-
-		$style = '';
-		if ( in_array($column_key, $hidden) )
-			$style = 'display:none;';
-
-		if ( isset($styles[$screen->id]) && isset($styles[$screen->id][$column_key]) )
-			$style .= ' ' . $styles[$screen>id][$column_key];
-		$style = ' style="' . $style . '"';
-?>
-	<th scope="col" <?php echo $id ? "id=\"$column_key\"" : ""; echo $class; echo $style; ?>><?php echo $column_display_name; ?></th>
-<?php }
-}
-
-/**
- * Register column headers for a particular screen. The header names will be listed in the Screen Options.
- *
- * @since 2.7.0
- *
- * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
- * @param array $columns An array of columns with column IDs as the keys and translated column names as the values
- * @see get_column_headers(), print_column_headers(), get_hidden_columns()
- */
-function register_column_headers($screen, $columns) {
-	global $_wp_column_headers;
-
-	if ( is_string($screen) )
-		$screen = convert_to_screen($screen);
-
-	if ( !isset($_wp_column_headers) )
-		$_wp_column_headers = array();
-
-	$_wp_column_headers[$screen->id] = $columns;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $screen
- */
-function get_hidden_columns($screen) {
-	if ( is_string($screen) )
-		$screen = convert_to_screen($screen);
-
-	return (array) get_user_option( 'manage' . $screen->id. 'columnshidden' );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * Outputs the quick edit and bulk edit table rows for posts and pages
- *
- * @since 2.7
- *
- * @param string $screen
- */
-function inline_edit_row( $screen ) {
-	global $mode;
-
-	if ( is_string($screen) ) {
-		$screen = array('id' => 'edit-' . $screen, 'base' => 'edit', 'post_type' => $screen );
-		$screen = (object) $screen;
-	}
-
-	$post = get_default_post_to_edit( $screen->post_type );
-	$post_type_object = get_post_type_object( $screen->post_type );
-
-	$taxonomy_names = get_object_taxonomies( $screen->post_type );
-	$hierarchical_taxonomies = array();
-	$flat_taxonomies = array();
-	foreach ( $taxonomy_names as $taxonomy_name ) {
-		$taxonomy = get_taxonomy( $taxonomy_name);
-
-		if ( !$taxonomy->show_ui )
-			continue;
-
-		if ( $taxonomy->hierarchical )
-			$hierarchical_taxonomies[] = $taxonomy;
-		else
-			$flat_taxonomies[] = $taxonomy;
-	}
-
-	$columns = wp_manage_posts_columns($screen);
-	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) );
-	$col_count = count($columns) - count($hidden);
-	$m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
-	$can_publish = current_user_can($post_type_object->cap->publish_posts);
-	$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
-
-?>
-
-<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
-	<?php
-	$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
-	$bulk = 0;
-	while ( $bulk < 2 ) { ?>
-
-	<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-$screen->post_type ";
-		echo $bulk ? "bulk-edit-row bulk-edit-row-$hclass bulk-edit-$screen->post_type" : "quick-edit-row quick-edit-row-$hclass inline-edit-$screen->post_type";
-	?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
-
-	<fieldset class="inline-edit-col-left"><div class="inline-edit-col">
-		<h4><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></h4>
-
-
-<?php
-
-if ( post_type_supports( $screen->post_type, 'title' ) ) :
-	if ( $bulk ) : ?>
-		<div id="bulk-title-div">
-			<div id="bulk-titles"></div>
-		</div>
-
-<?php else : // $bulk ?>
-
-		<label>
-			<span class="title"><?php _e( 'Title' ); ?></span>
-			<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
-		</label>
-
-		<label>
-			<span class="title"><?php _e( 'Slug' ); ?></span>
-			<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
-		</label>
-
-<?php endif; // $bulk
-endif; // post_type_supports title ?>
-
-<?php if ( !$bulk ) : ?>
-		<label><span class="title"><?php _e( 'Date' ); ?></span></label>
-		<div class="inline-edit-date">
-			<?php touch_time(1, 1, 4, 1); ?>
-		</div>
-		<br class="clear" />
-
-<?php endif; // $bulk
-
-	if ( post_type_supports( $screen->post_type, 'author' ) ) :
-		$authors = get_editable_user_ids( get_current_user_id(), true, $screen->post_type ); // TODO: ROLE SYSTEM
-		$authors_dropdown = '';
-		if ( $authors && count( $authors ) > 1 ) :
-			$users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1, 'echo' => 0);
-			if ( $bulk )
-				$users_opt['show_option_none'] = __('&mdash; No Change &mdash;');
-			$authors_dropdown  = '<label>';
-			$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
-			$authors_dropdown .= wp_dropdown_users( $users_opt );
-			$authors_dropdown .= '</label>';
-
-		endif; // authors
-		if ( !$bulk ) // On bulk views, this is used further down
-			echo $authors_dropdown;
-	endif; // post_type_supports author
-
-if ( !$bulk ) :
-?>
-
-		<div class="inline-edit-group">
-			<label class="alignleft">
-				<span class="title"><?php _e( 'Password' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
-			</label>
-
-			<em style="margin:5px 10px 0 0" class="alignleft">
-				<?php
-				/* translators: Between password field and private checkbox on post quick edit interface */
-				echo __( '&ndash;OR&ndash;' );
-				?>
-			</em>
-			<label class="alignleft inline-edit-private">
-				<input type="checkbox" name="keep_private" value="private" />
-				<span class="checkbox-title"><?php echo __('Private'); ?></span>
-			</label>
-		</div>
-
-<?php endif; ?>
-
-	</div></fieldset>
-
-<?php if ( count($hierarchical_taxonomies) && !$bulk ) : ?>
-
-	<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
-
-<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
-
-		<span class="title inline-edit-categories-label"><?php echo esc_html($taxonomy->labels->name); ?>
-			<span class="catshow"><?php _e('[more]'); ?></span>
-			<span class="cathide" style="display:none;"><?php _e('[less]'); ?></span>
-		</span>
-		<input type="hidden" name="<?php echo ( $taxonomy->name == 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr($taxonomy->name) . '][]'; ?>" value="0" />
-		<ul class="cat-checklist <?php echo esc_attr($taxonomy->name)?>-checklist">
-			<?php wp_terms_checklist(null, array('taxonomy' => $taxonomy->name)); ?>
-		</ul>
-
-<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
-
-	</div></fieldset>
-
-<?php endif; // count($hierarchical_taxonomies) && !$bulk ?>
-
-	<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
-
-<?php
-	if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-		echo $authors_dropdown;
-?>
-
-<?php if ( $post_type_object->hierarchical ) : ?>
-
-		<label>
-			<span class="title"><?php _e( 'Parent' ); ?></span>
-<?php
-	$dropdown_args = array('post_type' => $post_type_object->name, 'selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title');
-	if ( $bulk )
-		$dropdown_args['show_option_no_change'] = __('&mdash; No Change &mdash;');
-	$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
-	wp_dropdown_pages($dropdown_args);
-?>
-		</label>
-
-<?php if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
-		if ( !$bulk ) : ?>
-
-		<label>
-			<span class="title"><?php _e( 'Order' ); ?></span>
-			<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order; ?>" /></span>
-		</label>
-
-<?php	endif; // !$bulk ?>
-
-		<label>
-			<span class="title"><?php _e( 'Template' ); ?></span>
-			<select name="page_template">
-<?php	if ( $bulk ) : ?>
-				<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
-<?php	endif; // $bulk ?>
-				<option value="default"><?php _e( 'Default Template' ); ?></option>
-				<?php page_template_dropdown(); ?>
-			</select>
-		</label>
-
-<?php
-	endif; // post_type_supports page-attributes
-endif; // $post_type_object->hierarchical ?>
-
-<?php if ( count($flat_taxonomies) && !$bulk ) : ?>
-
-<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
-
-		<label class="inline-edit-tags">
-			<span class="title"><?php echo esc_html($taxonomy->labels->name); ?></span>
-			<textarea cols="22" rows="1" name="tax_input[<?php echo esc_attr($taxonomy->name); ?>]" class="tax_input_<?php echo esc_attr($taxonomy->name); ?>"></textarea>
-		</label>
-
-<?php endforeach; //$flat_taxonomies as $taxonomy ?>
-
-<?php endif; // count($flat_taxonomies) && !$bulk ?>
-
-<?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
-	if ( $bulk ) : ?>
-
-		<div class="inline-edit-group">
-	<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
-		<label class="alignleft">
-			<span class="title"><?php _e( 'Comments' ); ?></span>
-			<select name="comment_status">
-				<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
-				<option value="open"><?php _e('Allow'); ?></option>
-				<option value="closed"><?php _e('Do not allow'); ?></option>
-			</select>
-		</label>
-	<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
-		<label class="alignright">
-			<span class="title"><?php _e( 'Pings' ); ?></span>
-			<select name="ping_status">
-				<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
-				<option value="open"><?php _e('Allow'); ?></option>
-				<option value="closed"><?php _e('Do not allow'); ?></option>
-			</select>
-		</label>
-	<?php endif; ?>
-		</div>
-
-<?php else : // $bulk ?>
-
-		<div class="inline-edit-group">
-		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
-			<label class="alignleft">
-				<input type="checkbox" name="comment_status" value="open" />
-				<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
-			</label>
-		<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
-			<label class="alignleft">
-				<input type="checkbox" name="ping_status" value="open" />
-				<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
-			</label>
-		<?php endif; ?>
-		</div>
-
-<?php endif; // $bulk
-endif; // post_type_supports comments or pings ?>
-
-		<div class="inline-edit-group">
-			<label class="inline-edit-status alignleft">
-				<span class="title"><?php _e( 'Status' ); ?></span>
-				<select name="_status">
-<?php if ( $bulk ) : ?>
-					<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
-<?php endif; // $bulk ?>
-				<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
-					<option value="publish"><?php _e( 'Published' ); ?></option>
-					<option value="future"><?php _e( 'Scheduled' ); ?></option>
-<?php if ( $bulk ) : ?>
-					<option value="private"><?php _e('Private'); ?></option>
-<?php endif; // $bulk ?>
-				<?php endif; ?>
-					<option value="pending"><?php _e( 'Pending Review' ); ?></option>
-					<option value="draft"><?php _e( 'Draft' ); ?></option>
-				</select>
-			</label>
-
-<?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
-
-<?php	if ( $bulk ) : ?>
-
-			<label class="alignright">
-				<span class="title"><?php _e( 'Sticky' ); ?></span>
-				<select name="sticky">
-					<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="sticky"><?php _e( 'Sticky' ); ?></option>
-					<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
-				</select>
-			</label>
-
-<?php	else : // $bulk ?>
-
-			<label class="alignleft">
-				<input type="checkbox" name="sticky" value="sticky" />
-				<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
-			</label>
-
-<?php	endif; // $bulk ?>
-
-<?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_cap' ) ?>
-
-		</div>
-
-	</div></fieldset>
-
-<?php
-	foreach ( $columns as $column_name => $column_display_name ) {
-		if ( isset( $core_columns[$column_name] ) )
-			continue;
-		do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $screen->post_type );
-	}
-?>
-	<p class="submit inline-edit-save">
-		<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></a>
-		<?php if ( ! $bulk ) {
-			wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
-			$update_text = __( 'Update' );
-			?>
-			<a accesskey="s" href="#inline-edit" title="<?php _e('Update'); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
-			<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-		<?php } else {
-			$update_text = __( 'Update' );
-		?>
-			<input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo esc_attr( $update_text ); ?>" />
-		<?php } ?>
-		<input type="hidden" name="post_view" value="<?php echo esc_attr($m); ?>" />
-		<input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
-		<br class="clear" />
-	</p>
-	</td></tr>
-<?php
-	$bulk++;
-	} ?>
-	</tbody></table></form>
-<?php
-}
-
 // adds hidden fields with the data for use in the inline editor for posts and pages
 /**
  * {@internal Missing Short Description}}
@@ -1227,991 +275,6 @@ function get_inline_data($post) {
 	echo '</div>';
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $posts
- */
-function post_rows( $posts = array() ) {
-	global $wp_query, $post, $mode;
-
-	add_filter('the_title','esc_html');
-
-	// Create array of post IDs.
-	$post_ids = array();
-
-	if ( empty($posts) )
-		$posts = &$wp_query->posts;
-
-	foreach ( $posts as $a_post )
-		$post_ids[] = $a_post->ID;
-
-	$comment_pending_count = get_pending_comments_num($post_ids);
-
-	foreach ( $posts as $post ) {
-		if ( empty($comment_pending_count[$post->ID]) )
-			$comment_pending_count[$post->ID] = 0;
-
-		_post_row($post, $comment_pending_count[$post->ID], $mode);
-	}
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $a_post
- * @param unknown_type $pending_comments
- * @param unknown_type $mode
- */
-function _post_row($a_post, $pending_comments, $mode) {
-	global $post, $current_screen;
-	static $rowclass;
-
-	$global_post = $post;
-	$post = $a_post;
-	setup_postdata($post);
-
-	$rowclass = 'alternate' == $rowclass ? '' : 'alternate';
-	$post_owner = ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
-	$edit_link = get_edit_post_link( $post->ID );
-	$title = _draft_or_post_title();
-	$post_type_object = get_post_type_object($post->post_type);
-?>
-	<tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status ); ?> iedit' valign="top">
-<?php
-	$posts_columns = get_column_headers( $current_screen );
-	$hidden = get_hidden_columns( $current_screen );
-	foreach ( $posts_columns as $column_name=>$column_display_name ) {
-		$class = "class=\"$column_name column-$column_name\"";
-
-		$style = '';
-		if ( in_array($column_name, $hidden) )
-			$style = ' style="display:none;"';
-
-		$attributes = "$class$style";
-
-		switch ($column_name) {
-
-		case 'cb':
-		?>
-		<th scope="row" class="check-column"><?php if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
-		<?php
-		break;
-
-		case 'date':
-			if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
-				$t_time = $h_time = __('Unpublished');
-				$time_diff = 0;
-			} else {
-				$t_time = get_the_time(__('Y/m/d g:i:s A'));
-				$m_time = $post->post_date;
-				$time = get_post_time('G', true, $post);
-
-				$time_diff = time() - $time;
-
-				if ( $time_diff > 0 && $time_diff < 24*60*60 )
-					$h_time = sprintf( __('%s ago'), human_time_diff( $time ) );
-				else
-					$h_time = mysql2date(__('Y/m/d'), $m_time);
-			}
-
-			echo '<td ' . $attributes . '>';
-			if ( 'excerpt' == $mode )
-				echo apply_filters('post_date_column_time', $t_time, $post, $column_name, $mode);
-			else
-				echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $post, $column_name, $mode) . '</abbr>';
-			echo '<br />';
-			if ( 'publish' == $post->post_status ) {
-				_e('Published');
-			} elseif ( 'future' == $post->post_status ) {
-				if ( $time_diff > 0 )
-					echo '<strong class="attention">' . __('Missed schedule') . '</strong>';
-				else
-					_e('Scheduled');
-			} else {
-				_e('Last Modified');
-			}
-			echo '</td>';
-		break;
-
-		case 'title':
-			$attributes = 'class="post-title column-title"' . $style;
-		?>
-		<td <?php echo $attributes; ?>><strong><?php if ( current_user_can($post_type_object->cap->edit_post, $post->ID) && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)); ?>"><?php echo $title; ?></a><?php } else { echo $title; }; _post_states($post); ?></strong>
-		<?php
-			if ( 'excerpt' == $mode )
-				the_excerpt();
-
-			$actions = array();
-			if ( current_user_can($post_type_object->cap->edit_post, $post->ID) && 'trash' != $post->post_status ) {
-				$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '" title="' . esc_attr(__('Edit this item')) . '">' . __('Edit') . '</a>';
-				$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr(__('Edit this item inline')) . '">' . __('Quick&nbsp;Edit') . '</a>';
-			}
-			if ( current_user_can($post_type_object->cap->delete_post, $post->ID) ) {
-				if ( 'trash' == $post->post_status )
-					$actions['untrash'] = "<a title='" . esc_attr(__('Restore this item from the Trash')) . "' href='" . wp_nonce_url( admin_url( sprintf($post_type_object->_edit_link . '&amp;action=untrash', $post->ID) ), 'untrash-' . $post->post_type . '_' . $post->ID ) . "'>" . __('Restore') . '</a>';
-				elseif ( EMPTY_TRASH_DAYS )
-					$actions['trash'] = "<a class='submitdelete' title='" . esc_attr(__('Move this item to the Trash')) . "' href='" . get_delete_post_link($post->ID) . "'>" . __('Trash') . '</a>';
-				if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
-					$actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this item permanently')) . "' href='" . get_delete_post_link($post->ID, '', true) . "'>" . __('Delete Permanently') . '</a>';
-			}
-			if ( in_array($post->post_status, array('pending', 'draft')) ) {
-				if ( current_user_can($post_type_object->cap->edit_post, $post->ID) )
-					$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink($post->ID) ) ) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
-			} elseif ( 'trash' != $post->post_status ) {
-				$actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
-			}
-			$actions = apply_filters('post_row_actions', $actions, $post);
-			$action_count = count($actions);
-			$i = 0;
-			echo '<div class="row-actions">';
-			foreach ( $actions as $action => $link ) {
-				++$i;
-				( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-				echo "<span class='$action'>$link$sep</span>";
-			}
-			echo '</div>';
-
-			get_inline_data($post);
-		?>
-		</td>
-		<?php
-		break;
-
-		case 'categories':
-		?>
-		<td <?php echo $attributes; ?>><?php
-			$categories = get_the_category();
-			if ( !empty( $categories ) ) {
-				$out = array();
-				foreach ( $categories as $c )
-					$out[] = "<a href='edit.php?post_type={$post->post_type}&amp;category_name={$c->slug}'> " . esc_html(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 echo $attributes; ?>><?php
-			$tags = get_the_tags($post->ID);
-			if ( !empty( $tags ) ) {
-				$out = array();
-				foreach ( $tags as $c )
-					$out[] = "<a href='edit.php?post_type={$post->post_type}&amp;tag={$c->slug}'> " . esc_html(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 <?php echo $attributes; ?>><div class="post-com-count-wrapper">
-		<?php
-			$pending_phrase = sprintf( __('%s pending'), number_format( $pending_comments ) );
-			if ( $pending_comments )
-				echo '<strong>';
-				comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
-				if ( $pending_comments )
-				echo '</strong>';
-		?>
-		</div></td>
-		<?php
-		break;
-
-		case 'author':
-		?>
-		<td <?php echo $attributes; ?>><a href="edit.php?post_type=<?php echo $post->post_type; ?>&amp;author=<?php the_author_meta('ID'); ?>"><?php the_author(); ?></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($post_type_object->cap->edit_post, $post->ID) ) { echo "<a href='$edit_link' class='edit'>" . __('Edit') . '</a>'; } ?></td>
-		<?php
-		break;
-
-		case 'control_delete':
-		?>
-		<td><?php if ( current_user_can($post_type_object->cap->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 echo $attributes; ?>><?php do_action('manage_posts_custom_column', $column_name, $post->ID); ?></td>
-		<?php
-		break;
-	}
-}
-?>
-	</tr>
-<?php
-	$post = $global_post;
-}
-
-/*
- * display one row if the page doesn't have any children
- * otherwise, display the row and its children in subsequent rows
- */
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $page
- * @param unknown_type $level
- */
-function display_page_row( $page, $level = 0 ) {
-	global $post, $current_screen;
-	static $rowclass;
-
-	$post = $page;
-	setup_postdata($page);
-
-	if ( 0 == $level && (int)$page->post_parent > 0 ) {
-		//sent level 0 by accident, by default, or because we don't know the actual level
-		$find_main_page = (int)$page->post_parent;
-		while ( $find_main_page > 0 ) {
-			$parent = get_page($find_main_page);
-
-			if ( is_null($parent) )
-				break;
-
-			$level++;
-			$find_main_page = (int)$parent->post_parent;
-
-			if ( !isset($parent_name) )
-				$parent_name = $parent->post_title;
-		}
-	}
-
-	$page->post_title = esc_html( $page->post_title );
-	$pad = str_repeat( '&#8212; ', $level );
-	$id = (int) $page->ID;
-	$rowclass = 'alternate' == $rowclass ? '' : 'alternate';
-	$posts_columns = get_column_headers( $current_screen );
-	$hidden = get_hidden_columns( $current_screen );
-	$title = _draft_or_post_title();
-	$post_type = $page->post_type;
-	$post_type_object = get_post_type_object($post_type);
-?>
-<tr id="page-<?php echo $id; ?>" class="<?php echo $rowclass; ?> iedit">
-<?php
-
-foreach ( $posts_columns as $column_name => $column_display_name ) {
-	$class = "class=\"$column_name column-$column_name\"";
-
-	$style = '';
-	if ( in_array($column_name, $hidden) )
-		$style = ' style="display:none;"';
-
-	$attributes = "$class$style";
-
-	switch ($column_name) {
-
-	case 'cb':
-		?>
-		<th scope="row" class="check-column"><?php if ( current_user_can( $post_type_object->cap->edit_post, $page->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
-		<?php
-		break;
-	case 'date':
-		if ( '0000-00-00 00:00:00' == $page->post_date && 'date' == $column_name ) {
-			$t_time = $h_time = __('Unpublished');
-			$time_diff = 0;
-		} else {
-			$t_time = get_the_time(__('Y/m/d g:i:s A'));
-			$m_time = $page->post_date;
-			$time = get_post_time('G', true);
-
-			$time_diff = time() - $time;
-
-			if ( $time_diff > 0 && $time_diff < 24*60*60 )
-				$h_time = sprintf( __('%s ago'), human_time_diff( $time ) );
-			else
-				$h_time = mysql2date(__('Y/m/d'), $m_time);
-		}
-		echo '<td ' . $attributes . '>';
-		echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $page, $column_name, '') . '</abbr>';
-		echo '<br />';
-		if ( 'publish' == $page->post_status ) {
-			_e('Published');
-		} elseif ( 'future' == $page->post_status ) {
-			if ( $time_diff > 0 )
-				echo '<strong class="attention">' . __('Missed schedule') . '</strong>';
-			else
-				_e('Scheduled');
-		} else {
-			_e('Last Modified');
-		}
-		echo '</td>';
-		break;
-	case 'title':
-		$attributes = 'class="post-title page-title column-title"' . $style;
-		$edit_link = get_edit_post_link( $page->ID );
-		?>
-		<td <?php echo $attributes; ?>><strong><?php if ( current_user_can($post_type_object->cap->edit_post, $page->ID) && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)); ?>"><?php echo $pad; echo $title; ?></a><?php } else { echo $pad; echo $title; }; _post_states($page); echo isset($parent_name) ? ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html($parent_name) : ''; ?></strong>
-		<?php
-		$actions = array();
-		if ( current_user_can($post_type_object->cap->edit_post, $page->ID) && $post->post_status != 'trash' ) {
-			$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr(__('Edit this page')) . '">' . __('Edit') . '</a>';
-			$actions['inline'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-		}
-		if ( current_user_can($post_type_object->cap->delete_post, $page->ID) ) {
-			if ( $post->post_status == 'trash' )
-				$actions['untrash'] = "<a title='" . esc_attr(__('Remove this page from the Trash')) . "' href='" . wp_nonce_url("post.php?post_type=$post_type&amp;action=untrash&amp;post=$page->ID", 'untrash-' . $post->post_type . '_' . $page->ID) . "'>" . __('Restore') . '</a>';
-			elseif ( EMPTY_TRASH_DAYS )
-				$actions['trash'] = "<a class='submitdelete' title='" . esc_attr(__('Move this page to the Trash')) . "' href='" . get_delete_post_link($page->ID) . "'>" . __('Trash') . '</a>';
-			if ( $post->post_status == 'trash' || !EMPTY_TRASH_DAYS )
-				$actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this page permanently')) . "' href='" . wp_nonce_url("post.php?post_type=$post_type&amp;action=delete&amp;post=$page->ID", 'delete-' . $post->post_type . '_' . $page->ID) . "'>" . __('Delete Permanently') . '</a>';
-		}
-		if ( in_array($post->post_status, array('pending', 'draft')) ) {
-			if ( current_user_can($post_type_object->cap->edit_post, $page->ID) )
-				$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink($page->ID) ) ) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
-		} elseif ( $post->post_status != 'trash' ) {
-			$actions['view'] = '<a href="' . get_permalink($page->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
-		}
-		$actions = apply_filters('page_row_actions', $actions, $page);
-		$action_count = count($actions);
-
-		$i = 0;
-		echo '<div class="row-actions">';
-		foreach ( $actions as $action => $link ) {
-			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-			echo "<span class='$action'>$link$sep</span>";
-		}
-		echo '</div>';
-
-		get_inline_data($post);
-		echo '</td>';
-		break;
-
-	case 'comments':
-		?>
-		<td <?php echo $attributes; ?>><div class="post-com-count-wrapper">
-		<?php
-		$left = get_pending_comments_num( $page->ID );
-		$pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
-		if ( $left )
-			echo '<strong>';
-		comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
-		if ( $left )
-			echo '</strong>';
-		?>
-		</div></td>
-		<?php
-		break;
-
-	case 'author':
-		?>
-		<td <?php echo $attributes; ?>><a href="edit.php?post_type=<?php echo $post_type; ?>&amp;author=<?php the_author_meta('ID'); ?>"><?php the_author(); ?></a></td>
-		<?php
-		break;
-
-	default:
-		?>
-		<td <?php echo $attributes; ?>><?php do_action('manage_pages_custom_column', $column_name, $id); ?></td>
-		<?php
-		break;
-	}
-}
-?>
-
-</tr>
-
-<?php
-}
-
-/*
- * displays pages in hierarchical order with paging support
- */
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $pages
- * @param unknown_type $pagenum
- * @param unknown_type $per_page
- * @return unknown
- */
-function page_rows($pages, $pagenum = 1, $per_page = 20) {
-	global $wpdb;
-
-	$level = 0;
-
-	if ( ! $pages ) {
-		$pages = get_pages( array('sort_column' => 'menu_order') );
-
-		if ( ! $pages )
-			return false;
-	}
-
-	/*
-	 * arrange pages into two parts: top level pages and children_pages
-	 * children_pages is two dimensional array, eg.
-	 * children_pages[10][] contains all sub-pages whose parent is 10.
-	 * It only takes O(N) to arrange this and it takes O(1) for subsequent lookup operations
-	 * If searching, ignore hierarchy and treat everything as top level
-	 */
-	if ( empty($_GET['s']) ) {
-
-		$top_level_pages = array();
-		$children_pages = array();
-
-		foreach ( $pages as $page ) {
-
-			// catch and repair bad pages
-			if ( $page->post_parent == $page->ID ) {
-				$page->post_parent = 0;
-				$wpdb->update($wpdb->posts, array('post_parent' => 0), array('ID' => $page->ID));
-				clean_page_cache( $page->ID );
-			}
-
-			if ( 0 == $page->post_parent )
-				$top_level_pages[] = $page;
-			else
-				$children_pages[ $page->post_parent ][] = $page;
-		}
-
-		$pages = &$top_level_pages;
-	}
-
-	$count = 0;
-	$start = ($pagenum - 1) * $per_page;
-	$end = $start + $per_page;
-
-	foreach ( $pages as $page ) {
-		if ( $count >= $end )
-			break;
-
-		if ( $count >= $start )
-			echo "\t" . display_page_row( $page, $level );
-
-		$count++;
-
-		if ( isset($children_pages) )
-			_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
-	}
-
-	// if it is the last pagenum and there are orphaned pages, display them with paging as well
-	if ( isset($children_pages) && $count < $end ) {
-		foreach ( $children_pages as $orphans ) {
-			foreach ( $orphans as $op ) {
-				if ( $count >= $end )
-					break;
-				if ( $count >= $start )
-					echo "\t" . display_page_row( $op, 0 );
-				$count++;
-			}
-		}
-	}
-}
-
-/**
- * Given a top level page ID, display the nested hierarchy of sub-pages
- * together with paging support
- *
- * @since unknown
- *
- * @param unknown_type $children_pages
- * @param unknown_type $count
- * @param unknown_type $parent
- * @param unknown_type $level
- * @param unknown_type $pagenum
- * @param unknown_type $per_page
- */
-function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
-
-	if ( ! isset( $children_pages[$parent] ) )
-		return;
-
-	$start = ($pagenum - 1) * $per_page;
-	$end = $start + $per_page;
-
-	foreach ( $children_pages[$parent] as $page ) {
-
-		if ( $count >= $end )
-			break;
-
-		// If the page starts in a subtree, print the parents.
-		if ( $count == $start && $page->post_parent > 0 ) {
-			$my_parents = array();
-			$my_parent = $page->post_parent;
-			while ( $my_parent) {
-				$my_parent = get_post($my_parent);
-				$my_parents[] = $my_parent;
-				if ( !$my_parent->post_parent )
-					break;
-				$my_parent = $my_parent->post_parent;
-			}
-			$num_parents = count($my_parents);
-			while ( $my_parent = array_pop($my_parents) ) {
-				echo "\t" . display_page_row( $my_parent, $level - $num_parents );
-				$num_parents--;
-			}
-		}
-
-		if ( $count >= $start )
-			echo "\t" . display_page_row( $page, $level );
-
-		$count++;
-
-		_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
-	}
-
-	unset( $children_pages[$parent] ); //required in order to keep track of orphans
-}
-
-/**
- * Generate HTML for a single row on the users.php admin panel.
- *
- * @since 2.1.0
- *
- * @param object $user_object
- * @param string $style Optional. Attributes added to the TR element. Must be sanitized.
- * @param string $role Key for the $wp_roles array.
- * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts.
- * @return string
- */
-function user_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
-	global $wp_roles;
-
-	if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
-		$user_object = new WP_User( (int) $user_object );
-	$user_object = sanitize_user_object($user_object, 'display');
-	$email = $user_object->user_email;
-	$url = $user_object->user_url;
-	$short_url = str_replace( 'http://', '', $url );
-	$short_url = str_replace( 'www.', '', $short_url );
-	if ('/' == substr( $short_url, -1 ))
-		$short_url = substr( $short_url, 0, -1 );
-	if ( strlen( $short_url ) > 35 )
-		$short_url = substr( $short_url, 0, 32 ).'...';
-	$checkbox = '';
-	// Check if the user for this row is editable
-	if ( current_user_can( 'list_users' ) ) {
-		// Set up the user editing link
-		// TODO: make profile/user-edit determination a separate function
-		if ( get_current_user_id() == $user_object->ID) {
-			$edit_link = 'profile.php';
-		} else {
-			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( esc_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) );
-		}
-		$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
-
-		// Set up the hover actions for this user
-		$actions = array();
-
-		if ( current_user_can('edit_user', $user_object->ID) ) {
-			$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
-			$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		} else {
-			$edit = "<strong>$user_object->user_login</strong><br />";
-		}
-
-		if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('delete_user', $user_object->ID) )
-			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . '</a>';
-		if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('remove_user', $user_object->ID) )
-			$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=remove&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Remove') . '</a>';
-		$actions = apply_filters('user_row_actions', $actions, $user_object);
-		$action_count = count($actions);
-		$i = 0;
-		$edit .= '<div class="row-actions">';
-		foreach ( $actions as $action => $link ) {
-			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-			$edit .= "<span class='$action'>$link$sep</span>";
-		}
-		$edit .= '</div>';
-
-		// Set up the checkbox (because the user is editable, otherwise its empty)
-		$checkbox = "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
-
-	} else {
-		$edit = '<strong>' . $user_object->user_login . '</strong>';
-	}
-	$role_name = isset($wp_roles->role_names[$role]) ? translate_user_role($wp_roles->role_names[$role] ) : __('None');
-	$r = "<tr id='user-$user_object->ID'$style>";
-	$columns = get_column_headers('users');
-	$hidden = get_hidden_columns('users');
-	$avatar = get_avatar( $user_object->ID, 32 );
-	foreach ( $columns as $column_name => $column_display_name ) {
-		$class = "class=\"$column_name column-$column_name\"";
-
-		$style = '';
-		if ( in_array($column_name, $hidden) )
-			$style = ' style="display:none;"';
-
-		$attributes = "$class$style";
-
-		switch ($column_name) {
-			case 'cb':
-				$r .= "<th scope='row' class='check-column'>$checkbox</th>";
-				break;
-			case 'username':
-				$r .= "<td $attributes>$avatar $edit</td>";
-				break;
-			case 'name':
-				$r .= "<td $attributes>$user_object->first_name $user_object->last_name</td>";
-				break;
-			case 'email':
-				$r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __('E-mail: %s' ), $email ) . "'>$email</a></td>";
-				break;
-			case 'role':
-				$r .= "<td $attributes>$role_name</td>";
-				break;
-			case 'posts':
-				$attributes = 'class="posts column-posts num"' . $style;
-				$r .= "<td $attributes>";
-				if ( $numposts > 0 ) {
-					$r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>";
-					$r .= $numposts;
-					$r .= '</a>';
-				} else {
-					$r .= 0;
-				}
-				$r .= "</td>";
-				break;
-			default:
-				$r .= "<td $attributes>";
-				$r .= apply_filters('manage_users_custom_column', '', $column_name, $user_object->ID);
-				$r .= "</td>";
-		}
-	}
-	$r .= '</tr>';
-
-	return $r;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param string $status Comment status (approved, spam, trash, etc)
- * @param string $s Term to search for
- * @param int $start Offset to start at for pagination
- * @param int $num Maximum number of comments to return
- * @param int $post Post ID or 0 to return all comments
- * @param string $type Comment type (comment, trackback, pingback, etc)
- * @return array [0] contains the comments and [1] contains the total number of comments that match (ignoring $start and $num)
- */
-function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0, $type = '' ) {
-	global $wpdb;
-
-	$start = abs( (int) $start );
-	$num = (int) $num;
-	$post = (int) $post;
-	$count = wp_count_comments();
-	$index = '';
-
-	if ( 'moderated' == $status ) {
-		$approved = "c.comment_approved = '0'";
-		$total = $count->moderated;
-	} elseif ( 'approved' == $status ) {
-		$approved = "c.comment_approved = '1'";
-		$total = $count->approved;
-	} elseif ( 'spam' == $status ) {
-		$approved = "c.comment_approved = 'spam'";
-		$total = $count->spam;
-	} elseif ( 'trash' == $status ) {
-		$approved = "c.comment_approved = 'trash'";
-		$total = $count->trash;
-	} else {
-		$approved = "( c.comment_approved = '0' OR c.comment_approved = '1' )";
-		$total = $count->moderated + $count->approved;
-		$index = 'USE INDEX (c.comment_date_gmt)';
-	}
-
-	if ( $post ) {
-		$total = '';
-		$post = " AND c.comment_post_ID = '$post'";
-	} else {
-		$post = '';
-	}
-
-	$orderby = "ORDER BY c.comment_date_gmt DESC LIMIT $start, $num";
-
-	if ( 'comment' == $type )
-		$typesql = "AND c.comment_type = ''";
-	elseif ( 'pings' == $type )
-		$typesql = "AND ( c.comment_type = 'pingback' OR c.comment_type = 'trackback' )";
-	elseif ( 'all' == $type )
-		$typesql = '';
-	elseif ( !empty($type) )
-		$typesql = $wpdb->prepare("AND c.comment_type = %s", $type);
-	else
-		$typesql = '';
-
-	if ( !empty($type) )
-		$total = '';
-
-	$query = "FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE p.post_status != 'trash' ";
-	if ( $s ) {
-		$total = '';
-		$s = $wpdb->escape($s);
-		$query .= "AND
-			(c.comment_author LIKE '%$s%' OR
-			c.comment_author_email LIKE '%$s%' OR
-			c.comment_author_url LIKE ('%$s%') OR
-			c.comment_author_IP LIKE ('%$s%') OR
-			c.comment_content LIKE ('%$s%') ) AND
-			$approved
-			$typesql";
-	} else {
-		$query .= "AND $approved $post $typesql";
-	}
-
-	$comments = $wpdb->get_results("SELECT * $query $orderby");
-	if ( '' === $total )
-		$total = $wpdb->get_var("SELECT COUNT(c.comment_ID) $query");
-
-	update_comment_cache($comments);
-
-	return array($comments, $total);
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $comment_id
- * @param unknown_type $mode
- * @param unknown_type $comment_status
- * @param unknown_type $checkbox
- */
-function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true, $from_ajax = false ) {
-	global $comment, $post, $_comment_pending_count;
-	$comment = get_comment( $comment_id );
-	$post = get_post($comment->comment_post_ID);
-	$the_comment_status = wp_get_comment_status($comment->comment_ID);
-	$post_type_object = get_post_type_object($post->post_type);
-	$user_can = current_user_can($post_type_object->cap->edit_post, $post->ID);
-
-	$comment_url = esc_url(get_comment_link($comment->comment_ID));
-	$author_url = get_comment_author_url();
-	if ( 'http://' == $author_url )
-		$author_url = '';
-	$author_url_display = preg_replace('|http://(www\.)?|i', '', $author_url);
-	if ( strlen($author_url_display) > 50 )
-		$author_url_display = substr($author_url_display, 0, 49) . '...';
-
-	$ptime = date('G', strtotime( $comment->comment_date ) );
-	if ( ( abs(time() - $ptime) ) < 86400 )
-		$ptime = sprintf( __('%s ago'), human_time_diff( $ptime ) );
-	else
-		$ptime = mysql2date(__('Y/m/d \a\t g:i A'), $comment->comment_date );
-
-	if ( $user_can ) {
-		$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
-		$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
-
-		$approve_url = esc_url( "comment.php?action=approvecomment&p=$post->ID&c=$comment->comment_ID&$approve_nonce" );
-		$unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$post->ID&c=$comment->comment_ID&$approve_nonce" );
-		$spam_url = esc_url( "comment.php?action=spamcomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-		$unspam_url = esc_url( "comment.php?action=unspamcomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-		$trash_url = esc_url( "comment.php?action=trashcomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-		$untrash_url = esc_url( "comment.php?action=untrashcomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-		$delete_url = esc_url( "comment.php?action=deletecomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-	}
-
-	echo "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>";
-	$columns = get_column_headers('edit-comments');
-	$hidden = get_hidden_columns('edit-comments');
-	foreach ( $columns as $column_name => $column_display_name ) {
-		$class = "class=\"$column_name column-$column_name\"";
-
-		$style = '';
-		if ( in_array($column_name, $hidden) )
-			$style = ' style="display:none;"';
-
-		$attributes = "$class$style";
-
-		switch ($column_name) {
-			case 'cb':
-				if ( !$checkbox ) break;
-				echo '<th scope="row" class="check-column">';
-				if ( $user_can ) echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
-				echo '</th>';
-				break;
-			case 'comment':
-				echo "<td $attributes>";
-				echo '<div id="submitted-on">';
-				/* translators: 2: comment date, 3: comment time */
-				printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
-					/* translators: comment date format. See http://php.net/date */ get_comment_date( __('Y/m/d') ),
-					/* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
-
-				if ( $comment->comment_parent ) {
-					$parent = get_comment( $comment->comment_parent );
-					$parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
-					$name = apply_filters( 'get_comment_author', $parent->comment_author ); // there's no API function for this
-					printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
-				}
-
-				echo '</div>';
-				comment_text();
-				if ( $user_can ) { ?>
-				<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
-				<textarea class="comment" rows="1" cols="1"><?php echo htmlspecialchars( apply_filters('comment_edit_pre', $comment->comment_content), ENT_QUOTES ); ?></textarea>
-				<div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
-				<div class="author"><?php echo esc_attr( $comment->comment_author ); ?></div>
-				<div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
-				<div class="comment_status"><?php echo $comment->comment_approved; ?></div>
-				</div>
-				<?php
-				}
-
-				if ( $user_can ) {
-					// preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
-					$actions = array(
-						'approve' => '', 'unapprove' => '',
-						'reply' => '',
-						'quickedit' => '',
-						'edit' => '',
-						'spam' => '', 'unspam' => '',
-						'trash' => '', 'untrash' => '', 'delete' => ''
-					);
-
-					if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
-						if ( 'approved' == $the_comment_status )
-							$actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-						else if ( 'unapproved' == $the_comment_status )
-							$actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-					} else {
-						$actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-						$actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-					}
-
-					if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
-						$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
-					} elseif ( 'spam' == $the_comment_status ) {
-						$actions['unspam'] = "<a href='$unspam_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1 vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</a>';
-					} elseif ( 'trash' == $the_comment_status ) {
-						$actions['untrash'] = "<a href='$untrash_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1 vim-z vim-destructive'>" . __( 'Restore' ) . '</a>';
-					}
-
-					if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) {
-						$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::delete=1 delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
-					} else {
-						$actions['trash'] = "<a href='$trash_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x('Trash', 'verb') . '</a>';
-					}
-
-					if ( 'trash' != $the_comment_status ) {
-						$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
-						$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.esc_attr__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
-						if ( 'spam' != $the_comment_status )
-							$actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
-					}
-
-					$actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
-
-					$i = 0;
-					echo '<div class="row-actions">';
-					foreach ( $actions as $action => $link ) {
-						++$i;
-						( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
-
-						// Reply and quickedit need a hide-if-no-js span when not added with ajax
-						if ( ('reply' == $action || 'quickedit' == $action) && ! $from_ajax )
-							$action .= ' hide-if-no-js';
-						elseif ( ($action == 'untrash' && $the_comment_status == 'trash') || ($action == 'unspam' && $the_comment_status == 'spam') ) {
-							if ('1' == get_comment_meta($comment_id, '_wp_trash_meta_status', true))
-								$action .= ' approve';
-							else
-								$action .= ' unapprove';
-						}
-
-						echo "<span class='$action'>$sep$link</span>";
-					}
-					echo '</div>';
-				}
-
-				echo '</td>';
-				break;
-			case 'author':
-				echo "<td $attributes><strong>"; comment_author(); echo '</strong><br />';
-				if ( !empty($author_url) )
-					echo "<a title='$author_url' href='$author_url'>$author_url_display</a><br />";
-				if ( $user_can ) {
-					if ( !empty($comment->comment_author_email) ) {
-						comment_author_email_link();
-						echo '<br />';
-					}
-					echo '<a href="edit-comments.php?s=';
-					comment_author_IP();
-					echo '&amp;mode=detail';
-					if ( 'spam' == $comment_status )
-						echo '&amp;comment_status=spam';
-					echo '">';
-					comment_author_IP();
-					echo '</a>';
-				} //current_user_can
-				echo '</td>';
-				break;
-			case 'date':
-				echo "<td $attributes>" . get_comment_date(__('Y/m/d \a\t g:ia')) . '</td>';
-				break;
-			case 'response':
-				if ( 'single' !== $mode ) {
-					if ( isset( $_comment_pending_count[$post->ID] ) ) {
-						$pending_comments = $_comment_pending_count[$post->ID];
-					} else {
-						$_comment_pending_count_temp = get_pending_comments_num( array( $post->ID ) );
-						$pending_comments = $_comment_pending_count[$post->ID] = $_comment_pending_count_temp[$post->ID];
-					}
-					if ( $user_can ) {
-						$post_link = "<a href='" . get_edit_post_link($post->ID) . "'>";
-						$post_link .= get_the_title($post->ID) . '</a>';
-					} else {
-						$post_link = get_the_title($post->ID);
-					}
-					echo "<td $attributes>\n";
-					echo '<div class="response-links"><span class="post-com-count-wrapper">';
-					echo $post_link . '<br />';
-					$pending_phrase = esc_attr(sprintf( __('%s pending'), number_format( $pending_comments ) ));
-					if ( $pending_comments )
-						echo '<strong>';
-					comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
-					if ( $pending_comments )
-						echo '</strong>';
-					echo '</span> ';
-					echo "<a href='" . get_permalink( $post->ID ) . "'>#</a>";
-					echo '</div>';
-					if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) )
-						echo $thumb;
-					echo '</td>';
-				}
-				break;
-			default:
-				echo "<td $attributes>\n";
-				do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
-				echo "</td>\n";
-				break;
-		}
-	}
-	echo "</tr>\n";
-}
-
 /**
  * {@internal Missing Short Description}}
  *
@@ -2230,8 +293,11 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
 		return;
 	}
 
-	$columns = get_column_headers('edit-comments');
-	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns('edit-comments') ) );
+	require_once( './includes/default-list-tables.php' );
+	$table = new WP_Comments_Table( 'reply' );
+
+	$columns = $table->get_column_headers();
+	$hidden = array_intersect( array_keys( $columns ), array_filter( $table->get_hidden_columns() ) );
 	$col_count = count($columns) - count($hidden);
 
 ?>
@@ -2245,17 +311,17 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
 
 	<div id="edithead" style="display:none;">
 		<div class="inside">
-		<label for="author"><?php _e('Name'); ?></label>
+		<label for="author"><?php _e('Name') ?></label>
 		<input type="text" name="newcomment_author" size="50" value="" tabindex="101" id="author" />
 		</div>
 
 		<div class="inside">
-		<label for="author-email"><?php _e('E-mail'); ?></label>
+		<label for="author-email"><?php _e('E-mail') ?></label>
 		<input type="text" name="newcomment_author_email" size="50" value="" tabindex="102" id="author-email" />
 		</div>
 
 		<div class="inside">
-		<label for="author-url"><?php _e('URL'); ?></label>
+		<label for="author-url"><?php _e('URL') ?></label>
 		<input type="text" id="author-url" name="newcomment_author_url" size="103" value="" tabindex="103" />
 		</div>
 		<div style="clear:both;"></div>
@@ -2337,8 +403,8 @@ function list_meta( $meta ) {
 <table id="list-table">
 	<thead>
 	<tr>
-		<th class="left"><?php _e( 'Name' ); ?></th>
-		<th><?php _e( 'Value' ); ?></th>
+		<th class="left"><?php _e( 'Name' ) ?></th>
+		<th><?php _e( 'Value' ) ?></th>
 	</tr>
 	</thead>
 	<tbody id='the-list' class='list:meta'>
@@ -2422,12 +488,12 @@ function meta_form() {
 	if ( $keys )
 		natcasesort($keys);
 ?>
-<p><strong><?php _e( 'Add New Custom Field:' ); ?></strong></p>
+<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
 <table id="newmeta">
 <thead>
 <tr>
-<th class="left"><label for="metakeyselect"><?php _e( 'Name' ); ?></label></th>
-<th><label for="metavalue"><?php _e( 'Value' ); ?></label></th>
+<th class="left"><label for="metakeyselect"><?php _e( 'Name' ) ?></label></th>
+<th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
 </tr>
 </thead>
 
@@ -2440,7 +506,7 @@ function meta_form() {
 <?php
 
 	foreach ( $keys as $key ) {
-		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . '</option>';
+		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
 	}
 ?>
 </select>
@@ -2456,7 +522,7 @@ function meta_form() {
 </tr>
 
 <tr><td colspan="2" class="submit">
-<input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php esc_attr_e( 'Add Custom Field' ); ?>" />
+<input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php esc_attr_e( 'Add Custom Field' ) ?>" />
 <?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
 </td></tr>
 </tbody>
@@ -2586,7 +652,7 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
 			else
 				$current = '';
 
-			echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . '</option>';
+			echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>";
 			parent_dropdown( $default, $item->ID, $level +1 );
 		}
 	} else {
@@ -2618,26 +684,26 @@ function the_attachment_links( $id = false ) {
 	<col />
 	<col class="widefat" />
 	<tr>
-		<th scope="row"><?php _e( 'URL' ); ?></th>
+		<th scope="row"><?php _e( 'URL' ) ?></th>
 		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><?php echo wp_get_attachment_url(); ?></textarea></td>
 	</tr>
 <?php if ( $icon ) : ?>
 	<tr>
 		<th scope="row"><?php $thumb ? _e( 'Thumbnail linked to file' ) : _e( 'Image linked to file' ); ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $icon; ?></a></textarea></td>
+		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $icon ?></a></textarea></td>
 	</tr>
 	<tr>
 		<th scope="row"><?php $thumb ? _e( 'Thumbnail linked to page' ) : _e( 'Image linked to page' ); ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ); ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php echo $icon; ?></a></textarea></td>
+		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ) ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php echo $icon ?></a></textarea></td>
 	</tr>
 <?php else : ?>
 	<tr>
-		<th scope="row"><?php _e( 'Link to file' ); ?></th>
+		<th scope="row"><?php _e( 'Link to file' ) ?></th>
 		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>" class="attachmentlink"><?php echo basename( wp_get_attachment_url() ); ?></a></textarea></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php _e( 'Link to page' ); ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ); ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php the_title(); ?></a></textarea></td>
+		<th scope="row"><?php _e( 'Link to page' ) ?></th>
+		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ) ?>" rel="attachment wp-att-<?php echo $post->ID ?>"><?php the_title(); ?></a></textarea></td>
 	</tr>
 <?php endif; ?>
 </table>
@@ -2776,35 +842,35 @@ function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $pri
 		$wp_meta_boxes[$page][$context] = array();
 
 	foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
-		foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
-				continue;
-	
-			// If a core box was previously added or removed by a plugin, don't add.
-			if ( 'core' == $priority ) {
-				// If core box previously deleted, don't add
-				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
-					return;
-				// If box was added with default priority, give it core priority to maintain sort order
-				if ( 'default' == $a_priority ) {
-					$wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
-					unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
-				}
+	foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
+		if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
+			continue;
+
+		// If a core box was previously added or removed by a plugin, don't add.
+		if ( 'core' == $priority ) {
+			// If core box previously deleted, don't add
+			if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
 				return;
+			// If box was added with default priority, give it core priority to maintain sort order
+			if ( 'default' == $a_priority ) {
+				$wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
+				unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
 			}
-			// If no priority given and id already present, use existing priority
-			if ( empty($priority) ) {
-				$priority = $a_priority;
-			// else if we're adding to the sorted priortiy, we don't know the title or callback. Glab them from the previously added context/priority.
-			} elseif ( 'sorted' == $priority ) {
-				$title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
-				$callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
-				$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
-			}
-			// An id can be in only one priority and one context
-			if ( $priority != $a_priority || $context != $a_context )
-				unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+			return;
 		}
+		// If no priority given and id already present, use existing priority
+		if ( empty($priority) ) {
+			$priority = $a_priority;
+		// else if we're adding to the sorted priortiy, we don't know the title or callback. Glab them from the previously added context/priority.
+		} elseif ( 'sorted' == $priority ) {
+			$title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
+			$callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
+			$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
+		}
+		// An id can be in only one priority and one context
+		if ( $priority != $a_priority || $context != $a_context )
+			unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+	}
 	}
 
 	if ( empty($priority) )
@@ -2868,7 +934,7 @@ function do_meta_boxes($page, $context, $object) {
 		}
 	} while(0);
 
-	echo '</div>';
+	echo "</div>";
 
 	return $i;
 
@@ -3149,7 +1215,7 @@ function add_settings_error( $setting, $code, $message, $type = 'error' ) {
  * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
  * @return array Array of settings errors
  */
-function get_settings_errors( $setting = '', $sanitize = false ) {
+function get_settings_errors( $setting = '', $sanitize = FALSE ) {
 	global $wp_settings_errors;
 
 	// If $sanitize is true, manually re-run the sanitizisation for this option
@@ -3200,23 +1266,23 @@ function get_settings_errors( $setting = '', $sanitize = false ) {
  * @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
  * @return <type>
  */
-function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
+function settings_errors ( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
 
-	if ( $hide_on_update && !empty($_GET['updated']) )
-		return;
+	if ($hide_on_update AND $_GET['updated']) return;
 
 	$settings_errors = get_settings_errors( $setting, $sanitize );
 
-	if ( !is_array($settings_errors) )
-		return;
+	if ( !is_array($settings_errors) ) return;
 
+	$output = '';
 	foreach ( $settings_errors as $key => $details ) {
 		$css_id = 'setting-error-' . $details['code'];
 		$css_class = $details['type'] . ' settings-error';
-		echo "<div id='$css_id' class='$css_class'>\n";
-		echo "<p><strong>{$details['message']}</strong></p>";
-		echo "</div>\n";
+		$output .= "<div id='$css_id' class='$css_class'> \n";
+		$output .= "<p><strong>{$details['message']}</strong></p>";
+		$output .= "</div> \n";
 	}
+	echo $output;
 }
 
 /**
@@ -3227,12 +1293,14 @@ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = fa
  * @param unknown_type $page
  */
 function manage_columns_prefs( $page ) {
-	$columns = get_column_headers( $page );
-	$hidden  = get_hidden_columns( $page );
+	global $table;
+
+	list( $columns, $hidden ) = $table->get_column_headers();
+
 	$special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username');
 
 	foreach ( $columns as $column => $title ) {
-		// Can't hide these or they are special
+		// Can't hide these for they are special
 		if ( in_array( $column, $special ) )
 			continue;
 		if ( empty( $title ) )
@@ -3276,7 +1344,7 @@ function find_posts_div($found_action = '') {
 					if ( 'attachment' == $post->name )
 						continue;
 				?>
-				<input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo esc_attr($post->name); ?>" <?php checked($post->name, 'post'); ?> />
+				<input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo esc_attr($post->name); ?>" <?php checked($post->name,  'post'); ?> />
 				<label for="find-posts-<?php echo esc_attr($post->name); ?>"><?php echo $post->label; ?></label>
 				<?php
 				} ?>
@@ -3302,8 +1370,7 @@ function find_posts_div($found_action = '') {
  */
 function the_post_password() {
 	global $post;
-	if ( isset( $post->post_password ) )
-		echo esc_attr( $post->post_password );
+	if ( isset( $post->post_password ) ) echo esc_attr( $post->post_password );
 }
 
 /**
@@ -3407,7 +1474,7 @@ function favorite_actions( $screen = null ) {
 
 	array_shift($allowed_actions);
 
-	foreach ( $allowed_actions as $action => $label ) {
+	foreach ( $allowed_actions as $action => $label) {
 		echo "<div class='favorite-action'><a href='$action'>";
 		echo $label;
 		echo "</a></div>\n";
@@ -3443,8 +1510,7 @@ function _draft_or_post_title($post_id = 0) {
  *
  */
 function _admin_search_query() {
-	if ( isset($_GET['s']) )
-		echo esc_attr( stripslashes( $_GET['s'] ) );
+	echo isset($_GET['s']) ? esc_attr( stripslashes( $_GET['s'] ) ) : '';
 }
 
 /**
@@ -3456,18 +1522,17 @@ function _admin_search_query() {
  *
  */
 function iframe_header( $title = '', $limit_styles = false ) {
-	global $hook_suffix;
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+global $hook_suffix;
+?><!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 bloginfo('name'); ?> &rsaquo; <?php echo $title; ?> &#8212; <?php _e('WordPress'); ?></title>
+<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php
-	wp_enqueue_style( 'global' );
-	if ( ! $limit_styles )
-		wp_enqueue_style( 'wp-admin' );
-	wp_enqueue_style( 'colors' );
+wp_enqueue_style( 'global' );
+if ( ! $limit_styles )
+	wp_enqueue_style( 'wp-admin' );
+wp_enqueue_style( 'colors' );
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -3476,14 +1541,14 @@ function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_r
 //]]>
 </script>
 <?php
-	do_action('admin_print_styles');
-	do_action('admin_print_scripts');
-	do_action('admin_head');
-	
-	$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
+do_action('admin_print_styles');
+do_action('admin_print_scripts');
+do_action('admin_head');
+
+$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 </head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="no-js <?php echo $admin_body_class; ?>">
+<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>  class="no-js <?php echo $admin_body_class; ?>">
 <script type="text/javascript">
 //<![CDATA[
 (function(){
@@ -3564,12 +1629,13 @@ function convert_to_screen( $screen ) {
 }
 
 function screen_meta($screen) {
-	global $wp_meta_boxes, $_wp_contextual_help, $title;
+	global $wp_meta_boxes, $_wp_contextual_help, $title, $table;
 
 	if ( is_string($screen) )
 		$screen = convert_to_screen($screen);
 
-	$column_screens = get_column_headers($screen);
+	if ( is_object($table) )
+		list( $screen_columns ) = $table->get_column_headers();
 	$meta_screens = array('index' => 'dashboard');
 
 	if ( isset($meta_screens[$screen->id]) ) {
@@ -3578,7 +1644,7 @@ function screen_meta($screen) {
 	}
 
 	$show_screen = false;
-	if ( !empty($wp_meta_boxes[$screen->id]) || !empty($column_screens) )
+	if ( !empty($wp_meta_boxes[$screen->id]) || !empty($screen_columns) )
 		$show_screen = true;
 
 	$screen_options = screen_options($screen);
@@ -3596,22 +1662,23 @@ function screen_meta($screen) {
 			$show_screen = true;
 			break;
 	}
-	if ( ! empty( $settings ) )
+	if( ! empty( $settings ) )
 		$show_screen = true;
+
 ?>
 <div id="screen-meta">
 <?php if ( $show_screen ) : ?>
 <div id="screen-options-wrap" class="hidden">
 	<form id="adv-settings" action="" method="post">
 	<?php if ( isset($wp_meta_boxes[$screen->id]) ) : ?>
-		<h5><?php _ex('Show on screen', 'Metaboxes'); ?></h5>
+		<h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
 		<div class="metabox-prefs">
 			<?php meta_box_prefs($screen); ?>
 			<br class="clear" />
 		</div>
 		<?php endif;
-		if ( ! empty($column_screens) ) : ?>
-		<h5><?php echo ( isset( $column_screens['_title'] ) ? $column_screens['_title'] : _x('Show on screen', 'Columns') ); ?></h5>
+		if ( ! empty($screen_columns) ) : ?>
+		<h5><?php echo ( isset( $screen_columns['_title'] ) ?  $screen_columns['_title'] :  _x('Show on screen', 'Columns') ) ?></h5>
 		<div class="metabox-prefs">
 			<?php manage_columns_prefs($screen); ?>
 			<br class="clear" />
@@ -3621,7 +1688,7 @@ function screen_meta($screen) {
 
 	if ( !empty( $screen_options ) ) {
 		?>
-		<h5><?php _ex('Show on screen', 'Screen Options'); ?></h5>
+		<h5><?php _ex('Show on screen', 'Screen Options') ?></h5>
 		<?php
 	}
 
@@ -3655,11 +1722,11 @@ function screen_meta($screen) {
 
 <div id="screen-meta-links">
 <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
-<a href="#contextual-help" id="contextual-help-link" class="show-settings"><?php _e('Help'); ?></a>
+<a href="#contextual-help" id="contextual-help-link" class="show-settings"><?php _e('Help') ?></a>
 </div>
 <?php if ( $show_screen ) { ?>
 <div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
-<a href="#screen-options" id="show-settings-link" class="show-settings"><?php _e('Screen Options'); ?></a>
+<a href="#screen-options" id="show-settings-link" class="show-settings"><?php _e('Screen Options') ?></a>
 </div>
 <?php } ?>
 </div>
@@ -3672,7 +1739,7 @@ function screen_meta($screen) {
  *
  * @since 2.7.0
  *
- * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
+ * @param string $screen The handle for the screen to add help to.  This is usually the hook name returned by the add_*_page() functions.
  * @param string $help Arbitrary help text
  */
 function add_contextual_help($screen, $help) {
@@ -3727,7 +1794,7 @@ function screen_layout($screen) {
 	$num = $columns[$screen->id];
 
 	if ( ! $screen_layout_columns )
-		$screen_layout_columns = 2;
+			$screen_layout_columns = 2;
 
 	$i = 1;
 	$return = '<h5>' . __('Screen Layout') . "</h5>\n<div class='columns-prefs'>" . __('Number of Columns:') . "\n";
@@ -3747,7 +1814,7 @@ function screen_options($screen) {
 		case 'edit':
 		case 'edit-pages':
 			$post_type = 'post';
-			if ( isset($_GET['post_type']) && in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) )
+			if ( isset($_GET['post_type']) && in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) )
 				$post_type = $_GET['post_type'];
 			$post_type_object = get_post_type_object($post_type);
 			$per_page_label = $post_type_object->labels->name;
@@ -3755,6 +1822,7 @@ function screen_options($screen) {
 		case 'ms-sites':
 			$per_page_label = _x( 'Sites', 'sites per page (screen options)' );
 			break;
+		case 'users':
 		case 'ms-users':
 			$per_page_label = _x( 'Users', 'users per page (screen options)' );
 			break;
@@ -3904,7 +1972,7 @@ function compression_test() {
  *
  * @param string $id Screen id, optional.
  */
-function set_current_screen( $id = '' ) {
+function set_current_screen( $id =  '' ) {
 	global $current_screen, $hook_suffix, $typenow, $taxnow;
 
 	$action = '';
@@ -3962,4 +2030,3 @@ function set_current_screen( $id = '' ) {
 	$current_screen = apply_filters('current_screen', $current_screen);
 }
 
-?>
diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php
index ea96ef8bd7..675428dda9 100644
--- a/wp-admin/includes/theme-install.php
+++ b/wp-admin/includes/theme-install.php
@@ -88,59 +88,6 @@ function install_themes_feature_list( ) {
 	return $feature_list;
 }
 
-add_action('install_themes_search', 'install_theme_search', 10, 1);
-/**
- * Display theme search results
- *
- * @since 2.8.0
- *
- * @param string $page
- */
-function install_theme_search($page) {
-	global $theme_field_defaults;
-
-	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
-	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-
-	$args = array();
-
-	switch( $type ){
-		case 'tag':
-			$terms = explode(',', $term);
-			$terms = array_map('trim', $terms);
-			$terms = array_map('sanitize_title_with_dashes', $terms);
-			$args['tag'] = $terms;
-			break;
-		case 'term':
-			$args['search'] = $term;
-			break;
-		case 'author':
-			$args['author'] = $term;
-			break;
-	}
-
-	$args['page'] = $page;
-	$args['fields'] = $theme_field_defaults;
-
-	if ( !empty( $_POST['features'] ) ) {
-		$terms = $_POST['features'];
-		$terms = array_map( 'trim', $terms );
-		$terms = array_map( 'sanitize_title_with_dashes', $terms );
-		$args['tag'] = $terms;
-		$_REQUEST['s'] = implode( ',', $terms );
-		$_REQUEST['type'] = 'tag';
-	}
-
-	$api = themes_api('query_themes', $args);
-
-	if ( is_wp_error($api) )
-		wp_die($api);
-
-	add_action('install_themes_table_header', 'install_theme_search_form');
-
-	display_themes($api->themes, $api->info['page'], $api->info['pages']);
-}
-
 /**
  * Display search form for searching themes.
  *
@@ -152,7 +99,8 @@ function install_theme_search_form() {
 	?>
 <p class="install-help"><?php _e('Search for themes by keyword, author, or tag.') ?></p>
 
-<form id="search-themes" method="post" action="<?php echo admin_url( 'theme-install.php?tab=search' ); ?>">
+<form id="search-themes" method="get" action="">
+	<input type="hidden" name="tab" value="search" />
 	<select	name="type" id="typeselector">
 	<option value="term" <?php selected('term', $type) ?>><?php _e('Term'); ?></option>
 	<option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
@@ -164,7 +112,6 @@ function install_theme_search_form() {
 <?php
 }
 
-add_action('install_themes_dashboard', 'install_themes_dashboard');
 /**
  * Display tags filter for themes.
  *
@@ -222,57 +169,8 @@ function install_themes_dashboard() {
 </form>
 <?php
 }
+add_action('install_themes_dashboard', 'install_themes_dashboard');
 
-add_action('install_themes_featured', 'install_themes_featured', 10, 1);
-/**
- * Display featured themes.
- *
- * @since 2.8.0
- *
- * @param string $page
- */
-function install_themes_featured($page = 1) {
-	global $theme_field_defaults;
-	$args = array('browse' => 'featured', 'page' => $page, 'fields' => $theme_field_defaults);
-	$api = themes_api('query_themes', $args);
-	if ( is_wp_error($api) )
-		wp_die($api);
-	display_themes($api->themes, $api->info['page'], $api->info['pages']);
-}
-
-add_action('install_themes_new', 'install_themes_new', 10, 1);
-/**
- * Display new themes/
- *
- * @since 2.8.0
- *
- * @param string $page
- */
-function install_themes_new($page = 1) {
-	global $theme_field_defaults;
-	$args = array('browse' => 'new', 'page' => $page, 'fields' => $theme_field_defaults);
-	$api = themes_api('query_themes', $args);
-	if ( is_wp_error($api) )
-		wp_die($api);
-	display_themes($api->themes, $api->info['page'], $api->info['pages']);
-}
-
-add_action('install_themes_updated', 'install_themes_updated', 10, 1);
-/**
- * Display recently updated themes.
- *
- * @since 2.8.0
- *
- * @param string $page
- */
-function install_themes_updated($page = 1) {
-	global $theme_field_defaults;
-	$args = array('browse' => 'updated', 'page' => $page, 'fields' => $theme_field_defaults);
-	$api = themes_api('query_themes', $args);
-	display_themes($api->themes, $api->info['page'], $api->info['pages']);
-}
-
-add_action('install_themes_upload', 'install_themes_upload', 10, 1);
 function install_themes_upload($page = 1) {
 ?>
 <h4><?php _e('Install a theme in .zip format') ?></h4>
@@ -285,6 +183,7 @@ function install_themes_upload($page = 1) {
 </form>
 	<?php
 }
+add_action('install_themes_upload', 'install_themes_upload', 10, 1);
 
 function display_theme($theme, $actions = null, $show_details = true) {
 	global $themes_allowedtags;
@@ -360,83 +259,16 @@ function display_theme($theme, $actions = null, $show_details = true) {
  * Display theme content based on theme list.
  *
  * @since 2.8.0
- *
- * @param array $themes List of themes.
- * @param string $page
- * @param int $totalpages Number of pages.
  */
-function display_themes($themes, $page = 1, $totalpages = 1) {
-	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
-	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-	?>
-<div class="tablenav">
-<div class="alignleft actions"><?php do_action('install_themes_table_header'); ?></div>
-	<?php
-	$url = esc_url($_SERVER['REQUEST_URI']);
-	if ( ! empty($term) )
-		$url = add_query_arg('s', $term, $url);
-	if ( ! empty($type) )
-		$url = add_query_arg('type', $type, $url);
+function display_themes() {
+	global $table;
 
-	$page_links = paginate_links( array(
-			'base' => add_query_arg('paged', '%#%', $url),
-			'format' => '',
-			'prev_text' => __('&laquo;'),
-			'next_text' => __('&raquo;'),
-			'total' => $totalpages,
-			'current' => $page
-	));
-
-	if ( $page_links )
-		echo "\t\t<div class='tablenav-pages'>$page_links</div>";
-	?>
-</div>
-<br class="clear" />
-<?php
-	if ( empty($themes) ) {
-		_e('No themes found');
-		return;
-	}
-?>
-<table id="availablethemes" cellspacing="0" cellpadding="0">
-<?php
-	$rows = ceil(count($themes) / 3);
-	$table = array();
-	$theme_keys = array_keys($themes);
-	for ( $row = 1; $row <= $rows; $row++ )
-		for ( $col = 1; $col <= 3; $col++ )
-			$table[$row][$col] = array_shift($theme_keys);
-
-	foreach ( $table as $row => $cols ) {
-	?>
-	<tr>
-	<?php
-
-	foreach ( $cols as $col => $theme_index ) {
-		$class = array('available-theme');
-		if ( $row == 1 ) $class[] = 'top';
-		if ( $col == 1 ) $class[] = 'left';
-		if ( $row == $rows ) $class[] = 'bottom';
-		if ( $col == 3 ) $class[] = 'right';
-		?>
-		<td class="<?php echo join(' ', $class); ?>"><?php
-			if ( isset($themes[$theme_index]) )
-				display_theme($themes[$theme_index]);
-		?></td>
-		<?php } // end foreach $cols ?>
-	</tr>
-	<?php } // end foreach $table ?>
-</table>
-
-<div class="tablenav"><?php if ( $page_links )
-echo "\t\t<div class='tablenav-pages'>$page_links</div>"; ?> <br
-	class="clear" />
-</div>
-
-<?php
+	$table->display();
 }
-
-add_action('install_themes_pre_theme-information', 'install_theme_information');
+add_action('install_themes_search', 'display_themes');
+add_action('install_themes_featured', 'display_themes');
+add_action('install_themes_new', 'display_themes');
+add_action('install_themes_updated', 'display_themes');
 
 /**
  * Display theme information in dialog box form.
@@ -546,3 +378,5 @@ case 'latest_installed':
 	iframe_footer();
 	exit;
 }
+add_action('install_themes_pre_theme-information', 'install_theme_information');
+
diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index b31c38bd09..aaa20f3ad3 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -482,343 +482,6 @@ function wp_revoke_user($id) {
 	$user->remove_all_caps();
 }
 
-if ( !class_exists('WP_User_Search') ) :
-/**
- * WordPress User Search class.
- *
- * @since unknown
- */
-class WP_User_Search {
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var unknown_type
-	 */
-	var $results;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var unknown_type
-	 */
-	var $search_term;
-
-	/**
-	 * Page number.
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var int
-	 */
-	var $page;
-
-	/**
-	 * Role name that users have.
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var string
-	 */
-	var $role;
-
-	/**
-	 * Raw page number.
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var int|bool
-	 */
-	var $raw_page;
-
-	/**
-	 * Amount of users to display per page.
-	 *
-	 * @since unknown
-	 * @access public
-	 * @var int
-	 */
-	var $users_per_page = 50;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var unknown_type
-	 */
-	var $first_user;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var int
-	 */
-	var $last_user;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var string
-	 */
-	var $query_limit;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 3.0.0
-	 * @access private
-	 * @var string
-	 */
-	var $query_orderby;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 3.0.0
-	 * @access private
-	 * @var string
-	 */
-	var $query_from;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since 3.0.0
-	 * @access private
-	 * @var string
-	 */
-	var $query_where;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var int
-	 */
-	var $total_users_for_query = 0;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var bool
-	 */
-	var $too_many_total_users = false;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var unknown_type
-	 */
-	var $search_errors;
-
-	/**
-	 * {@internal Missing Description}}
-	 *
-	 * @since unknown
-	 * @access private
-	 * @var unknown_type
-	 */
-	var $paging_text;
-
-	/**
-	 * PHP4 Constructor - Sets up the object properties.
-	 *
-	 * @since unknown
-	 *
-	 * @param string $search_term Search terms string.
-	 * @param int $page Optional. Page ID.
-	 * @param string $role Role name.
-	 * @return WP_User_Search
-	 */
-	function WP_User_Search ($search_term = '', $page = '', $role = '') {
-		$this->search_term = $search_term;
-		$this->raw_page = ( '' == $page ) ? false : (int) $page;
-		$this->page = (int) ( '' == $page ) ? 1 : $page;
-		$this->role = $role;
-
-		$this->prepare_query();
-		$this->query();
-		$this->prepare_vars_for_template_usage();
-		$this->do_paging();
-	}
-
-	/**
-	 * {@internal Missing Short Description}}
-	 *
-	 * {@internal Missing Long Description}}
-	 *
-	 * @since unknown
-	 * @access public
-	 */
-	function prepare_query() {
-		global $wpdb;
-		$this->first_user = ($this->page - 1) * $this->users_per_page;
-
-		$this->query_limit = $wpdb->prepare(" LIMIT %d, %d", $this->first_user, $this->users_per_page);
-		$this->query_orderby = ' ORDER BY user_login';
-
-		$search_sql = '';
-		if ( $this->search_term ) {
-			$searches = array();
-			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $col . " LIKE '%$this->search_term%'";
-			$search_sql .= implode(' OR ', $searches);
-			$search_sql .= ')';
-		}
-
-		$this->query_from = " FROM $wpdb->users";
-		$this->query_where = " WHERE 1=1 $search_sql";
-
-		if ( $this->role ) {
-			$this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
-			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
-		} elseif ( is_multisite() ) {
-			$level_key = $wpdb->prefix . 'capabilities'; // wpmu site admins don't have user_levels
-			$this->query_from .= ", $wpdb->usermeta";
-			$this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
-		}
-
-		do_action_ref_array( 'pre_user_search', array( &$this ) );
-	}
-
-	/**
-	 * {@internal Missing Short Description}}
-	 *
-	 * {@internal Missing Long Description}}
-	 *
-	 * @since unknown
-	 * @access public
-	 */
-	function query() {
-		global $wpdb;
-
-		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
-
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
-		else
-			$this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
-	}
-
-	/**
-	 * {@internal Missing Short Description}}
-	 *
-	 * {@internal Missing Long Description}}
-	 *
-	 * @since unknown
-	 * @access public
-	 */
-	function prepare_vars_for_template_usage() {
-		$this->search_term = stripslashes($this->search_term); // done with DB, from now on we want slashes gone
-	}
-
-	/**
-	 * {@internal Missing Short Description}}
-	 *
-	 * {@internal Missing Long Description}}
-	 *
-	 * @since unknown
-	 * @access public
-	 */
-	function do_paging() {
-		if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
-			$args = array();
-			if( ! empty($this->search_term) )
-				$args['usersearch'] = urlencode($this->search_term);
-			if( ! empty($this->role) )
-				$args['role'] = urlencode($this->role);
-
-			$this->paging_text = paginate_links( array(
-				'total' => ceil($this->total_users_for_query / $this->users_per_page),
-				'current' => $this->page,
-				'base' => 'users.php?%_%',
-				'format' => 'userspage=%#%',
-				'add_args' => $args
-			) );
-			if ( $this->paging_text ) {
-				$this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-					number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
-					number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
-					number_format_i18n( $this->total_users_for_query ),
-					$this->paging_text
-				);
-			}
-		}
-	}
-
-	/**
-	 * {@internal Missing Short Description}}
-	 *
-	 * {@internal Missing Long Description}}
-	 *
-	 * @since unknown
-	 * @access public
-	 *
-	 * @return unknown
-	 */
-	function get_results() {
-		return (array) $this->results;
-	}
-
-	/**
-	 * Displaying paging text.
-	 *
-	 * @see do_paging() Builds paging text.
-	 *
-	 * @since unknown
-	 * @access public
-	 */
-	function page_links() {
-		echo $this->paging_text;
-	}
-
-	/**
-	 * Whether paging is enabled.
-	 *
-	 * @see do_paging() Builds paging text.
-	 *
-	 * @since unknown
-	 * @access public
-	 *
-	 * @return bool
-	 */
-	function results_are_paged() {
-		if ( $this->paging_text )
-			return true;
-		return false;
-	}
-
-	/**
-	 * Whether there are search terms.
-	 *
-	 * @since unknown
-	 * @access public
-	 *
-	 * @return bool
-	 */
-	function is_search() {
-		if ( $this->search_term )
-			return true;
-		return false;
-	}
-}
-endif;
-
 add_action('admin_init', 'default_password_nag_handler');
 function default_password_nag_handler($errors = false) {
 	global $user_ID;
diff --git a/wp-admin/js/admin-table.dev.js b/wp-admin/js/admin-table.dev.js
new file mode 100644
index 0000000000..a5d69d85a1
--- /dev/null
+++ b/wp-admin/js/admin-table.dev.js
@@ -0,0 +1,243 @@
+jQuery(document).ready(function($) {
+	$('form').each(function() {
+		this.reset();
+	});
+
+	if ( '' == $.query.GET('paged') )
+		$.query.SET('paged', 1);
+
+	var total_pages;
+	var set_total_pages = function() {
+		total_pages = parseInt($('.total-pages').eq(0).text());
+	}
+
+	set_total_pages();
+
+	var loading = false,
+		$tbody = $('#the-list, #the-comment-list'),
+		$overlay = $('<div id="loading-items>')
+			.html(adminTableL10n.loading)
+			.hide()
+			.prependTo($('body'));
+
+	var show_overlay = function() {
+		loading = true;
+
+		$('.error.ajax').remove();
+
+		$overlay
+			.css({
+				width: $tbody.width() + 'px',
+				height: $tbody.height() - 20 + 'px'
+			})
+			.css($tbody.offset())
+			.show();
+	}
+
+	var hide_overlay = function() {
+		loading = false;
+		$overlay.hide();
+	}
+
+	var handle_error = function() {
+		hide_overlay();
+
+		$('h2').after('<div class="error ajax below-h2"><p>' + adminTableL10n.error + '</p></div>');
+	}
+
+	var update_rows = function(args, reset_paging, callback) {
+		if ( loading )
+			return false;
+
+		var different = false;
+
+		$.each(args, function(key, val) {
+			if ( val != $.query.GET(key) ) {
+				$.query.SET(key, val);
+				different = true;
+			}
+		});
+		
+		if ( !different )
+			return false;
+
+		show_overlay();
+
+		if ( reset_paging )
+			$.query.SET('paged', 1);
+
+		var data = $.query.get();
+
+		data['action'] = 'fetch-list';
+		data['list_args'] = list_args;
+
+		$.ajax({
+			url: 'admin-ajax.php',
+			global: false,
+			dataType: 'json',
+			data: data,
+			success: function(response) {
+				if ( 'object' != typeof response ) {
+					handle_error();
+				} else {
+					hide_overlay();
+
+					$tbody.html(response.rows);
+
+					$('.displaying-num').html(response.total_items);
+
+					$('.total-pages').html(response.total_pages);
+					set_total_pages();
+
+					$('.current-page').val($.query.GET('paged'));
+
+					if ( callback )
+						callback();
+				}
+			},
+			error: handle_error
+		});
+
+		return true;
+	}
+
+	// paging
+	var change_page = function(paged) {
+		if ( paged < 1 || paged > total_pages )
+			return false;
+
+		update_rows({'paged': paged});
+	}
+
+	$('.tablenav-pages a').click(function() {
+		var paged = $.query.GET('paged');
+
+		switch ( $(this).attr('class') ) {
+			case 'first-page':
+				paged = 1;
+				break;
+			case 'prev-page':
+				paged -= 1;
+				break;
+			case 'next-page':
+				paged += 1;
+				break;
+			case 'last-page':
+				paged = total_pages;
+				break;
+		}
+
+		change_page(paged);
+
+		return false;
+	});
+
+	$('.current-page').keypress(function(e) {
+		if ( 13 != e.keyCode )
+			return;
+
+		change_page(parseInt($(this).val()));
+
+		return false;
+	});
+
+	// sorting
+	$('th a').click(function() {
+		var orderby = $.query.GET('orderby'),
+			order = $.query.GET('order'),
+			$th = $(this).parent('th');
+
+		if ( $th.hasClass('sortable') ) {
+			orderby = $.query.load($(this).attr('href')).get('orderby');
+			order = 'asc';
+
+			$('th.sorted-desc, th.sorted-asc')
+				.removeClass('sorted-asc')
+				.removeClass('sorted-desc')
+				.addClass('sortable');
+
+			$th.removeClass('sortable').addClass('sorted-asc');
+		}
+		else if ( $th.hasClass('sorted-asc') ) {
+			order = 'desc';
+			$th.removeClass('sorted-asc').addClass('sorted-desc');
+		}
+		else if ( $th.hasClass('sorted-desc') ) {
+			order = 'asc';
+			$th.removeClass('sorted-desc').addClass('sorted-asc');
+		}
+
+		update_rows({'orderby': orderby, 'order': order}, true);
+
+		return false;
+	});
+
+	// searching
+	var htmlencode = function(value) {
+		return $('<div/>').text(value).html();
+	}
+
+	var change_search = function(s) {
+		update_rows({'s': s}, true, function() {
+			$('h2 .subtitle').remove();
+
+			if ( s )
+				$('h2').eq(0).append($('<span class="subtitle">').html(adminTableL10n.search.replace('%s', htmlencode(s))));
+		});
+	}
+
+	$('.search-box :submit').click(function() {
+		change_search($(this).parent('.search-box').find(':text').val());
+
+		return false;
+	});
+
+	$('.search-box :text').keypress(function(e) {
+		if ( 13 != e.keyCode )
+			return;
+
+		change_search($(this).val());
+
+		return false;
+	});
+
+	// tablenav dropdowns
+	$('#post-query-submit').click(function() {
+		var $this = $(this), key, val, args = {};
+
+		$this.parents('.actions').find('select[name!="action"]').each(function() {
+			args[$this.attr('name')] = $this.val();
+		});
+
+		update_rows(args, true);
+
+		return false;
+	});
+
+	// view switch
+	$('.view-switch a').click(function() {
+		var $this = $(this);
+
+		update_rows({'mode': $.query.load($this.attr('href')).get('mode')}, false, function() {
+			$('.view-switch .current').removeClass('current');
+			$this.addClass('current');
+		});
+
+		return false;
+	});
+
+/*
+	// problem: when switching from one to the other, columns are not always the same
+	$('.subsubsub a').click(function() {
+		var $this = $(this);
+
+		update_rows($.query.load($this.attr('href')).get(), true, function() {
+			$('.subsubsub .current').removeClass('current');
+			$this.addClass('current');
+		});
+
+		return false;
+	});
+/**/
+});
+
diff --git a/wp-admin/js/admin-table.js b/wp-admin/js/admin-table.js
new file mode 100644
index 0000000000..fad4f43623
--- /dev/null
+++ b/wp-admin/js/admin-table.js
@@ -0,0 +1 @@
+jQuery(document).ready(function($){$("form").each(function(){this.reset()});if(""==$.query.GET("paged")){$.query.SET("paged",1)}var total_pages;var set_total_pages=function(){total_pages=parseInt($(".total-pages").eq(0).text())};set_total_pages();var loading=false,$tbody=$("#the-list, #the-comment-list"),$overlay=$('<div id="loading-items>').html(adminTableL10n.loading).hide().prependTo($("body"));var show_overlay=function(){loading=true;$(".error.ajax").remove();$overlay.css({width:$tbody.width()+"px",height:$tbody.height()-20+"px"}).css($tbody.offset()).show()};var hide_overlay=function(){loading=false;$overlay.hide()};var handle_error=function(){hide_overlay();$("h2").after('<div class="error ajax below-h2"><p>'+adminTableL10n.error+"</p></div>")};var update_rows=function(args,reset_paging,callback){if(loading){return false}var different=false;$.each(args,function(key,val){if(val!=$.query.GET(key)){$.query.SET(key,val);different=true}});if(!different){return false}show_overlay();if(reset_paging){$.query.SET("paged",1)}var data=$.query.get();data.action="fetch-list";data.list_args=list_args;$.ajax({url:"admin-ajax.php",global:false,dataType:"json",data:data,success:function(response){if("object"!=typeof response){handle_error()}else{hide_overlay();$tbody.html(response.rows);$(".displaying-num").html(response.total_items);$(".total-pages").html(response.total_pages);set_total_pages();$(".current-page").val($.query.GET("paged"));if(callback){callback()}}},error:handle_error});return true};var change_page=function(paged){if(paged<1||paged>total_pages){return false}update_rows({paged:paged})};$(".tablenav-pages a").click(function(){var paged=$.query.GET("paged");switch($(this).attr("class")){case"first-page":paged=1;break;case"prev-page":paged-=1;break;case"next-page":paged+=1;break;case"last-page":paged=total_pages;break}change_page(paged);return false});$(".current-page").keypress(function(e){if(13!=e.keyCode){return}change_page(parseInt($(this).val()));return false});$("th a").click(function(){var orderby=$.query.GET("orderby"),order=$.query.GET("order"),$th=$(this).parent("th");if($th.hasClass("sortable")){orderby=$.query.load($(this).attr("href")).get("orderby");order="asc";$("th.sorted-desc, th.sorted-asc").removeClass("sorted-asc").removeClass("sorted-desc").addClass("sortable");$th.removeClass("sortable").addClass("sorted-asc")}else{if($th.hasClass("sorted-asc")){order="desc";$th.removeClass("sorted-asc").addClass("sorted-desc")}else{if($th.hasClass("sorted-desc")){order="asc";$th.removeClass("sorted-desc").addClass("sorted-asc")}}}update_rows({orderby:orderby,order:order},true);return false});var htmlencode=function(value){return $("<div/>").text(value).html()};var change_search=function(s){update_rows({s:s},true,function(){$("h2 .subtitle").remove();if(s){$("h2").eq(0).append($('<span class="subtitle">').html(adminTableL10n.search.replace("%s",htmlencode(s))))}})};$(".search-box :submit").click(function(){change_search($(this).parent(".search-box").find(":text").val());return false});$(".search-box :text").keypress(function(e){if(13!=e.keyCode){return}change_search($(this).val());return false});$("#post-query-submit").click(function(){var $this=$(this),key,val,args={};$this.parents(".actions").find('select[name!="action"]').each(function(){args[$this.attr("name")]=$this.val()});update_rows(args,true);return false});$(".view-switch a").click(function(){var $this=$(this);update_rows({mode:$.query.load($this.attr("href")).get("mode")},false,function(){$(".view-switch .current").removeClass("current");$this.addClass("current")});return false})});
\ No newline at end of file
diff --git a/wp-admin/js/inline-edit-post.dev.js b/wp-admin/js/inline-edit-post.dev.js
index 2bb3547b14..1a257c69eb 100644
--- a/wp-admin/js/inline-edit-post.dev.js
+++ b/wp-admin/js/inline-edit-post.dev.js
@@ -1,22 +1,36 @@
-
 (function($) {
 inlineEditPost = {
 
-	init : function() {
+	init : function(){
 		var t = this, qeRow = $('#inline-edit'), bulkRow = $('#bulk-edit');
 
-		t.type = $('table.widefat').hasClass('page') ? 'page' : 'post';
-		t.what = '#'+t.type+'-';
+		t.type = $('table.widefat').hasClass('pages') ? 'page' : 'post';
+		t.what = '#post-';
 
 		// prepare the edit rows
-		qeRow.keyup(function(e) { if(e.which == 27) return inlineEditPost.revert(); });
-		bulkRow.keyup(function(e) { if (e.which == 27) return inlineEditPost.revert(); });
+		qeRow.keyup(function(e){
+			if (e.which == 27)
+				return inlineEditPost.revert();
+		});
+		bulkRow.keyup(function(e){
+			if (e.which == 27)
+				return inlineEditPost.revert();
+		});
 
-		$('a.cancel', qeRow).click(function() { return inlineEditPost.revert(); });
-		$('a.save', qeRow).click(function() { return inlineEditPost.save(this); });
-		$('td', qeRow).keydown(function(e) { if ( e.which == 13 ) return inlineEditPost.save(this); });
+		$('a.cancel', qeRow).click(function(){
+			return inlineEditPost.revert();
+		});
+		$('a.save', qeRow).click(function(){
+			return inlineEditPost.save(this);
+		});
+		$('td', qeRow).keydown(function(e){
+			if ( e.which == 13 )
+				return inlineEditPost.save(this);
+		});
 
-		$('a.cancel', bulkRow).click(function() { return inlineEditPost.revert(); });
+		$('a.cancel', bulkRow).click(function(){
+			return inlineEditPost.revert();
+		});
 
 		$('#inline-edit .inline-edit-private input[value=private]').click( function(){
 			var pw = $('input.inline-edit-password-input');
@@ -28,7 +42,10 @@ inlineEditPost = {
 		});
 
 		// add events
-		$('a.editinline').live('click', function() { inlineEditPost.edit(this); return false; });
+		$('a.editinline').live('click', function(){
+			inlineEditPost.edit(this);
+			return false;
+		});
 
 		$('#bulk-title-div').parents('fieldset').after(
 			$('#inline-edit fieldset.inline-edit-categories').clone()
@@ -37,11 +54,11 @@ inlineEditPost = {
 		);
 
 		// hiearchical taxonomies expandable?
-		$('span.catshow').click(function() {
+		$('span.catshow').click(function(){
 			$(this).hide().next().show().parent().next().addClass("cat-hover");
 		});
 
-		$('span.cathide').click(function() {
+		$('span.cathide').click(function(){
 			$(this).hide().prev().show().parent().next().removeClass("cat-hover");
 		});
 
@@ -61,15 +78,14 @@ inlineEditPost = {
 			if ( $('form#posts-filter tr.inline-editor').length > 0 )
 				t.revert();
 		});
-
 	},
 
-	toggle : function(el) {
+	toggle : function(el){
 		var t = this;
 		$(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
 	},
 
-	setBulk : function() {
+	setBulk : function(){
 		var te = '', type = this.type, tax, c = true;
 		this.revert();
 
@@ -90,7 +106,7 @@ inlineEditPost = {
 			return this.revert();
 
 		$('#bulk-titles').html(te);
-		$('#bulk-titles a').click(function() {
+		$('#bulk-titles a').click(function(){
 			var id = $(this).attr('id').substr(1);
 
 			$('table.widefat input[value="'+id+'"]').attr('checked', '');
@@ -98,7 +114,7 @@ inlineEditPost = {
 		});
 
 		// enable autocomplete for tags
-		if ( type == 'post' ) {
+		if ( 'post' == type ) {
 			// support multi taxonomies?
 			tax = 'post_tag';
 			$('tr.inline-editor textarea[name="tags_input"]').suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+tax, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
@@ -106,14 +122,15 @@ inlineEditPost = {
 	},
 
 	edit : function(id) {
-		var t = this, fields, editRow, rowData, cats, status, pageOpt, f, pageLevel, nextPage, pageLoop = true, nextLevel, tax;
+		var t = this, fields, editRow, rowData, cats, status, pageOpt, pageLevel, nextPage, pageLoop = true, nextLevel, tax;
 		t.revert();
 
 		if ( typeof(id) == 'object' )
 			id = t.getId(id);
 
 		fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password'];
-		if ( t.type == 'page' ) fields.push('post_parent', 'menu_order', 'page_template');
+		if ( t.type == 'page' )
+			fields.push('post_parent', 'menu_order', 'page_template');
 
 		// add the new blank row
 		editRow = $('#inline-edit').clone(true);
@@ -130,7 +147,7 @@ inlineEditPost = {
 			$(':input[name="post_author"]', editRow).prepend('<option value="' + $('.post_author', rowData).text() + '">' + $('#' + t.type + '-' + id + ' .author').text() + '</option>');
 		}
 
-		for ( f = 0; f < fields.length; f++ ) {
+		for ( var f = 0; f < fields.length; f++ ) {
 			$(':input[name="'+fields[f]+'"]', editRow).val( $('.'+fields[f], rowData).text() );
 		}
 
@@ -143,16 +160,18 @@ inlineEditPost = {
 
 		// hierarchical taxonomies
 		$('.post_category', rowData).each(function(){
-			if( term_ids = $(this).text() )
-			{
+			var term_ids = $(this).text();
+
+			if ( term_ids ) {
 				taxname = $(this).attr('id').replace('_'+id, '');
 				$('ul.'+taxname+'-checklist :checkbox', editRow).val(term_ids.split(','));
 			}
 		});
 		//flat taxonomies
 		$('.tags_input', rowData).each(function(){
-			if( terms = $(this).text() )
-			{
+			var terms = $(this).text();
+
+			if ( terms ) {
 				taxname = $(this).attr('id').replace('_'+id, '');
 				$('textarea.tax_input_'+taxname, editRow).val(terms);
 				$('textarea.tax_input_'+taxname, editRow).suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+taxname, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
@@ -162,8 +181,10 @@ inlineEditPost = {
 
 		// handle the post status
 		status = $('._status', rowData).text();
-		if ( status != 'future' ) $('select[name="_status"] option[value="future"]', editRow).remove();
-		if ( status == 'private' ) {
+		if ( 'future' != status )
+			$('select[name="_status"] option[value="future"]', editRow).remove();
+
+		if ( 'private' == status ) {
 			$('input[name="keep_private"]', editRow).attr("checked", "checked");
 			$('input.inline-edit-password-input').val('').attr('disabled', 'disabled');
 		}
@@ -196,7 +217,7 @@ inlineEditPost = {
 	save : function(id) {
 		var params, fields, page = $('.post_status_page').val() || '';
 
-		if( typeof(id) == 'object' )
+		if ( typeof(id) == 'object' )
 			id = this.getId(id);
 
 		$('table.widefat .inline-edit-save .waiting').show();
@@ -234,17 +255,17 @@ inlineEditPost = {
 		return false;
 	},
 
-	revert : function() {
-		var id;
+	revert : function(){
+		var id = $('table.widefat tr.inline-editor').attr('id');
 
-		if ( id = $('table.widefat tr.inline-editor').attr('id') ) {
+		if ( id ) {
 			$('table.widefat .inline-edit-save .waiting').hide();
 
 			if ( 'bulk-edit' == id ) {
 				$('table.widefat #bulk-edit').removeClass('inline-editor').hide();
 				$('#bulk-titles').html('');
 				$('#inlineedit').append( $('#bulk-edit') );
-			} else  {
+			} else {
 				$('#'+id).remove();
 				id = id.substr( id.lastIndexOf('-') + 1 );
 				$(this.what+id).show();
@@ -255,7 +276,8 @@ inlineEditPost = {
 	},
 
 	getId : function(o) {
-		var id = o.tagName == 'TR' ? o.id : $(o).parents('tr').attr('id'), parts = id.split('-');
+		var id = $(o).closest('tr').attr('id'),
+			parts = id.split('-');
 		return parts[parts.length - 1];
 	}
 };
diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js
index baf9e4415a..f54a758b79 100644
--- a/wp-admin/js/inline-edit-post.js
+++ b/wp-admin/js/inline-edit-post.js
@@ -1 +1 @@
-(function(a){inlineEditPost={init:function(){var c=this,d=a("#inline-edit"),b=a("#bulk-edit");c.type=a("table.widefat").hasClass("page")?"page":"post";c.what="#"+c.type+"-";d.keyup(function(f){if(f.which==27){return inlineEditPost.revert()}});b.keyup(function(f){if(f.which==27){return inlineEditPost.revert()}});a("a.cancel",d).click(function(){return inlineEditPost.revert()});a("a.save",d).click(function(){return inlineEditPost.save(this)});a("td",d).keydown(function(f){if(f.which==13){return inlineEditPost.save(this)}});a("a.cancel",b).click(function(){return inlineEditPost.revert()});a("#inline-edit .inline-edit-private input[value=private]").click(function(){var e=a("input.inline-edit-password-input");if(a(this).attr("checked")){e.val("").attr("disabled","disabled")}else{e.attr("disabled","")}});a("a.editinline").live("click",function(){inlineEditPost.edit(this);return false});a("#bulk-title-div").parents("fieldset").after(a("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend(a("#inline-edit label.inline-edit-tags").clone());a("span.catshow").click(function(){a(this).hide().next().show().parent().next().addClass("cat-hover")});a("span.cathide").click(function(){a(this).hide().prev().show().parent().next().removeClass("cat-hover")});a('select[name="_status"] option[value="future"]',b).remove();a("#doaction, #doaction2").click(function(f){var g=a(this).attr("id").substr(2);if(a('select[name="'+g+'"]').val()=="edit"){f.preventDefault();c.setBulk()}else{if(a("form#posts-filter tr.inline-editor").length>0){c.revert()}}});a("#post-query-submit").click(function(f){if(a("form#posts-filter tr.inline-editor").length>0){c.revert()}})},toggle:function(c){var b=this;a(b.what+b.getId(c)).css("display")=="none"?b.revert():b.edit(c)},setBulk:function(){var e="",d=this.type,b,f=true;this.revert();a("#bulk-edit td").attr("colspan",a(".widefat:first thead th:visible").length);a("table.widefat tbody").prepend(a("#bulk-edit"));a("#bulk-edit").addClass("inline-editor").show();a('tbody th.check-column input[type="checkbox"]').each(function(g){if(a(this).attr("checked")){f=false;var h=a(this).val(),c;c=a("#inline_"+h+" .post_title").text()||inlineEditL10n.notitle;e+='<div id="ttle'+h+'"><a id="_'+h+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+c+"</div>"}});if(f){return this.revert()}a("#bulk-titles").html(e);a("#bulk-titles a").click(function(){var c=a(this).attr("id").substr(1);a('table.widefat input[value="'+c+'"]').attr("checked","");a("#ttle"+c).remove()});if(d=="post"){b="post_tag";a('tr.inline-editor textarea[name="tags_input"]').suggest("admin-ajax.php?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:true,multipleSep:", "})}},edit:function(b){var o=this,j,d,g,n,i,h,k,m,l,c=true,p,e;o.revert();if(typeof(b)=="object"){b=o.getId(b)}j=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password"];if(o.type=="page"){j.push("post_parent","menu_order","page_template")}d=a("#inline-edit").clone(true);a("td",d).attr("colspan",a(".widefat:first thead th:visible").length);if(a(o.what+b).hasClass("alternate")){a(d).addClass("alternate")}a(o.what+b).hide().after(d);g=a("#inline_"+b);if(!a(':input[name="post_author"] option[value='+a(".post_author",g).text()+"]",d).val()){a(':input[name="post_author"]',d).prepend('<option value="'+a(".post_author",g).text()+'">'+a("#"+o.type+"-"+b+" .author").text()+"</option>")}for(k=0;k<j.length;k++){a(':input[name="'+j[k]+'"]',d).val(a("."+j[k],g).text())}if(a(".comment_status",g).text()=="open"){a('input[name="comment_status"]',d).attr("checked","checked")}if(a(".ping_status",g).text()=="open"){a('input[name="ping_status"]',d).attr("checked","checked")}if(a(".sticky",g).text()=="sticky"){a('input[name="sticky"]',d).attr("checked","checked")}a(".post_category",g).each(function(){if(term_ids=a(this).text()){taxname=a(this).attr("id").replace("_"+b,"");a("ul."+taxname+"-checklist :checkbox",d).val(term_ids.split(","))}});a(".tags_input",g).each(function(){if(terms=a(this).text()){taxname=a(this).attr("id").replace("_"+b,"");a("textarea.tax_input_"+taxname,d).val(terms);a("textarea.tax_input_"+taxname,d).suggest("admin-ajax.php?action=ajax-tag-search&tax="+taxname,{delay:500,minchars:2,multiple:true,multipleSep:", "})}});i=a("._status",g).text();if(i!="future"){a('select[name="_status"] option[value="future"]',d).remove()}if(i=="private"){a('input[name="keep_private"]',d).attr("checked","checked");a("input.inline-edit-password-input").val("").attr("disabled","disabled")}h=a('select[name="post_parent"] option[value="'+b+'"]',d);if(h.length>0){m=h[0].className.split("-")[1];l=h;while(c){l=l.next("option");if(l.length==0){break}p=l[0].className.split("-")[1];if(p<=m){c=false}else{l.remove();l=h}}h.remove()}a(d).attr("id","edit-"+b).addClass("inline-editor").show();a(".ptitle",d).focus();return false},save:function(e){var d,b,c=a(".post_status_page").val()||"";if(typeof(e)=="object"){e=this.getId(e)}a("table.widefat .inline-edit-save .waiting").show();d={action:"inline-save",post_type:typenow,post_ID:e,edit_date:"true",post_status:c};b=a("#edit-"+e+" :input").serialize();d=b+"&"+a.param(d);a.post("admin-ajax.php",d,function(f){a("table.widefat .inline-edit-save .waiting").hide();if(f){if(-1!=f.indexOf("<tr")){a(inlineEditPost.what+e).remove();a("#edit-"+e).before(f).remove();a(inlineEditPost.what+e).hide().fadeIn()}else{f=f.replace(/<.[^<>]*?>/g,"");a("#edit-"+e+" .inline-edit-save").append('<span class="error">'+f+"</span>")}}else{a("#edit-"+e+" .inline-edit-save").append('<span class="error">'+inlineEditL10n.error+"</span>")}},"html");return false},revert:function(){var b;if(b=a("table.widefat tr.inline-editor").attr("id")){a("table.widefat .inline-edit-save .waiting").hide();if("bulk-edit"==b){a("table.widefat #bulk-edit").removeClass("inline-editor").hide();a("#bulk-titles").html("");a("#inlineedit").append(a("#bulk-edit"))}else{a("#"+b).remove();b=b.substr(b.lastIndexOf("-")+1);a(this.what+b).show()}}return false},getId:function(c){var d=c.tagName=="TR"?c.id:a(c).parents("tr").attr("id"),b=d.split("-");return b[b.length-1]}};a(document).ready(function(){inlineEditPost.init()})})(jQuery);
\ No newline at end of file
+(function($){inlineEditPost={init:function(){var t=this,qeRow=$("#inline-edit"),bulkRow=$("#bulk-edit");t.type=$("table.widefat").hasClass("pages")?"page":"post";t.what="#post-";qeRow.keyup(function(e){if(e.which==27){return inlineEditPost.revert()}});bulkRow.keyup(function(e){if(e.which==27){return inlineEditPost.revert()}});$("a.cancel",qeRow).click(function(){return inlineEditPost.revert()});$("a.save",qeRow).click(function(){return inlineEditPost.save(this)});$("td",qeRow).keydown(function(e){if(e.which==13){return inlineEditPost.save(this)}});$("a.cancel",bulkRow).click(function(){return inlineEditPost.revert()});$("#inline-edit .inline-edit-private input[value=private]").click(function(){var pw=$("input.inline-edit-password-input");if($(this).attr("checked")){pw.val("").attr("disabled","disabled")}else{pw.attr("disabled","")}});$("a.editinline").live("click",function(){inlineEditPost.edit(this);return false});$("#bulk-title-div").parents("fieldset").after($("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend($("#inline-edit label.inline-edit-tags").clone());$("span.catshow").click(function(){$(this).hide().next().show().parent().next().addClass("cat-hover")});$("span.cathide").click(function(){$(this).hide().prev().show().parent().next().removeClass("cat-hover")});$('select[name="_status"] option[value="future"]',bulkRow).remove();$("#doaction, #doaction2").click(function(e){var n=$(this).attr("id").substr(2);if($('select[name="'+n+'"]').val()=="edit"){e.preventDefault();t.setBulk()}else{if($("form#posts-filter tr.inline-editor").length>0){t.revert()}}});$("#post-query-submit").click(function(e){if($("form#posts-filter tr.inline-editor").length>0){t.revert()}})},toggle:function(el){var t=this;$(t.what+t.getId(el)).css("display")=="none"?t.revert():t.edit(el)},setBulk:function(){var te="",type=this.type,tax,c=true;this.revert();$("#bulk-edit td").attr("colspan",$(".widefat:first thead th:visible").length);$("table.widefat tbody").prepend($("#bulk-edit"));$("#bulk-edit").addClass("inline-editor").show();$('tbody th.check-column input[type="checkbox"]').each(function(i){if($(this).attr("checked")){c=false;var id=$(this).val(),theTitle;theTitle=$("#inline_"+id+" .post_title").text()||inlineEditL10n.notitle;te+='<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+theTitle+"</div>"}});if(c){return this.revert()}$("#bulk-titles").html(te);$("#bulk-titles a").click(function(){var id=$(this).attr("id").substr(1);$('table.widefat input[value="'+id+'"]').attr("checked","");$("#ttle"+id).remove()});if("post"==type){tax="post_tag";$('tr.inline-editor textarea[name="tags_input"]').suggest("admin-ajax.php?action=ajax-tag-search&tax="+tax,{delay:500,minchars:2,multiple:true,multipleSep:", "})}},edit:function(id){var t=this,fields,editRow,rowData,cats,status,pageOpt,pageLevel,nextPage,pageLoop=true,nextLevel,tax;t.revert();if(typeof(id)=="object"){id=t.getId(id)}fields=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password"];if(t.type=="page"){fields.push("post_parent","menu_order","page_template")}editRow=$("#inline-edit").clone(true);$("td",editRow).attr("colspan",$(".widefat:first thead th:visible").length);if($(t.what+id).hasClass("alternate")){$(editRow).addClass("alternate")}$(t.what+id).hide().after(editRow);rowData=$("#inline_"+id);if(!$(':input[name="post_author"] option[value='+$(".post_author",rowData).text()+"]",editRow).val()){$(':input[name="post_author"]',editRow).prepend('<option value="'+$(".post_author",rowData).text()+'">'+$("#"+t.type+"-"+id+" .author").text()+"</option>")}for(var f=0;f<fields.length;f++){$(':input[name="'+fields[f]+'"]',editRow).val($("."+fields[f],rowData).text())}if($(".comment_status",rowData).text()=="open"){$('input[name="comment_status"]',editRow).attr("checked","checked")}if($(".ping_status",rowData).text()=="open"){$('input[name="ping_status"]',editRow).attr("checked","checked")}if($(".sticky",rowData).text()=="sticky"){$('input[name="sticky"]',editRow).attr("checked","checked")}$(".post_category",rowData).each(function(){var term_ids=$(this).text();if(term_ids){taxname=$(this).attr("id").replace("_"+id,"");$("ul."+taxname+"-checklist :checkbox",editRow).val(term_ids.split(","))}});$(".tags_input",rowData).each(function(){var terms=$(this).text();if(terms){taxname=$(this).attr("id").replace("_"+id,"");$("textarea.tax_input_"+taxname,editRow).val(terms);$("textarea.tax_input_"+taxname,editRow).suggest("admin-ajax.php?action=ajax-tag-search&tax="+taxname,{delay:500,minchars:2,multiple:true,multipleSep:", "})}});status=$("._status",rowData).text();if("future"!=status){$('select[name="_status"] option[value="future"]',editRow).remove()}if("private"==status){$('input[name="keep_private"]',editRow).attr("checked","checked");$("input.inline-edit-password-input").val("").attr("disabled","disabled")}pageOpt=$('select[name="post_parent"] option[value="'+id+'"]',editRow);if(pageOpt.length>0){pageLevel=pageOpt[0].className.split("-")[1];nextPage=pageOpt;while(pageLoop){nextPage=nextPage.next("option");if(nextPage.length==0){break}nextLevel=nextPage[0].className.split("-")[1];if(nextLevel<=pageLevel){pageLoop=false}else{nextPage.remove();nextPage=pageOpt}}pageOpt.remove()}$(editRow).attr("id","edit-"+id).addClass("inline-editor").show();$(".ptitle",editRow).focus();return false},save:function(id){var params,fields,page=$(".post_status_page").val()||"";if(typeof(id)=="object"){id=this.getId(id)}$("table.widefat .inline-edit-save .waiting").show();params={action:"inline-save",post_type:typenow,post_ID:id,edit_date:"true",post_status:page};fields=$("#edit-"+id+" :input").serialize();params=fields+"&"+$.param(params);$.post("admin-ajax.php",params,function(r){$("table.widefat .inline-edit-save .waiting").hide();if(r){if(-1!=r.indexOf("<tr")){$(inlineEditPost.what+id).remove();$("#edit-"+id).before(r).remove();$(inlineEditPost.what+id).hide().fadeIn()}else{r=r.replace(/<.[^<>]*?>/g,"");$("#edit-"+id+" .inline-edit-save").append('<span class="error">'+r+"</span>")}}else{$("#edit-"+id+" .inline-edit-save").append('<span class="error">'+inlineEditL10n.error+"</span>")}},"html");return false},revert:function(){var id=$("table.widefat tr.inline-editor").attr("id");if(id){$("table.widefat .inline-edit-save .waiting").hide();if("bulk-edit"==id){$("table.widefat #bulk-edit").removeClass("inline-editor").hide();$("#bulk-titles").html("");$("#inlineedit").append($("#bulk-edit"))}else{$("#"+id).remove();id=id.substr(id.lastIndexOf("-")+1);$(this.what+id).show()}}return false},getId:function(o){var id=$(o).closest("tr").attr("id"),parts=id.split("-");return parts[parts.length-1]}};$(document).ready(function(){inlineEditPost.init()})})(jQuery);
\ No newline at end of file
diff --git a/wp-admin/js/tags.dev.js b/wp-admin/js/tags.dev.js
index abb8ecc07c..3cc4e1fb58 100644
--- a/wp-admin/js/tags.dev.js
+++ b/wp-admin/js/tags.dev.js
@@ -41,9 +41,9 @@ jQuery(document).ready(function($) {
 			var parent = form.find('select#parent').val();
 
 			if ( parent > 0 && $('#tag-' + parent ).length > 0 ) // If the parent exists on this page, insert it below. Else insert it at the top of the list.
-				$('#the-list #tag-' + parent).after( res.responses[0].supplemental['noparents'] ); // As the parent exists, Insert the version with - - - prefixed
+				$('.tags #tag-' + parent).after( res.responses[0].supplemental['noparents'] ); // As the parent exists, Insert the version with - - - prefixed
 			else
-				$('#the-list').prepend( res.responses[0].supplemental['parents'] ); // As the parent is not visible, Insert the version with Parent - Child - ThisTerm
+				$('.tags').prepend( res.responses[0].supplemental['parents'] ); // As the parent is not visible, Insert the version with Parent - Child - ThisTerm
 
 			if ( form.find('select#parent') ) {
 				// Parents field exists, Add new term to the list.
@@ -63,4 +63,4 @@ jQuery(document).ready(function($) {
 		return false;
 	});
 
-});
\ No newline at end of file
+});
diff --git a/wp-admin/js/tags.js b/wp-admin/js/tags.js
index 8431c8351f..3b0b04d56a 100644
--- a/wp-admin/js/tags.js
+++ b/wp-admin/js/tags.js
@@ -1 +1 @@
-jQuery(document).ready(function(a){a(".delete-tag").live("click",function(g){var b=a(this),f=b.parents("tr"),c=true,d;if("undefined"!=showNotice){c=showNotice.warn()}if(c){d=b.attr("href").replace(/[^?]*\?/,"").replace(/action=delete/,"action=delete-tag");a.post(ajaxurl,d,function(e){if("1"==e){a("#ajax-response").empty();f.fadeOut("normal",function(){f.remove()});a("select#parent option[value="+d.match(/tag_ID=(\d+)/)[1]+"]").remove();a("a.tag-link-"+d.match(/tag_ID=(\d+)/)[1]).remove()}else{if("-1"==e){a("#ajax-response").empty().append('<div class="error"><p>'+tagsl10n.noPerm+"</p></div>");f.children().css("backgroundColor","")}else{a("#ajax-response").empty().append('<div class="error"><p>'+tagsl10n.broken+"</p></div>");f.children().css("backgroundColor","")}}});f.children().css("backgroundColor","#f33")}return false});a("#submit").click(function(){var b=a(this).parents("form");if(!validateForm(b)){return false}a.post(ajaxurl,a("#addtag").serialize(),function(h){a("#ajax-response").empty();var f=wpAjax.parseAjaxResponse(h,"ajax-response");if(!f){return}var g=b.find("select#parent").val();if(g>0&&a("#tag-"+g).length>0){a("#the-list #tag-"+g).after(f.responses[0].supplemental.noparents)}else{a("#the-list").prepend(f.responses[0].supplemental.parents)}if(b.find("select#parent")){var e=f.responses[1].supplemental;var c="";for(var d=0;d<f.responses[1].position;d++){c+="&nbsp;&nbsp;&nbsp;"}b.find("select#parent option:selected").after('<option value="'+e.term_id+'">'+c+e.name+"</option>")}a('input[type="text"]:visible, textarea:visible',b).val("")});return false})});
\ No newline at end of file
+jQuery(document).ready(function($){$(".delete-tag").live("click",function(e){var t=$(this),tr=t.parents("tr"),r=true,data;if("undefined"!=showNotice){r=showNotice.warn()}if(r){data=t.attr("href").replace(/[^?]*\?/,"").replace(/action=delete/,"action=delete-tag");$.post(ajaxurl,data,function(r){if("1"==r){$("#ajax-response").empty();tr.fadeOut("normal",function(){tr.remove()});$("select#parent option[value="+data.match(/tag_ID=(\d+)/)[1]+"]").remove();$("a.tag-link-"+data.match(/tag_ID=(\d+)/)[1]).remove()}else{if("-1"==r){$("#ajax-response").empty().append('<div class="error"><p>'+tagsl10n.noPerm+"</p></div>");tr.children().css("backgroundColor","")}else{$("#ajax-response").empty().append('<div class="error"><p>'+tagsl10n.broken+"</p></div>");tr.children().css("backgroundColor","")}}});tr.children().css("backgroundColor","#f33")}return false});$("#submit").click(function(){var form=$(this).parents("form");if(!validateForm(form)){return false}$.post(ajaxurl,$("#addtag").serialize(),function(r){$("#ajax-response").empty();var res=wpAjax.parseAjaxResponse(r,"ajax-response");if(!res){return}var parent=form.find("select#parent").val();if(parent>0&&$("#tag-"+parent).length>0){$(".tags #tag-"+parent).after(res.responses[0].supplemental.noparents)}else{$(".tags").prepend(res.responses[0].supplemental.parents)}if(form.find("select#parent")){var term=res.responses[1].supplemental;var indent="";for(var i=0;i<res.responses[1].position;i++){indent+="&nbsp;&nbsp;&nbsp;"}form.find("select#parent option:selected").after('<option value="'+term.term_id+'">'+indent+term.name+"</option>")}$('input[type="text"]:visible, textarea:visible',form).val("")});return false})});
\ No newline at end of file
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 2243d6b0e4..0d68e07af5 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -10,36 +10,32 @@
 require_once ('admin.php');
 
 // Handle bulk deletes
-if ( isset($_GET['action']) && isset($_GET['linkcheck']) ) {
-	check_admin_referer('bulk-bookmarks');
-	$doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2'];
+if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['linkcheck'] ) ) {
+	check_admin_referer( 'bulk-bookmarks' );
 
-	if ( ! current_user_can('manage_links') )
-		wp_die( __('You do not have sufficient permissions to edit the links for this site.') );
+	$doaction = $_REQUEST['action'] ? $_REQUEST['action'] : $_REQUEST['action2'];
+
+	if ( ! current_user_can( 'manage_links' ) )
+		wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
 
 	if ( 'delete' == $doaction ) {
-		$bulklinks = (array) $_GET['linkcheck'];
+		$bulklinks = (array) $_REQUEST['linkcheck'];
 		foreach ( $bulklinks as $link_id ) {
 			$link_id = (int) $link_id;
 
-			wp_delete_link($link_id);
+			wp_delete_link( $link_id );
 		}
 
-		wp_safe_redirect( wp_get_referer() );
-		exit;
+		wp_redirect( add_query_arg('deleted', count( $bulklinks ), admin_url( 'link-manager.php' ) ) );
 	}
-} elseif ( ! empty($_GET['_wp_http_referer']) ) {
-	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+} elseif ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
+	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) );
 	 exit;
 }
 
-wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
+require_once( './includes/default-list-tables.php' );
 
-if ( empty($cat_id) )
-	$cat_id = 'all';
-
-if ( empty($order_by) )
-	$order_by = 'order_name';
+$table = new WP_Links_Table;
 
 $title = __('Links');
 $this_file = $parent_file = 'link-manager.php';
@@ -59,39 +55,19 @@ include_once ('./admin-header.php');
 if ( ! current_user_can('manage_links') )
 	wp_die(__("You do not have sufficient permissions to edit the links for this site."));
 
-switch ($order_by) {
-	case 'order_id' :
-		$sqlorderby = 'id';
-		break;
-	case 'order_url' :
-		$sqlorderby = 'url';
-		break;
-	case 'order_desc' :
-		$sqlorderby = 'description';
-		break;
-	case 'order_owner' :
-		$sqlorderby = 'owner';
-		break;
-	case 'order_rating' :
-		$sqlorderby = 'rating';
-		break;
-	case 'order_name' :
-	default :
-		$sqlorderby = 'name';
-		break;
-} ?>
+?>
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
-if ( !empty($_GET['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
+if ( !empty($_REQUEST['s']) )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
 </h2>
 
 <?php
-if ( isset($_GET['deleted']) ) {
+if ( isset($_REQUEST['deleted']) ) {
 	echo '<div id="message" class="updated"><p>';
-	$deleted = (int) $_GET['deleted'];
+	$deleted = (int) $_REQUEST['deleted'];
 	printf(_n('%s link deleted.', '%s links deleted', $deleted), $deleted);
 	echo '</p></div>';
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
@@ -107,184 +83,10 @@ if ( isset($_GET['deleted']) ) {
 </form>
 <br class="clear" />
 
-<form id="posts-filter" action="" method="get">
-<div class="tablenav">
-
-<?php
-if ( 'all' == $cat_id )
-	$cat_id = '';
-$args = array( 'category' => $cat_id, 'hide_invisible' => 0, 'orderby' => $sqlorderby, 'hide_empty' => 0 );
-if ( ! empty( $_GET['s'] ) )
-	$args['search'] = $_GET['s'];
-$links = get_bookmarks( $args );
-if ( $links ) {
-?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-
-<?php
-$categories = get_terms('link_category', array("hide_empty" => 1));
-$select_cat = "<select name=\"cat_id\">\n";
-$select_cat .= '<option value="all"'  . (($cat_id == 'all') ? " selected='selected'" : '') . '>' . __('View all Categories') . "</option>\n";
-foreach ((array) $categories as $cat)
-	$select_cat .= '<option value="' . esc_attr($cat->term_id) . '"' . (($cat->term_id == $cat_id) ? " selected='selected'" : '') . '>' . sanitize_term_field('name', $cat->name, $cat->term_id, 'link_category', 'display') . "</option>\n";
-$select_cat .= "</select>\n";
-
-$select_order = "<select name=\"order_by\">\n";
-$select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' .  __('Order by Link ID') . "</option>\n";
-$select_order .= '<option value="order_name"' . (($order_by == 'order_name') ? " selected='selected'" : '') . '>' .  __('Order by Name') . "</option>\n";
-$select_order .= '<option value="order_url"' . (($order_by == 'order_url') ? " selected='selected'" : '') . '>' .  __('Order by Address') . "</option>\n";
-$select_order .= '<option value="order_rating"' . (($order_by == 'order_rating') ? " selected='selected'" : '') . '>' .  __('Order by Rating') . "</option>\n";
-$select_order .= "</select>\n";
-
-echo $select_cat;
-echo $select_order;
-
-?>
-<input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
-
-</div>
-
-<br class="clear" />
-</div>
-
-<div class="clear"></div>
-
-<?php
-	$link_columns = get_column_headers('link-manager');
-	$hidden = get_hidden_columns('link-manager');
-?>
-
-<?php wp_nonce_field('bulk-bookmarks') ?>
-<table class="widefat fixed" cellspacing="0">
-	<thead>
-	<tr>
-<?php print_column_headers('link-manager'); ?>
-	</tr>
-	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers('link-manager', false); ?>
-	</tr>
-	</tfoot>
-
-	<tbody>
-<?php
-	$alt = 0;
-
-	foreach ($links as $link) {
-		$link = sanitize_bookmark($link);
-		$link->link_name = esc_attr($link->link_name);
-		$link->link_category = wp_get_link_cats($link->link_id);
-		$short_url = str_replace('http://', '', $link->link_url);
-		$short_url = preg_replace('/^www\./i', '', $short_url);
-		if ('/' == substr($short_url, -1))
-			$short_url = substr($short_url, 0, -1);
-		if (strlen($short_url) > 35)
-			$short_url = substr($short_url, 0, 32).'...';
-		$visible = ($link->link_visible == 'Y') ? __('Yes') : __('No');
-		$rating  = $link->link_rating;
-		$style = ($alt % 2) ? '' : ' class="alternate"';
-		++ $alt;
-		$edit_link = get_edit_bookmark_link();
-		?><tr id="link-<?php echo $link->link_id; ?>" valign="middle" <?php echo $style; ?>><?php
-		foreach($link_columns as $column_name=>$column_display_name) {
-			$class = "class=\"column-$column_name\"";
-
-			$style = '';
-			if ( in_array($column_name, $hidden) )
-				$style = ' style="display:none;"';
-
-			$attributes = "$class$style";
-
-			switch($column_name) {
-				case 'cb':
-					echo '<th scope="row" class="check-column"><input type="checkbox" name="linkcheck[]" value="'. esc_attr($link->link_id) .'" /></th>';
-					break;
-				case 'name':
-
-					echo "<td $attributes><strong><a class='row-title' href='$edit_link' title='" . esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $link->link_name)) . "'>$link->link_name</a></strong><br />";
-					$actions = array();
-					$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-					$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . esc_js(sprintf( __("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
-					$action_count = count($actions);
-					$i = 0;
-					echo '<div class="row-actions">';
-					foreach ( $actions as $action => $linkaction ) {
-						++$i;
-						( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-						echo "<span class='$action'>$linkaction$sep</span>";
-					}
-					echo '</div>';
-					echo '</td>';
-					break;
-				case 'url':
-					echo "<td $attributes><a href='$link->link_url' title='".sprintf(__('Visit %s'), $link->link_name)."'>$short_url</a></td>";
-					break;
-				case 'categories':
-					?><td <?php echo $attributes ?>><?php
-					$cat_names = array();
-					foreach ($link->link_category as $category) {
-						$cat = get_term($category, 'link_category', OBJECT, 'display');
-						if ( is_wp_error( $cat ) )
-							echo $cat->get_error_message();
-						$cat_name = $cat->name;
-						if ( $cat_id != $category )
-							$cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
-						$cat_names[] = $cat_name;
-					}
-					echo implode(', ', $cat_names);
-					?></td><?php
-					break;
-				case 'rel':
-					?><td <?php echo $attributes ?>><?php echo empty($link->link_rel) ? '<br />' : $link->link_rel; ?></td><?php
-					break;
-				case 'visible':
-					?><td <?php echo $attributes ?>><?php echo $visible; ?></td><?php
-					break;
-				case 'rating':
- 					?><td <?php echo $attributes ?>><?php echo $rating; ?></td><?php
-					break;
-				default:
-					?>
-					<td <?php echo $attributes ?>><?php do_action('manage_link_custom_column', $column_name, $link->link_id); ?></td>
-					<?php
-					break;
-
-			}
-		}
-		echo "\n    </tr>\n";
-	}
-?>
-	</tbody>
-</table>
-
-<div class="tablenav">
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
-
-<?php } else { ?>
-<p><?php _e( 'No links found.' ) ?></p>
-<?php } ?>
-
-<br class="clear" />
-</div>
-
-</form>
-
+<form id="posts-filter" action="" method="post">
+<?php $table->display(); ?>
 <div id="ajax-response"></div>
+</form>
 
 </div>
 
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index f064b08ddf..3f3abfeb55 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -86,7 +86,7 @@ $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-to
 	$submenu['link-manager.php'][5] = array( __('Links'), 'manage_links', 'link-manager.php' );
 	/* translators: add new links */
 	$submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
-	$submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
+	$submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
 
 $menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'div' );
 	$submenu['edit.php?post_type=page'][5] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page' );
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 837ecd01c2..6a04250165 100644
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -18,7 +18,7 @@ if ( ! current_user_can( 'manage_sites' ) )
 $title = __( 'Sites' );
 $parent_file = 'sites.php';
 
-if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) {
+if ( isset( $_REQUEST['action'] ) && 'editblog' == $_REQUEST['action'] ) {
 	add_contextual_help($current_screen,
 		'<p>' . __('This extensive list of options has five modules: Site Info, Site Options, allowing Site Themes for this given site, changing user roles and passwords for that site, adding a new user, and Miscellaneous Site Actions (upload size limits).') . '</p>' .
 		'<p>' . __('Note that some fields in Site Options are grayed out and say Serialized Data. These are stored values in the database which you cannot change from here.') . '</p>' .
@@ -46,17 +46,13 @@ if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) {
 	);
 }
 
-wp_enqueue_script( 'admin-forms' );
+$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
-require_once( '../admin-header.php' );
-
-$id = isset( $_GET['id'] ) ? intval( $_GET['id'] ) : 0;
-
-if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['action'] ) ) {
+if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
 	?>
 	<div id="message" class="updated"><p>
 		<?php
-		switch ( $_GET['action'] ) {
+		switch ( $_REQUEST['action'] ) {
 			case 'all_notspam':
 				_e( 'Sites removed from spam.' );
 			break;
@@ -99,7 +95,7 @@ if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['
 	<?php
 }
 
-$action = isset( $_GET['action'] ) ? $_GET['action'] : 'list';
+$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'list';
 
 switch ( $action ) {
 	// Edit site
@@ -112,11 +108,13 @@ switch ( $action ) {
 
 		$editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
 		$is_main_site = is_main_site( $id );
+
+		require_once( './admin-header.php' );
 		?>
 		<div class="wrap">
 		<?php screen_icon(); ?>
 		<h2><?php _e( 'Edit Site' ); ?> - <a href="<?php echo esc_url( get_home_url( $id ) ); ?>"><?php echo esc_url( get_home_url( $id ) ); ?></a></h2>
-		<form method="post" action="edit.php?action=updateblog">
+		<form method="post" action="ms-edit.php?action=updateblog">
 			<?php wp_nonce_field( 'editblog' ); ?>
 			<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
 			<div class="metabox-holder" style="width:49%;float:left;">
@@ -350,82 +348,23 @@ switch ( $action ) {
 	// List sites
 	case 'list':
 	default:
-		$pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
-		if ( empty($pagenum) )
-			$pagenum = 1;
+		require_once( './includes/default-list-tables.php' );
 
-		$per_page = (int) get_user_option( 'ms_sites_per_page' );
-		if ( empty( $per_page ) || $per_page < 1 )
-			$per_page = 15;
+		$table = new WP_Sites_Table;
 
-		$per_page = apply_filters( 'ms_sites_per_page', $per_page );
-
-		$s = isset( $_GET['s'] ) ? stripslashes( trim( $_GET[ 's' ] ) ) : '';
-		$like_s = esc_sql( like_escape( $s ) );
-
-		$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
-
-		if ( isset( $_GET['searchaction'] ) ) {
-			if ( 'name' == $_GET['searchaction'] ) {
-				$query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$like_s}%' OR {$wpdb->blogs}.path LIKE '%{$like_s}%' ) ";
-			} elseif ( 'id' == $_GET['searchaction'] ) {
-				$query .= " AND {$wpdb->blogs}.blog_id = '{$like_s}' ";
-			} elseif ( 'ip' == $_GET['searchaction'] ) {
-				$query = "SELECT *
-					FROM {$wpdb->blogs}, {$wpdb->registration_log}
-					WHERE site_id = '{$wpdb->siteid}'
-					AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
-					AND {$wpdb->registration_log}.IP LIKE ('%{$like_s}%')";
-			}
-		}
-
-		$order_by = isset( $_GET['sortby'] ) ? $_GET['sortby'] : 'id';
-		if ( $order_by == 'registered' ) {
-			$query .= ' ORDER BY registered ';
-		} elseif ( $order_by == 'lastupdated' ) {
-			$query .= ' ORDER BY last_updated ';
-		} elseif ( $order_by == 'blogname' ) {
-			$query .= ' ORDER BY domain ';
-		} else {
-			$order_by = 'id';
-			$query .= " ORDER BY {$wpdb->blogs}.blog_id ";
-		}
-
-		$order = ( isset( $_GET['order'] ) && 'DESC' == $_GET['order'] ) ? "DESC" : "ASC";
-		$query .= $order;
-
-		$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT(blog_id)', $query ) );
-
-		$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
-		$blog_list = $wpdb->get_results( $query, ARRAY_A );
-
-		$num_pages = ceil($total / $per_page);
-		$page_links = paginate_links( array(
-			'base' => add_query_arg( 'paged', '%#%' ),
-			'format' => '',
-			'prev_text' => __( '&laquo;' ),
-			'next_text' => __( '&raquo;' ),
-			'total' => $num_pages,
-			'current' => $pagenum
-		));
-
-		if ( empty( $_GET['mode'] ) )
-			$mode = 'list';
-		else
-			$mode = esc_attr( $_GET['mode'] );
+		require_once( './admin-header.php' );
 		?>
 
 		<div class="wrap">
 		<?php screen_icon(); ?>
 		<h2><?php _e('Sites') ?>
 		<a href="#form-add-site" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'sites' ); ?></a>
-		<?php
-		if ( isset( $_GET['s'] ) && $_GET['s'] )
-		printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
-		?>
+		<?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
+			printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+		} ?>
 		</h2>
 
-		<form action="sites.php" method="get" id="ms-search">
+		<form action="ms-sites.php" method="get" id="ms-search">
 		<p class="search-box">
 		<input type="hidden" name="action" value="blogs" />
 		<input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" />
@@ -438,278 +377,14 @@ switch ( $action ) {
 		</p>
 		</form>
 
-		<form id="form-site-list" action="edit.php?action=allblogs" method="post">
-		<input type="hidden" name="mode" value="<?php echo esc_attr( $mode ); ?>" />
-		<div class="tablenav">
-		<div class="alignleft actions">
-			<select name="action">
-				<option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
-				<option value="delete"><?php _e( 'Delete' ); ?></option>
-				<option value="spam"><?php _ex( 'Mark as Spam', 'site' ); ?></option>
-				<option value="notspam"><?php _ex( 'Not Spam', 'site' ); ?></option>
-			</select>
-			<input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
-			<?php wp_nonce_field( 'bulk-ms-sites', '_wpnonce_bulk-ms-sites' ); ?>
-		</div>
-
-		<?php if ( $page_links ) { ?>
-		<div class="tablenav-pages">
-		<?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-		number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
-		number_format_i18n( min( $pagenum * $per_page, $total ) ),
-		number_format_i18n( $total ),
-		$page_links
-		); echo $page_links_text; ?>
-		</div>
-		<?php } ?>
-
-		<div class="view-switch">
-			<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e( 'List View' ) ?>" alt="<?php _e( 'List View' ) ?>" /></a>
-			<a href="<?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e( 'Excerpt View' ) ?>" alt="<?php _e( 'Excerpt View' ) ?>" /></a>
-		</div>
-
-		</div>
-
-		<div class="clear"></div>
-
-		<?php
-		// define the columns to display, the syntax is 'internal name' => 'display name'
-		$blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' );
-		$sites_columns = array(
-			'id'           => __( 'ID' ),
-			'blogname'     => $blogname_columns,
-			'lastupdated'  => __( 'Last Updated'),
-			'registered'   => _x( 'Registered', 'site' ),
-			'users'        => __( 'Users' )
-		);
-
-		if ( has_filter( 'wpmublogsaction' ) )
-			$sites_columns['plugins'] = __( 'Actions' );
-
-		$sites_columns = apply_filters( 'wpmu_blogs_columns', $sites_columns );
-		?>
-
-		<table class="widefat">
-			<thead>
-				<tr>
-				<th class="manage-column column-cb check-column" id="cb" scope="col">
-					<input type="checkbox" />
-				</th>
-				<?php
-				$col_url = '';
-				foreach($sites_columns as $column_id => $column_display_name) {
-					$column_link = "<a href='";
-					$order2 = '';
-					if ( $order_by == $column_id )
-						$order2 = ( $order == 'DESC' ) ? 'ASC' : 'DESC';
-
-					$column_link .= esc_url( add_query_arg( array( 'order' => $order2, 'paged' => $pagenum, 'sortby' => $column_id ), remove_query_arg( array('action', 'updated'), $_SERVER['REQUEST_URI'] ) ) );
-					$column_link .= "'>{$column_display_name}</a>";
-					$col_url .= '<th scope="col">' . ( ( $column_id == 'users' || $column_id == 'plugins' ) ? $column_display_name : $column_link ) . '</th>';
-				}
-				echo $col_url ?>
-				</tr>
-			</thead>
-			<tfoot>
-				<tr>
-				<th class="manage-column column-cb check-column" id="cb1" scope="col">
-					<input type="checkbox" />
-				</th>
-					<?php echo $col_url ?>
-				</tr>
-			</tfoot>
-			<tbody id="the-site-list" class="list:site">
-			<?php
-			$status_list = array( 'archived' => array( 'site-archived', __( 'Archived' ) ), 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ), 'deleted' => array( 'site-deleted', __( 'Deleted' ) ), 'mature' => array( 'site-mature', __( 'Mature' ) ) );
-			if ( $blog_list ) {
-				$class = '';
-				foreach ( $blog_list as $blog ) {
-					$class = ( 'alternate' == $class ) ? '' : 'alternate';
-					reset( $status_list );
-
-					$blog_states = array();
-					foreach ( $status_list as $status => $col ) {
-						if ( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
-							$class = $col[0];
-							$blog_states[] = $col[1];
-						}
-					}
-					$blog_state = '';
-					if ( ! empty( $blog_states ) ) {
-						$state_count = count( $blog_states );
-						$i = 0;
-						$blog_state .= ' - ';
-						foreach ( $blog_states as $state ) {
-							++$i;
-							( $i == $state_count ) ? $sep = '' : $sep = ', ';
-							$blog_state .= "<span class='post-state'>$state$sep</span>";
-						}
-					}
-					echo "<tr class='$class'>";
-
-					$blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path'];
-					foreach ( $sites_columns as $column_name=>$column_display_name ) {
-						switch ( $column_name ) {
-							case 'id': ?>
-								<th scope="row" class="check-column">
-									<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
-								</th>
-								<th valign="top" scope="row">
-									<?php echo $blog['blog_id'] ?>
-								</th>
-							<?php
-							break;
-
-							case 'blogname': ?>
-								<td class="column-title">
-									<a href="<?php echo esc_url( network_admin_url( 'sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
-									<?php
-									if ( 'list' != $mode )
-										echo '<p>' . sprintf( _x( '%1$s &#8211; <em>%2$s</em>', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '</p>';
-
-									// Preordered.
-									$actions = array(
-										'edit' => '', 'backend' => '',
-										'activate' => '', 'deactivate' => '',
-										'archive' => '', 'unarchive' => '',
-										'spam' => '', 'unspam' => '',
-										'delete' => '',
-										'visit' => '',
-									);
-
-									$actions['edit']	= '<span class="edit"><a href="' . esc_url( network_admin_url( 'sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a></span>';
-									$actions['backend']	= "<span class='backend'><a href='" . esc_url( get_admin_url($blog['blog_id']) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>';
-									if ( $current_site->blog_id != $blog['blog_id'] ) {
-										if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
-											$actions['activate']	= '<span class="activate"><a href="' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
-										else
-											$actions['deactivate']	= '<span class="activate"><a href="' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
-
-										if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
-											$actions['unarchive']	= '<span class="archive"><a href="' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' .  $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
-										else
-											$actions['archive']	= '<span class="archive"><a href="' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';
-
-										if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
-											$actions['unspam']	= '<span class="spam"><a href="' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a></span>';
-										else
-											$actions['spam']	= '<span class="spam"><a href="' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '">' . _x( 'Spam', 'site' ) . '</a></span>';
-
-										$actions['delete']	= '<span class="delete"><a href="' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>';
-									}
-
-									$actions['visit']	= "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a></span>';
-									$actions = array_filter( $actions );
-									if ( count( $actions ) ) : ?>
-									<div class="row-actions">
-										<?php echo implode( ' | ', $actions ); ?>
-									</div>
-									<?php endif; ?>
-								</td>
-							<?php
-							break;
-
-							case 'lastupdated': ?>
-								<td valign="top">
-									<?php
-									if ( 'list' == $mode )
-										$date = 'Y/m/d';
-									else
-										$date = 'Y/m/d \<\b\r \/\> g:i:s a';
-									echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( __( $date ), $blog['last_updated'] ); ?>
-								</td>
-							<?php
-							break;
-						case 'registered': ?>
-								<td valign="top">
-								<?php
-								if ( $blog['registered'] == '0000-00-00 00:00:00' )
-									echo '&#x2014;';
-								else
-									echo mysql2date( __( $date ), $blog['registered'] );
-								?>
-								</td>
-						<?php
-						break;
-							case 'users': ?>
-								<td valign="top">
-									<?php
-									$blogusers = get_users_of_blog( $blog['blog_id'] );
-									if ( is_array( $blogusers ) ) {
-										$blogusers_warning = '';
-										if ( count( $blogusers ) > 5 ) {
-											$blogusers = array_slice( $blogusers, 0, 5 );
-											$blogusers_warning = __( 'Only showing first 5 users.' ) . ' <a href="' . esc_url( get_admin_url( $blog['blog_id'], 'users.php' ) ) . '">' . __( 'More' ) . '</a>';
-										}
-										foreach ( $blogusers as $key => $val ) {
-											echo '<a href="' . esc_url( admin_url( 'user-edit.php?user_id=' . $val->user_id ) ) . '">' . esc_html( $val->user_login ) . '</a> ';
-											if ( 'list' != $mode )
-												echo '(' . $val->user_email . ')';
-											echo '<br />';
-										}
-										if ( $blogusers_warning != '' )
-											echo '<strong>' . $blogusers_warning . '</strong><br />';
-									}
-									?>
-								</td>
-							<?php
-							break;
-
-							case 'plugins': ?>
-								<?php if ( has_filter( 'wpmublogsaction' ) ) { ?>
-								<td valign="top">
-									<?php do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
-								</td>
-								<?php } ?>
-							<?php break;
-
-							default: ?>
-								<?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?>
-								<td valign="top">
-									<?php do_action( 'manage_blogs_custom_column', $column_name, $blog['blog_id'] ); ?>
-								</td>
-								<?php } ?>
-							<?php break;
-						}
-					}
-					?>
-					</tr>
-					<?php
-				}
-			} else { ?>
-				<tr>
-					<td colspan="<?php echo (int) count( $sites_columns ); ?>"><?php _e( 'No sites found.' ) ?></td>
-				</tr>
-			<?php
-			} // end if ($blogs)
-			?>
-
-			</tbody>
-		</table>
-		<div class="tablenav">
-			<?php
-			if ( $page_links )
-				echo "<div class='tablenav-pages'>$page_links_text</div>";
-			?>
-
-			<div class="alignleft actions">
-			<select name="action2">
-				<option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
-				<option value="delete"><?php _e( 'Delete' ); ?></option>
-				<option value="spam"><?php _ex( 'Mark as Spam', 'site' ); ?></option>
-				<option value="notspam"><?php _ex( 'Not Spam', 'site' ); ?></option>
-			</select>
-			<input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-			</div>
-			<br class="clear" />
-		</div>
-
+		<form id="form-site-list" action="ms-edit.php?action=allblogs" method="post">
+			<?php $table->display(); ?>
 		</form>
 		</div>
 
 		<div id="form-add-site" class="wrap">
 			<h3><?php _e( 'Add Site' ) ?></h3>
-			<form method="post" action="edit.php?action=addblog">
+			<form method="post" action="ms-edit.php?action=addblog">
 				<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
 				<table class="form-table">
 					<tr class="form-field form-required">
@@ -744,4 +419,4 @@ switch ( $action ) {
 	break;
 } // end switch( $action )
 
-include( '../admin-footer.php' ); ?>
+include( './admin-footer.php' ); ?>
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index 153440b1ae..c3b155d10a 100644
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -32,15 +32,17 @@ add_contextual_help($current_screen,
 	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
-wp_enqueue_script( 'admin-forms' );
+require_once( './includes/default-list-tables.php' );
 
-require_once( '../admin-header.php' );
+$table = new WP_MS_Users_Table;
 
-if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['action'] ) ) {
+require_once( './admin-header.php' );
+
+if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
 	?>
 	<div id="message" class="updated"><p>
 		<?php
-		switch ( $_GET['action'] ) {
+		switch ( $_REQUEST['action'] ) {
 			case 'delete':
 				_e( 'User deleted.' );
 			break;
@@ -61,300 +63,35 @@ if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['
 	</p></div>
 	<?php
 }
-
-	$pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
-	if ( empty( $pagenum ) )
-		$pagenum = 1;
-
-	$per_page = (int) get_user_option( 'ms_users_per_page' );
-	if ( empty( $per_page ) || $per_page < 1 )
-		$per_page = 15;
-
-	$per_page = apply_filters( 'ms_users_per_page', $per_page );
-
-	$s = isset( $_GET['s'] ) ? stripslashes( trim( $_GET[ 's' ] ) ) : '';
-	$like_s = esc_sql( like_escape( $s ) );
-
-	$query = "SELECT * FROM {$wpdb->users}";
-
-	if ( !empty( $like_s ) ) {
-		$query .= " WHERE user_login LIKE '%$like_s%' OR user_email LIKE '%$like_s%'";
-	}
-
-	$order_by = isset( $_GET['sortby'] ) ? $_GET['sortby'] : 'id';
-	if ( $order_by == 'email' ) {
-		$query .= ' ORDER BY user_email ';
-	} elseif ( $order_by == 'login' ) {
-		$query .= ' ORDER BY user_login ';
-	} elseif ( $order_by == 'name' ) {
-		$query .= ' ORDER BY display_name ';
-	} elseif ( $order_by == 'registered' ) {
-		$query .= ' ORDER BY user_registered ';
-	} else {
-		$order_by = 'id';
-		$query .= ' ORDER BY ID ';
-	}
-
-	$order = ( isset( $_GET['order'] ) && 'DESC' == $_GET['order'] ) ? 'DESC' : 'ASC';
-	$query .= $order;
-
-	$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT(ID)', $query ) );
-
-	$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page) . ", " . intval( $per_page );
-
-	$user_list = $wpdb->get_results( $query, ARRAY_A );
-
-	$num_pages = ceil( $total / $per_page );
-	$page_links = paginate_links( array(
-		'base' => add_query_arg( 'paged', '%#%' ),
-		'format' => '',
-		'prev_text' => __( '&laquo;' ),
-		'next_text' => __( '&raquo;' ),
-		'total' => $num_pages,
-		'current' => $pagenum
-	));
-
-	if ( empty( $_GET['mode'] ) )
-		$mode = 'list';
-	else
-		$mode = esc_attr( $_GET['mode'] );
-
 	?>
-	<div class="wrap">
+<div class="wrap">
 	<?php screen_icon(); ?>
 	<h2><?php esc_html_e( 'Users' ); ?>
 	<a href="#form-add-user" class="button add-new-h2"><?php echo esc_html_x( 'Add New' , 'users'); ?></a>
 	<?php
-	if ( isset( $_GET['s'] ) && $_GET['s'] )
+	if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] )
 	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
 	?>
 	</h2>
 
-	<form action="users.php" method="get" class="search-form">
+	<form action="ms-users.php" method="get" class="search-form">
 		<p class="search-box">
 		<input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" class="search-input" id="user-search-input" />
 		<input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Search Users' ) ?>" class="button" />
 		</p>
 	</form>
 
-	<form id="form-user-list" action='edit.php?action=allusers' method='post'>
-		<input type="hidden" name="mode" value="<?php echo esc_attr( $mode ); ?>" />
-		<div class="tablenav">
-			<div class="alignleft actions">
-				<select name="action">
-					<option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
-					<option value="delete"><?php _e( 'Delete' ); ?></option>
-					<option value="spam"><?php _ex( 'Mark as Spam', 'user' ); ?></option>
-					<option value="notspam"><?php _ex( 'Not Spam', 'user' ); ?></option>
-				</select>
-				<input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
-				<?php wp_nonce_field( 'bulk-ms-users', '_wpnonce_bulk-ms-users' ); ?>
-			</div>
-
-			<?php if ( $page_links ) { ?>
-			<div class="tablenav-pages">
-			<?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-			number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
-			number_format_i18n( min( $pagenum * $per_page, $total ) ),
-			number_format_i18n( $total ),
-			$page_links
-			); echo $page_links_text; ?>
-			</div>
-			<?php } ?>
-
-			<div class="view-switch">
-				<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e( 'List View' ) ?>" alt="<?php _e( 'List View' ) ?>" /></a>
-				<a href="<?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e( 'Excerpt View' ) ?>" alt="<?php _e( 'Excerpt View' ) ?>" /></a>
-			</div>
-		</div>
-		<div class="clear"></div>
-
-		<?php
-		// define the columns to display, the syntax is 'internal name' => 'display name'
-		$users_columns = array(
-			'id'           => __( 'ID' ),
-			'login'      => __( 'Username' ),
-			'name'       => __( 'Name' ),
-			'email'      => __( 'E-mail' ),
-			'registered' => _x( 'Registered', 'user' ),
-			'blogs'      => __( 'Sites' )
-		);
-		$users_columns = apply_filters( 'wpmu_users_columns', $users_columns );
-		?>
-		<table class="widefat">
-			<thead>
-			<tr>
-				<th class="manage-column column-cb check-column" scope="col">
-					<input type="checkbox" />
-				</th>
-				<?php
-				$col_url = '';
-				foreach($users_columns as $column_id => $column_display_name) {
-					$column_link = "<a href='";
-					$order2 = '';
-					if ( $order_by == $column_id )
-						$order2 = ( $order == 'DESC' ) ? 'ASC' : 'DESC';
-
-					$column_link .= esc_url( add_query_arg( array( 'order' => $order2, 'paged' => $pagenum, 'sortby' => $column_id ), remove_query_arg( array( 'action', 'updated' ), $_SERVER['REQUEST_URI'] ) ) );
-					$column_link .= "'>{$column_display_name}</a>";
-					$col_url .= '<th scope="col">' . ( $column_id == 'blogs' ? $column_display_name : $column_link ) . '</th>';
-				}
-				echo $col_url; ?>
-			</tr>
-			</thead>
-			<tfoot>
-			<tr>
-				<th class="manage-column column-cb check-column" scope="col">
-					<input type="checkbox" />
-				</th>
-				<?php echo $col_url; ?>
-			</tr>
-			</tfoot>
-			<tbody id="the-user-list" class="list:user">
-			<?php if ( $user_list ) {
-				$class = '';
-				$super_admins = get_super_admins();
-				foreach ( (array) $user_list as $user ) {
-					$class = ( 'alternate' == $class ) ? '' : 'alternate';
-
-					$status_list = array( 'spam' => 'site-spammed', 'deleted' => 'site-deleted' );
-
-					foreach ( $status_list as $status => $col ) {
-						if ( $user[$status] )
-							$class = $col;
-					}
-
-					?>
-					<tr class="<?php echo $class; ?>">
-					<?php
-					foreach( (array) $users_columns as $column_name=>$column_display_name ) :
-						switch( $column_name ) {
-							case 'id': ?>
-								<th scope="row" class="check-column">
-									<input type="checkbox" id="blog_<?php echo $user['ID'] ?>" name="allusers[]" value="<?php echo esc_attr( $user['ID'] ) ?>" />
-								</th>
-								<th valign="top" scope="row">
-									<?php echo $user['ID'] ?>
-								</th>
-							<?php
-							break;
-
-							case 'login':
-								$avatar	= get_avatar( $user['user_email'], 32 );
-								$edit_link = ( $current_user->ID == $user['ID'] ) ? 'profile.php' : 'user-edit.php?user_id=' . $user['ID'];
-								?>
-								<td class="username column-username">
-									<?php echo $avatar; ?><strong><a href="<?php echo esc_url( network_admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user['user_login'] ); ?></a><?php
-									if ( in_array( $user['user_login'], $super_admins ) )
-										echo ' - ' . __( 'Super admin' );
-									?></strong>
-									<br/>
-									<div class="row-actions">
-										<span class="edit"><a href="<?php echo esc_url( network_admin_url( $edit_link ) ); ?>"><?php _e( 'Edit' ); ?></a></span>
-										<?php if ( ! in_array( $user['user_login'], $super_admins ) ) { ?>
-										| <span class="delete"><a href="<?php echo $delete	= esc_url( admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) ) ); ?>" class="delete"><?php _e( 'Delete' ); ?></a></span>
-										<?php } ?>
-									</div>
-								</td>
-							<?php
-							break;
-
-							case 'name': ?>
-								<td class="name column-name"><?php echo $user['display_name'] ?></td>
-							<?php
-							break;
-
-							case 'email': ?>
-								<td class="email column-email"><a href="mailto:<?php echo $user['user_email'] ?>"><?php echo $user['user_email'] ?></a></td>
-							<?php
-							break;
-
-							case 'registered':
-								if ( 'list' == $mode )
-									$date = 'Y/m/d';
-								else
-									$date = 'Y/m/d \<\b\r \/\> g:i:s a';
-							?>
-								<td><?php echo mysql2date( __( $date ), $user['user_registered'] ); ?></td>
-							<?php
-							break;
-
-							case 'blogs':
-								$blogs = get_blogs_of_user( $user['ID'], true );
-								?>
-								<td>
-									<?php
-									if ( is_array( $blogs ) ) {
-										foreach ( (array) $blogs as $key => $val ) {
-											$path	= ( $val->path == '/' ) ? '' : $val->path;
-											echo '<a href="'. esc_url( network_admin_url( 'sites.php?action=editblog&amp;id=' . $val->userblog_id  ) ) .'">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
-											echo ' <small class="row-actions">';
-
-											// Edit
-											echo '<a href="'. esc_url( network_admin_url( 'sites.php?action=editblog&amp;id=' . $val->userblog_id  ) ) .'">' . __( 'Edit' ) . '</a> | ';
-
-											// View
-											echo '<a ';
-											if ( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
-												echo 'style="background-color: #faa" ';
-											echo 'href="' .  esc_url( get_home_url( $val->userblog_id ) )  . '">' . __( 'View' ) . '</a>';
-
-											echo '</small><br />';
-										}
-									}
-									?>
-								</td>
-							<?php
-							break;
-
-							default: ?>
-								<td><?php do_action( 'manage_users_custom_column', $column_name, $user['ID'] ); ?></td>
-							<?php
-							break;
-						}
-					endforeach
-					?>
-					</tr>
-					<?php
-				}
-			} else {
-			?>
-				<tr>
-					<td colspan="<?php echo (int) count($users_columns); ?>"><?php _e( 'No users found.' ) ?></td>
-				</tr>
-				<?php
-			} // end if ($users)
-			?>
-			</tbody>
-		</table>
-
-		<div class="tablenav">
-			<?php
-			if ( $page_links )
-				echo "<div class='tablenav-pages'>$page_links_text</div>";
-			?>
-
-			<div class="alignleft actions">
-				<select name="action2">
-					<option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
-					<option value="delete"><?php _e( 'Delete' ); ?></option>
-					<option value="spam"><?php _ex( 'Mark as Spam', 'user' ); ?></option>
-					<option value="notspam"><?php _ex( 'Not Spam', 'user' ); ?></option>
-				</select>
-				<input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-			</div>
-			<br class="clear" />
-		</div>
-
-		</form>
-		</div>
+	<form id="form-user-list" action='ms-edit.php?action=allusers' method='post'>
+		<?php $table->display(); ?>
+	</form>
+</div>
 
 <?php
 if ( apply_filters( 'show_adduser_fields', true ) ) :
 ?>
 <div class="wrap" id="form-add-user">
 	<h3><?php _e( 'Add User' ) ?></h3>
-	<form action="edit.php?action=adduser" method="post">
+	<form action="ms-edit.php?action=adduser" method="post">
 	<table class="form-table">
 		<tr class="form-field form-required">
 			<th scope="row"><?php _e( 'Username' ) ?></th>
@@ -375,4 +112,4 @@ if ( apply_filters( 'show_adduser_fields', true ) ) :
 </div>
 <?php endif; ?>
 
-<?php include( '../admin-footer.php' ); ?>
+<?php include( './admin-footer.php' ); ?>
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index e6d4cadb69..74be3e641a 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -12,37 +12,13 @@ require_once('./admin.php');
 if ( ! current_user_can('install_plugins') )
 	wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
 
-include(ABSPATH . 'wp-admin/includes/plugin-install.php');
+require_once( './includes/default-list-tables.php' );
+
+$table = new WP_Plugin_Install_Table;
 
 $title = __('Install Plugins');
 $parent_file = 'plugins.php';
 
-wp_reset_vars( array('tab', 'paged') );
-
-//These are the tabs which are shown on the page,
-$tabs = array();
-$tabs['dashboard'] = __('Search');
-if ( 'search' == $tab )
-	$tabs['search']	= __('Search Results');
-$tabs['upload'] = __('Upload');
-$tabs['featured'] = _x('Featured','Plugin Installer');
-$tabs['popular']  = _x('Popular','Plugin Installer');
-$tabs['new']      = _x('Newest','Plugin Installer');
-$tabs['updated']  = _x('Recently Updated','Plugin Installer');
-
-$nonmenu_tabs = array('plugin-information'); //Valid actions to perform which do not have a Menu item.
-
-$tabs = apply_filters('install_plugins_tabs', $tabs );
-$nonmenu_tabs = apply_filters('install_plugins_nonmenu_tabs', $nonmenu_tabs);
-
-//If a non-valid menu tab has been selected, And its not a non-menu action.
-if ( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ) {
-	$tab_actions = array_keys($tabs);
-	$tab = $tab_actions[0];
-}
-if ( empty($paged) )
-	$paged = 1;
-
 wp_enqueue_style( 'plugin-install' );
 wp_enqueue_script( 'plugin-install' );
 if ( 'plugin-information' != $tab )
@@ -71,7 +47,7 @@ include('./admin-header.php');
 	<ul class="subsubsub">
 <?php
 $display_tabs = array();
-foreach ( (array)$tabs as $action => $text ) {
+foreach ( (array) $tabs as $action => $text ) {
 	$sep = ( end($tabs) != $text ) ? ' | ' : '';
 	$class = ( $action == $tab ) ? ' class="current"' : '';
 	$href = admin_url('plugin-install.php?tab=' . $action);
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 97125d74aa..66685a41d2 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -31,17 +31,6 @@ else
 
 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
 
-$default_status = get_user_option('plugins_last_view');
-if ( empty($default_status) )
-	$default_status = 'all';
-$status = isset($_REQUEST['plugin_status']) ? $_REQUEST['plugin_status'] : $default_status;
-if ( !in_array($status, array('all', 'active', 'inactive', 'recent', 'upgrade', 'network', 'mustuse', 'dropins', 'search')) )
-	$status = 'all';
-if ( $status != $default_status && 'search' != $status )
-	update_user_meta($current_user->ID, 'plugins_last_view', $status);
-
-$page = isset($_REQUEST['paged']) ? $_REQUEST['paged'] : 1;
-
 //Clean up request URI from temporary args for screen options/paging uri's to work as expected.
 $_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
 
@@ -85,7 +74,7 @@ if ( !empty($action) ) {
 			if ( ! current_user_can('activate_plugins') )
 				wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
 
-			check_admin_referer('bulk-manage-plugins');
+			check_admin_referer('bulk-plugins');
 
 			$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
 			$plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); // Only activate plugins which are not already active.
@@ -108,7 +97,7 @@ if ( !empty($action) ) {
 			break;
 		case 'update-selected' :
 
-			check_admin_referer( 'bulk-manage-plugins' );
+			check_admin_referer( 'bulk-plugins' );
 
 			if ( isset( $_GET['plugins'] ) )
 				$plugins = explode( ',', $_GET['plugins'] );
@@ -120,7 +109,7 @@ if ( !empty($action) ) {
 			$title = __( 'Upgrade Plugins' );
 			$parent_file = 'plugins.php';
 
-			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+			require_once(ABSPATH . 'wp-admin/admin-header.php');
 
 			echo '<div class="wrap">';
 			screen_icon();
@@ -132,7 +121,7 @@ if ( !empty($action) ) {
 
 			echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
 			echo '</div>';
-			require_once( './admin-footer.php' );
+			require_once(ABSPATH . 'wp-admin/admin-footer.php');
 			exit;
 			break;
 		case 'error_scrape':
@@ -178,7 +167,7 @@ if ( !empty($action) ) {
 			if ( ! current_user_can('activate_plugins') )
 				wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
 
-			check_admin_referer('bulk-manage-plugins');
+			check_admin_referer('bulk-plugins');
 
 			$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
 			$plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated.
@@ -201,7 +190,7 @@ if ( !empty($action) ) {
 			if ( ! current_user_can('delete_plugins') )
 				wp_die(__('You do not have sufficient permissions to delete plugins for this site.'));
 
-			check_admin_referer('bulk-manage-plugins');
+			check_admin_referer('bulk-plugins');
 
 			//$_POST = from the plugin form; $_GET = from the FTP details screen.
 			$plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
@@ -236,8 +225,8 @@ if ( !empty($action) ) {
 								$files_to_delete = array_merge($files_to_delete, $files);
 							}
 							// Get plugins list from that folder
-							if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) ) {
-								foreach( $folder_plugins as $plugin_file => $data ) {
+							if ( $plugins['folder'] = get_plugins( '/' . dirname($plugin)) ) {
+								foreach( $plugins['folder'] as $plugin_file => $data ) {
 									$plugin_info[ $plugin_file ] = $data;
 									$plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
 								}
@@ -274,10 +263,10 @@ if ( !empty($action) ) {
 					<input type="hidden" name="verify-delete" value="1" />
 					<input type="hidden" name="action" value="delete-selected" />
 					<?php
-						foreach ( (array)$plugins as $plugin )
+						foreach ( (array) $plugins as $plugin )
 							echo '<input type="hidden" name="checked[]" value="' . esc_attr($plugin) . '" />';
 					?>
-					<?php wp_nonce_field('bulk-manage-plugins') ?>
+					<?php wp_nonce_field('bulk-plugins') ?>
 					<input type="submit" name="submit" value="<?php $data_to_delete ? esc_attr_e('Yes, Delete these files and data') : esc_attr_e('Yes, Delete these files') ?>" class="button" />
 				</form>
 				<form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
@@ -295,7 +284,7 @@ if ( !empty($action) ) {
 				</div>
 			</div>
 				<?php
-				require_once('./admin-footer.php');
+				require_once(ABSPATH . 'wp-admin/admin-footer.php');
 				exit;
 			} //Endif verify-delete
 			$delete_result = delete_plugins($plugins);
@@ -310,6 +299,19 @@ if ( !empty($action) ) {
 	}
 }
 
+if ( is_multisite() && is_super_admin() ) {
+	$menu_perms = get_site_option('menu_items', array());
+	if ( empty($menu_perms['plugins']) )
+		add_action( 'admin_notices', '_admin_notice_multisite_activate_plugins_page' );
+	unset($menu_perms);
+}
+
+$invalid = validate_active_plugins();
+
+require_once( ABSPATH . 'wp-admin/includes/default-list-tables.php' );
+
+$table = new WP_Plugins_Table;
+
 wp_enqueue_script('plugin-install');
 add_thickbox();
 
@@ -328,7 +330,6 @@ $parent_file = 'plugins.php';
 
 require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-$invalid = validate_active_plugins();
 if ( !empty($invalid) )
 	foreach ( $invalid as $plugin_file => $error )
 		echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), esc_html($plugin_file), $error->get_error_message()) . '</p></div>';
@@ -374,325 +375,6 @@ if ( !empty($invalid) )
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); if ( current_user_can('install_plugins') ) { ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a><?php } ?></h2>
 
-<?php
-
-$all_plugins = apply_filters( 'all_plugins', get_plugins() );
-$search_plugins = array();
-$active_plugins = array();
-$inactive_plugins = array();
-$recent_plugins = array();
-$recently_activated = get_option('recently_activated', array());
-$upgrade_plugins = array();
-$mustuse_plugins = $dropins_plugins = array();
-if ( ! is_multisite() || ( is_network_admin() && current_user_can('manage_network_plugins') ) ) {
-	if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) )
-		$mustuse_plugins = get_mu_plugins();
-	if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
-		$dropins_plugins = get_dropins();
-}
-
-set_transient( 'plugin_slugs', array_keys($all_plugins), 86400 );
-
-// Clean out any plugins which were deactivated over a week ago.
-foreach ( $recently_activated as $key => $time )
-	if ( $time + (7*24*60*60) < time() ) //1 week
-		unset($recently_activated[ $key ]);
-if ( $recently_activated != get_option('recently_activated') ) //If array changed, update it.
-	update_option('recently_activated', $recently_activated);
-$current = get_site_transient( 'update_plugins' );
-
-foreach ( array( 'all_plugins', 'mustuse_plugins', 'dropins_plugins' ) as $plugin_array_name) {
-	foreach ( (array) $$plugin_array_name as $plugin_file => $plugin_data ) {
-		// Translate, Apply Markup, Sanitize HTML
-		$plugin_data = _get_plugin_data_markup_translate($plugin_file, $plugin_data, false, true);
-		${$plugin_array_name}[ $plugin_file ] = $plugin_data;
-	}
-}
-unset( $plugin_array_name );
-
-foreach ( (array) $all_plugins as $plugin_file => $plugin_data) {
-	if ( is_network_admin() )
-		$is_active = is_plugin_active_for_network($plugin_file);
-	else
-		$is_active = is_plugin_active($plugin_file);
-	// Filter into individual sections
-	if ( is_plugin_active_for_network($plugin_file) && !is_network_admin() ) {
-		unset( $all_plugins[ $plugin_file ] );
-		continue;
-	} elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
-		unset( $all_plugins[ $plugin_file ] );
-		continue;
-	} elseif ( $is_active ) {
-		$active_plugins[ $plugin_file ] = $plugin_data;
-	} else {
-		if ( !is_network_admin() && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
-			$recent_plugins[ $plugin_file ] = $plugin_data;
-		$inactive_plugins[ $plugin_file ] = $plugin_data;
-	}
-
-	if ( isset( $current->response[ $plugin_file ] ) )
-		$upgrade_plugins[ $plugin_file ] = $plugin_data;
-}
-
-if ( !current_user_can('update_plugins') )
-	$upgrade_plugins = array();
-
-$total_all_plugins = count($all_plugins);
-$total_inactive_plugins = count($inactive_plugins);
-$total_active_plugins = count($active_plugins);
-$total_recent_plugins = count($recent_plugins);
-$total_upgrade_plugins = count($upgrade_plugins);
-$total_mustuse_plugins = count($mustuse_plugins);
-$total_dropins_plugins = count($dropins_plugins);
-
-// Searching.
-if ( !empty($_GET['s']) ) {
-	function _search_plugins_filter_callback($plugin) {
-		static $term;
-		if ( is_null($term) )
-			$term = stripslashes($_GET['s']);
-		if ( 	stripos($plugin['Name'], $term) !== false ||
-				stripos($plugin['Description'], $term) !== false ||
-				stripos($plugin['Author'], $term) !== false ||
-				stripos($plugin['PluginURI'], $term) !== false ||
-				stripos($plugin['AuthorURI'], $term) !== false ||
-				stripos($plugin['Version'], $term) !== false )
-			return true;
-		else
-			return false;
-	}
-	$status = 'search';
-	$search_plugins = array_filter($all_plugins, '_search_plugins_filter_callback');
-	$total_search_plugins = count($search_plugins);
-}
-
-$plugin_array_name = "${status}_plugins";
-if ( empty($$plugin_array_name) && !in_array($status, array('all', 'search')) ) {
-	$status = 'all';
-	$plugin_array_name = "${status}_plugins";
-}
-
-$plugins = &$$plugin_array_name;
-
-// Paging.
-$total_this_page = "total_{$status}_plugins";
-$total_this_page = $$total_this_page;
-$plugins_per_page = (int) get_user_option( 'plugins_per_page' );
-if ( empty( $plugins_per_page ) || $plugins_per_page < 1 )
-	$plugins_per_page = 999;
-$plugins_per_page = apply_filters( 'plugins_per_page', $plugins_per_page );
-
-$start = ($page - 1) * $plugins_per_page;
-
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'paged', '%#%' ),
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => ceil($total_this_page / $plugins_per_page),
-	'current' => $page
-));
-$page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-	number_format_i18n( $start + 1 ),
-	number_format_i18n( min( $page * $plugins_per_page, $total_this_page ) ),
-	'<span class="total-type-count">' . number_format_i18n( $total_this_page ) . '</span>',
-	$page_links
-);
-
-/**
- * @ignore
- *
- * @param array $plugins
- * @param string $context
- */
-function print_plugins_table($plugins, $context = '') {
-	global $page;
-	$checkbox = ! in_array( $context, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '';
-?>
-<table class="widefat" cellspacing="0" id="<?php echo $context ?>-plugins-table">
-	<thead>
-	<tr>
-		<th scope="col" class="manage-column check-column"><?php echo $checkbox; ?></th>
-		<th scope="col" class="manage-column"><?php _e('Plugin'); ?></th>
-		<th scope="col" class="manage-column"><?php _e('Description'); ?></th>
-	</tr>
-	</thead>
-
-	<tfoot>
-	<tr>
-		<th scope="col" class="manage-column check-column"><?php echo $checkbox; ?></th>
-		<th scope="col" class="manage-column"><?php _e('Plugin'); ?></th>
-		<th scope="col" class="manage-column"><?php _e('Description'); ?></th>
-	</tr>
-	</tfoot>
-
-	<tbody class="plugins">
-<?php
-
-	if ( empty($plugins) ) {
-		echo '<tr>
-			<td colspan="3">' . __('No plugins to show') . '</td>
-		</tr>';
-	}
-	foreach ( (array)$plugins as $plugin_file => $plugin_data) {
-		// preorder
-		$actions = array(
-			'network_deactivate' => '', 'deactivate' => '',
-			'network_only' => '', 'activate' => '',
-			'network_activate' => '',
-			'edit' => '',
-			'delete' => '',
-		);
-
-		if ( 'mustuse' == $context ) {
-			if ( is_multisite() && !is_network_admin() )
-				continue;
-			$is_active = true;
-		} elseif ( 'dropins' == $context ) {
-			if ( is_multisite() && !is_network_admin() )
-				continue;
-			$dropins = _get_dropins();
-			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
-			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
-				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
-			} elseif ( constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
-				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
-			} else {
-				$is_active = false;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="attention">' . __('Inactive:') . '</span></strong> ' . sprintf( __( 'Requires <code>%s</code> in <code>wp-config.php</code>.' ), "define('" . $dropins[ $plugin_file ][1] . "', true);" ) . '</p>';
-			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
-		} else {
-			$is_active_for_network = is_plugin_active_for_network($plugin_file);
-			if ( is_network_admin() )
-				$is_active = $is_active_for_network;
-			else
-				$is_active = is_plugin_active( $plugin_file );
-
-			if ( $is_active_for_network && !is_super_admin() && !is_network_admin() )
-				continue;
-
-			if ( is_network_admin() ) {
-				if ( $is_active_for_network ) {
-					if ( current_user_can( 'manage_network_plugins' ) )
-						$actions['network_deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
-				} else {
-					if ( current_user_can( 'manage_network_plugins' ) )
-						$actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
-					if ( current_user_can('delete_plugins') )
-						$actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
-				}
-			} else {
-				if ( $is_active ) {
-					$actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
-				} else {
-					if ( is_network_only_plugin( $plugin_file ) && !is_network_admin() )
-						continue;
-
-					$actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
-
-					if ( current_user_can('delete_plugins') )
-						$actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
-				} // end if $is_active
-			 } // end if is_network_admin()
-
-			if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
-				$actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
-		} // end if $context
-
-		$actions = apply_filters( 'plugin_action_links', array_filter( $actions ), $plugin_file, $plugin_data, $context );
-		$actions = apply_filters( "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context );
-
-		$class = $is_active ? 'active' : 'inactive';
-		$checkbox = in_array( $context, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' />";
-		if ( 'dropins' != $context ) {
-			$description = '<p>' . $plugin_data['Description'] . '</p>';
-			$plugin_name = $plugin_data['Name'];
-		}
-		echo "
-	<tr class='$class'>
-		<th scope='row' class='check-column'>$checkbox</th>
-		<td class='plugin-title'><strong>$plugin_name</strong></td>
-		<td class='desc'>$description</td>
-	</tr>
-	<tr class='$class second'>
-		<td></td>
-		<td class='plugin-title'>";
-		echo '<div class="row-actions-visible">';
-		foreach ( $actions as $action => $link ) {
-			$sep = end($actions) == $link ? '' : ' | ';
-			echo "<span class='$action'>$link$sep</span>";
-		}
-		echo "</div></td>
-		<td class='desc'>";
-		$plugin_meta = array();
-		if ( !empty($plugin_data['Version']) )
-			$plugin_meta[] = sprintf(__('Version %s'), $plugin_data['Version']);
-		if ( !empty($plugin_data['Author']) ) {
-			$author = $plugin_data['Author'];
-			if ( !empty($plugin_data['AuthorURI']) )
-				$author = '<a href="' . $plugin_data['AuthorURI'] . '" title="' . __( 'Visit author homepage' ) . '">' . $plugin_data['Author'] . '</a>';
-			$plugin_meta[] = sprintf( __('By %s'), $author );
-		}
-		if ( ! empty($plugin_data['PluginURI']) )
-			$plugin_meta[] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . __( 'Visit plugin site' ) . '">' . __('Visit plugin site') . '</a>';
-
-		$plugin_meta = apply_filters('plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $context);
-		echo implode(' | ', $plugin_meta);
-		echo "</td>
-	</tr>\n";
-
-		do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context );
-		do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $context );
-	}
-?>
-	</tbody>
-</table>
-<?php
-} //End print_plugins_table()
-
-/**
- * @ignore
- *
- * @param string $context
- */
-function print_plugin_actions($context, $field_name = 'action' ) {
-	if ( in_array( $context, array( 'mustuse', 'dropins' ) ) )
-		return;
-?>
-	<div class="alignleft actions">
-		<select name="<?php echo $field_name; ?>">
-			<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-	<?php if ( 'active' != $context ) : ?>
-			<option value="activate-selected"><?php _e('Activate'); ?></option>
-	<?php endif; ?>
-	<?php if ( is_multisite() && 'network' != $context ) : ?>
-			<option value="network-activate-selected"><?php _e('Network Activate'); ?></option>
-	<?php endif; ?>
-	<?php if ( 'inactive' != $context && 'recent' != $context ) : ?>
-			<option value="deactivate-selected"><?php _e('Deactivate'); ?></option>
-	<?php endif; ?>
-	<?php if ( current_user_can( 'update_plugins' ) ) : ?>
-			<option value="update-selected"><?php _e( 'Upgrade' ); ?></option>
-	<?php endif; ?>
-	<?php if ( current_user_can('delete_plugins') && ( 'active' != $context ) ) : ?>
-			<option value="delete-selected"><?php _e('Delete'); ?></option>
-	<?php endif; ?>
-		</select>
-		<input type="submit" name="doaction_active" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary action" />
-	<?php if ( 'recent' == $context ) : ?>
-		<input type="submit" name="clear-recent-list" value="<?php esc_attr_e('Clear List') ?>" class="button-secondary" />
-	<?php endif; ?>
-	</div>
-<?php
-}
-?>
-
 <form method="get" action="">
 <p class="search-box">
 	<label class="screen-reader-text" for="plugin-search-input"><?php _e( 'Search Plugins' ); ?>:</label>
@@ -701,50 +383,55 @@ function print_plugin_actions($context, $field_name = 'action' ) {
 </p>
 </form>
 
-<?php do_action( 'pre_current_active_plugins', $all_plugins ) ?>
+<?php do_action( 'pre_current_active_plugins', $plugins['all'] ) ?>
 
-<form method="post" action="plugins.php">
-<?php wp_nonce_field('bulk-manage-plugins') ?>
+<form method="post" action="">
 <input type="hidden" name="plugin_status" value="<?php echo esc_attr($status) ?>" />
 <input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
 
 <ul class="subsubsub">
 <?php
+
 $status_links = array();
-$class = ( 'all' == $status ) ? ' class="current"' : '';
-$status_links[] = "<li><a href='plugins.php?plugin_status=all' $class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_all_plugins, 'plugins' ), number_format_i18n( $total_all_plugins ) ) . '</a>';
-if ( ! empty($active_plugins) ) {
-	$class = ( 'active' == $status ) ? ' class="current"' : '';
-	$status_links[] = "<li><a href='plugins.php?plugin_status=active' $class>" . sprintf( _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $total_active_plugins ), number_format_i18n( $total_active_plugins ) ) . '</a>';
-}
-if ( ! empty($recent_plugins) ) {
-	$class = ( 'recent' == $status ) ? ' class="current"' : '';
-	$status_links[] = "<li><a href='plugins.php?plugin_status=recent' $class>" . sprintf( _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $total_recent_plugins ), number_format_i18n( $total_recent_plugins ) ) . '</a>';
-}
-if ( ! empty($inactive_plugins) ) {
-	$class = ( 'inactive' == $status ) ? ' class="current"' : '';
-	$status_links[] = "<li><a href='plugins.php?plugin_status=inactive' $class>" . sprintf( _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $total_inactive_plugins ), number_format_i18n( $total_inactive_plugins ) ) . '</a>';
-}
-if ( ! empty($network_plugins) ) {
-	$class = ( 'network' == $status ) ? ' class="current"' : '';
-	$status_links[] = "<li><a href='plugins.php?plugin_status=network' $class>" . sprintf( _n( 'Network <span class="count">(%s)</span>', 'Network <span class="count">(%s)</span>', $total_network_plugins ), number_format_i18n( $total_network_plugins ) ) . '</a>';
-}
-if ( ! empty($mustuse_plugins) ) {
-	$class = ( 'mustuse' == $status ) ? ' class="current"' : '';
-	$status_links[] = "<li><a href='plugins.php?plugin_status=mustuse' $class>" . sprintf( _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $total_mustuse_plugins ), number_format_i18n( $total_mustuse_plugins ) ) . '</a>';
-}
-if ( ! empty($dropins_plugins) ) {
-	$class = ( 'dropins' == $status ) ? ' class="current"' : '';
-	$status_links[] = "<li><a href='plugins.php?plugin_status=dropins' $class>" . sprintf( _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $total_dropins_plugins ), number_format_i18n( $total_dropins_plugins ) ) . '</a>';
-}
-if ( ! empty($upgrade_plugins) ) {
-	$class = ( 'upgrade' == $status ) ? ' class="current"' : '';
-	$status_links[] = "<li><a href='plugins.php?plugin_status=upgrade' $class>" . sprintf( _n( 'Upgrade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $total_upgrade_plugins ), number_format_i18n( $total_upgrade_plugins ) ) . '</a>';
-}
-if ( ! empty($search_plugins) ) {
-	$class = ( 'search' == $status ) ? ' class="current"' : '';
-	$term = isset($_REQUEST['s']) ? urlencode(stripslashes($_REQUEST['s'])) : '';
-	$status_links[] = "<li><a href='plugins.php?s=$term' $class>" . sprintf( _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $total_search_plugins ), number_format_i18n( $total_search_plugins ) ) . '</a>';
+foreach ( $totals as $type => $count ) {
+	if ( !$count )
+		continue;
+
+	switch ( $type ) {
+		case 'all':
+			$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins' );
+			break;
+		case 'active':
+			$text = _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count );
+			break;
+		case 'recently_activated':
+			$text = _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count );
+			break;
+		case 'inactive':
+			$text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
+			break;
+		case 'network':
+			$text = _n( 'Network <span class="count">(%s)</span>', 'Network <span class="count">(%s)</span>', $count );
+			break;
+		case 'mustuse':
+			$text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
+			break;
+		case 'dropins':
+			$text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
+			break;
+		case 'upgrade':
+			$text = _n( 'Upgrade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $count );
+			break;
+		case 'search':
+			$text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count );
+			break;
+	}
+
+	$status_links[] = sprintf( "<li><a href='%s' %s>%s</a>", 
+		add_query_arg('plugin_status', $type, 'plugins.php'),
+		( $type == $status ) ? ' class="current"' : '',
+		sprintf( $text, number_format_i18n( $count ) )
+	);
 }
 echo implode( " |</li>\n", $status_links ) . '</li>';
 unset( $status_links );
@@ -753,49 +440,15 @@ unset( $status_links );
 
 <?php
 if ( 'mustuse' == $status )
-	echo '<div class="clear"></div><p>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
+	echo '<br class="clear"><p>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
 elseif ( 'dropins' == $status )
-	echo '<div class="clear"></div><p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
-
-if ( !empty( $plugins ) && ( ! in_array( $status, array( 'mustuse', 'dropins' ) ) || $page_links ) ) :
+	echo '<br class="clear"><p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
 ?>
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo '<div class="tablenav-pages">', $page_links_text, '</div>';
 
-print_plugin_actions($status);
-?>
-</div>
-<div class="clear"></div>
-<?php
-endif;
-
-if ( $total_this_page > $plugins_per_page )
-	$plugins = array_slice($plugins, $start, $plugins_per_page);
-
-print_plugins_table($plugins, $status);
-
-if ( !empty( $plugins ) && ! in_array( $status, array( 'mustuse', 'dropins' ) ) || $page_links ) {
-?>
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-
-print_plugin_actions($status, "action2");
-?>
-</div>
-<?php } ?>
+<?php $table->display(); ?>
 </form>
 
-<?php if ( empty($all_plugins) ) : ?>
-<br class="clear" />
-<p><?php _e('You do not appear to have any plugins available at this time.') ?></p>
-<?php endif; ?>
-
 </div>
 
 <?php
 include(ABSPATH . 'wp-admin/admin-footer.php');
-?>
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 8b954269fa..70c1e5b79f 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -12,43 +12,20 @@ require_once('./admin.php');
 if ( ! current_user_can('install_themes') )
 	wp_die(__('You do not have sufficient permissions to install themes on this site.'));
 
-include(ABSPATH . 'wp-admin/includes/theme-install.php');
+require_once( './includes/default-list-tables.php' );
+
+$table = new WP_Theme_Install_Table;
 
 $title = __('Install Themes');
 $parent_file = 'themes.php';
 $submenu_file = 'themes.php';
 
-wp_reset_vars( array('tab', 'paged') );
 wp_enqueue_style( 'theme-install' );
 wp_enqueue_script( 'theme-install' );
 
 add_thickbox();
 wp_enqueue_script( 'theme-preview' );
 
-//These are the tabs which are shown on the page,
-$tabs = array();
-$tabs['dashboard'] = __('Search');
-if ( 'search' == $tab )
-	$tabs['search']	= __('Search Results');
-$tabs['upload'] = __('Upload');
-$tabs['featured'] = _x('Featured','Theme Installer');
-//$tabs['popular']  = _x('Popular','Theme Installer');
-$tabs['new']      = _x('Newest','Theme Installer');
-$tabs['updated']  = _x('Recently Updated','Theme Installer');
-
-$nonmenu_tabs = array('theme-information'); //Valid actions to perform which do not have a Menu item.
-
-$tabs = apply_filters('install_themes_tabs', $tabs );
-$nonmenu_tabs = apply_filters('install_themes_nonmenu_tabs', $nonmenu_tabs);
-
-//If a non-valid menu tab has been selected, And its not a non-menu action.
-if ( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ) {
-	$tab_actions = array_keys($tabs);
-	$tab = $tab_actions[0];
-}
-if ( empty($paged) )
-	$paged = 1;
-
 $body_id = $tab;
 
 do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information.
@@ -70,7 +47,7 @@ include('./admin-header.php');
 	<ul class="subsubsub">
 <?php
 $display_tabs = array();
-foreach ( (array)$tabs as $action => $text ) {
+foreach ( (array) $tabs as $action => $text ) {
 	$sep = ( end($tabs) != $text ) ? ' | ' : '';
 	$class = ( $action == $tab ) ? ' class="current"' : '';
 	$href = admin_url('theme-install.php?tab='. $action);
@@ -83,3 +60,4 @@ foreach ( (array)$tabs as $action => $text ) {
 </div>
 <?php
 include('./admin-footer.php');
+
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 72589324e7..969929189b 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -28,6 +28,10 @@ if ( current_user_can('switch_themes') && isset($_GET['action']) ) {
 	}
 }
 
+require_once( './includes/default-list-tables.php' );
+
+$table = new WP_Themes_Table;
+
 $title = __('Manage Themes');
 $parent_file = 'themes.php';
 
@@ -65,34 +69,6 @@ if ( is_multisite() && current_user_can('edit_themes') ) {
 	elseif ( isset($_GET['deleted']) ) : ?>
 <div id="message3" class="updated"><p><?php _e('Theme deleted.') ?></p></div>
 <?php endif; ?>
-<?php
-$themes = get_allowed_themes();
-$ct = current_theme_info();
-unset($themes[$ct->name]);
-
-uksort( $themes, "strnatcasecmp" );
-$theme_total = count( $themes );
-$per_page = 15;
-
-if ( isset( $_GET['pagenum'] ) )
-	$page = absint( $_GET['pagenum'] );
-
-if ( empty($page) )
-	$page = 1;
-
-$start = $offset = ( $page - 1 ) * $per_page;
-
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'pagenum', '%#%' ) . '#themenav',
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => ceil($theme_total / $per_page),
-	'current' => $page
-));
-
-$themes = array_slice( $themes, $start, $per_page );
-?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
@@ -119,7 +95,7 @@ $themes = array_slice( $themes, $start, $per_page );
 
 </div>
 
-<div class="clear"></div>
+<br class="clear">
 <?php
 if ( ! current_user_can( 'switch_themes' ) ) {
 	echo '</div>';
@@ -128,119 +104,8 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 }
 ?>
 <h3><?php _e('Available Themes'); ?></h3>
-<div class="clear"></div>
 
-<?php if ( $theme_total ) { ?>
-
-<?php if ( $page_links ) : ?>
-<div class="tablenav">
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-	number_format_i18n( $start + 1 ),
-	number_format_i18n( min( $page * $per_page, $theme_total ) ),
-	number_format_i18n( $theme_total ),
-	$page_links
-); echo $page_links_text; ?></div>
-</div>
-<?php endif; ?>
-
-<table id="availablethemes" cellspacing="0" cellpadding="0">
-<?php
-$style = '';
-
-$theme_names = array_keys($themes);
-natcasesort($theme_names);
-
-$table = array();
-$rows = ceil(count($theme_names) / 3);
-for ( $row = 1; $row <= $rows; $row++ )
-	for ( $col = 1; $col <= 3; $col++ )
-		$table[$row][$col] = array_shift($theme_names);
-
-foreach ( $table as $row => $cols ) {
-?>
-<tr>
-<?php
-foreach ( $cols as $col => $theme_name ) {
-	$class = array('available-theme');
-	if ( $row == 1 ) $class[] = 'top';
-	if ( $col == 1 ) $class[] = 'left';
-	if ( $row == $rows ) $class[] = 'bottom';
-	if ( $col == 3 ) $class[] = 'right';
-?>
-	<td class="<?php echo join(' ', $class); ?>">
-<?php if ( !empty($theme_name) ) :
-	$template = $themes[$theme_name]['Template'];
-	$stylesheet = $themes[$theme_name]['Stylesheet'];
-	$title = $themes[$theme_name]['Title'];
-	$version = $themes[$theme_name]['Version'];
-	$description = $themes[$theme_name]['Description'];
-	$author = $themes[$theme_name]['Author'];
-	$screenshot = $themes[$theme_name]['Screenshot'];
-	$stylesheet_dir = $themes[$theme_name]['Stylesheet Dir'];
-	$template_dir = $themes[$theme_name]['Template Dir'];
-	$parent_theme = $themes[$theme_name]['Parent Theme'];
-	$theme_root = $themes[$theme_name]['Theme Root'];
-	$theme_root_uri = $themes[$theme_name]['Theme Root URI'];
-	$preview_link = esc_url(get_option('home') . '/');
-	if ( is_ssl() )
-		$preview_link = str_replace( 'http://', 'https://', $preview_link );
-	$preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), $preview_link ) );
-	$preview_text = esc_attr( sprintf( __('Preview of &#8220;%s&#8221;'), $title ) );
-	$tags = $themes[$theme_name]['Tags'];
-	$thickbox_class = 'thickbox thickbox-preview';
-	$activate_link = wp_nonce_url("themes.php?action=activate&amp;template=".urlencode($template)."&amp;stylesheet=".urlencode($stylesheet), 'switch-theme_' . $template);
-	$activate_text = esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $title ) );
-	$actions = array();
-	$actions[] = '<a href="' . $activate_link .  '" class="activatelink" title="' . $activate_text . '">' . __('Activate') . '</a>';
-	$actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $theme_name)) . '">' . __('Preview') . '</a>';
-	if ( current_user_can('delete_themes') )
-		$actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url("themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet) . '" onclick="' . "return confirm('" . esc_js(sprintf( __("You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete."), $theme_name )) . "');" . '">' . __('Delete') . '</a>';
-	$actions = apply_filters('theme_action_links', $actions, $themes[$theme_name]);
-
-	$actions = implode ( ' | ', $actions );
-?>
-		<a href="<?php echo $preview_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
-<?php if ( $screenshot ) : ?>
-			<img src="<?php echo $theme_root_uri . '/' . $stylesheet . '/' . $screenshot; ?>" alt="" />
-<?php endif; ?>
-		</a>
-<h3><?php
-	/* translators: 1: theme title, 2: theme version, 3: theme author */
-	printf(__('%1$s %2$s by %3$s'), $title, $version, $author) ; ?></h3>
-<p class="description"><?php echo $description; ?></p>
-<span class='action-links'><?php echo $actions ?></span>
-	<?php if ( current_user_can('edit_themes') && $parent_theme ) {
-	/* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
-	<p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme); ?></p>
-<?php } else { ?>
-	<p><?php printf(__('All of this theme&#8217;s files are located in <code>%2$s</code>.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ) ); ?></p>
-<?php } ?>
-<?php if ( $tags ) : ?>
-<p><?php _e('Tags:'); ?> <?php echo join(', ', $tags); ?></p>
-<?php endif; ?>
-		<?php theme_update_available( $themes[$theme_name] ); ?>
-<?php endif; // end if not empty theme_name ?>
-	</td>
-<?php } // end foreach $cols ?>
-</tr>
-<?php } // end foreach $table ?>
-</table>
-<?php } else { ?>
-<p><?php
-	if ( current_user_can('install_themes') )
-		printf(__('You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the <em><a href="%s">Install Themes</a></em> tab above.'), 'theme-install.php');
-	else
-		printf(__('Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.'), get_site_option('site_name'));
-	?></p>
-<?php } // end if $theme_total?>
-<br class="clear" />
-
-<?php if ( $page_links ) : ?>
-<div class="tablenav">
-<?php echo "<div class='tablenav-pages'>$page_links_text</div>"; ?>
-<br class="clear" />
-</div>
-<?php endif; ?>
+<?php $table->display(); ?>
 
 <br class="clear" />
 
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 355d463210..2bd5fac4b2 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -7,161 +7,120 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once('./admin.php');
-wp_enqueue_script( 'wp-ajax-response' );
-wp_enqueue_script( 'jquery-ui-draggable' );
+require_once( './admin.php' );
 
 if ( !current_user_can('upload_files') )
 	wp_die(__('You do not have permission to upload files.'));
 
-if ( isset($_GET['find_detached']) ) {
-	check_admin_referer('bulk-media');
+// Handle bulk actions
+if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+	check_admin_referer( 'bulk-media' );
 
-	if ( !current_user_can('edit_posts') )
-		wp_die( __('You are not allowed to scan for lost attachments.') );
-
-	$lost = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent > '0' and post_parent NOT IN ( SELECT ID FROM $wpdb->posts WHERE post_type NOT IN ('attachment', '" . join("', '", get_post_types( array( 'public' => false ) ) ) . "') )");
-
-	$_GET['detached'] = 1;
-
-} elseif ( isset($_GET['found_post_id']) && isset($_GET['media']) ) {
-	check_admin_referer('bulk-media');
-
-	if ( ! ( $parent_id = (int) $_GET['found_post_id'] ) )
+	$parent_id = (int) $_REQUEST['found_post_id'];
+	if ( !$parent_id )
 		return;
 
-	$parent = &get_post($parent_id);
-	if ( !current_user_can('edit_post', $parent_id) )
-		wp_die( __('You are not allowed to edit this post.') );
+	$parent = &get_post( $parent_id );
+	if ( !current_user_can( 'edit_post', $parent_id ) )
+		wp_die( __( 'You are not allowed to edit this post.' ) );
 
 	$attach = array();
-	foreach( (array) $_GET['media'] as $att_id ) {
+	foreach ( (array) $_REQUEST['media'] as $att_id ) {
 		$att_id = (int) $att_id;
 
-		if ( !current_user_can('edit_post', $att_id) )
+		if ( !current_user_can( 'edit_post', $att_id ) )
 			continue;
 
 		$attach[] = $att_id;
-		clean_attachment_cache($att_id);
+		clean_attachment_cache( $att_id );
 	}
 
-	if ( ! empty($attach) ) {
-		$attach = implode(',', $attach);
-		$attached = $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ($attach)", $parent_id) );
+	if ( ! empty( $attach ) ) {
+		$attach = implode( ',', $attach );
+		$attached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $attach )", $parent_id ) );
 	}
 
-	if ( isset($attached) ) {
+	if ( isset( $attached ) ) {
 		$location = 'upload.php';
 		if ( $referer = wp_get_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') )
+			if ( false !== strpos( $referer, 'upload.php' ) )
 				$location = $referer;
 		}
 
 		$location = add_query_arg( array( 'attached' => $attached ) , $location );
-		wp_redirect($location);
+		wp_redirect( $location );
 		exit;
 	}
 
-} elseif ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
-	check_admin_referer('bulk-media');
+} elseif ( isset( $_REQUEST['doaction'] ) || isset( $_REQUEST['doaction2'] ) || isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+	check_admin_referer( 'bulk-media' );
 
-	if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
+	if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
 		$post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
 		$doaction = 'delete';
-	} elseif ( ( $_GET['action'] != -1 || $_GET['action2'] != -1 ) && ( isset($_GET['media']) || isset($_GET['ids']) ) ) {
-		$post_ids = isset($_GET['media']) ? $_GET['media'] : explode(',', $_GET['ids']);
-		$doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
+	} elseif ( ( $_REQUEST['action'] != -1 || $_REQUEST['action2'] != -1 ) && ( isset( $_REQUEST['media'] ) || isset( $_REQUEST['ids'] ) ) ) {
+		$post_ids = isset( $_REQUEST['media'] ) ? $_REQUEST['media'] : explode( ',', $_REQUEST['ids'] );
+		$doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
 	} else {
-		wp_redirect($_SERVER['HTTP_REFERER']);
+		wp_redirect( $_SERVER['HTTP_REFERER'] );
 	}
 
 	$location = 'upload.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos($referer, 'upload.php') )
-			$location = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted'), $referer );
+		if ( false !== strpos( $referer, 'upload.php' ) )
+			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
 	}
 
 	switch ( $doaction ) {
 		case 'trash':
-			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can('delete_post', $post_id) )
-					wp_die( __('You are not allowed to move this post to the trash.') );
+			foreach ( (array) $post_ids as $post_id ) {
+				if ( !current_user_can( 'delete_post', $post_id ) )
+					wp_die( __( 'You are not allowed to move this post to the trash.' ) );
 
-				if ( !wp_trash_post($post_id) )
-					wp_die( __('Error in moving to trash...') );
+				if ( !wp_trash_post( $post_id ) )
+					wp_die( __( 'Error in moving to trash...' ) );
 			}
-			$location = add_query_arg( array( 'trashed' => count($post_ids), 'ids' => join(',', $post_ids) ), $location );
+			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
 			break;
 		case 'untrash':
-			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can('delete_post', $post_id) )
-					wp_die( __('You are not allowed to move this post out of the trash.') );
+			foreach ( (array) $post_ids as $post_id ) {
+				if ( !current_user_can( 'delete_post', $post_id ) )
+					wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
 
-				if ( !wp_untrash_post($post_id) )
-					wp_die( __('Error in restoring from trash...') );
+				if ( !wp_untrash_post( $post_id ) )
+					wp_die( __( 'Error in restoring from trash...' ) );
 			}
-			$location = add_query_arg('untrashed', count($post_ids), $location);
+			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
 		case 'delete':
-			foreach( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can('delete_post', $post_id_del) )
-					wp_die( __('You are not allowed to delete this post.') );
+			foreach ( (array) $post_ids as $post_id_del ) {
+				if ( !current_user_can( 'delete_post', $post_id_del ) )
+					wp_die( __( 'You are not allowed to delete this post.' ) );
 
-				if ( !wp_delete_attachment($post_id_del) )
-					wp_die( __('Error in deleting...') );
+				if ( !wp_delete_attachment( $post_id_del ) )
+					wp_die( __( 'Error in deleting...' ) );
 			}
-			$location = add_query_arg('deleted', count($post_ids), $location);
+			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
 			break;
 	}
 
-	wp_redirect($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']) ) );
+} elseif ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
+	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) );
 	 exit;
 }
 
+require_once( './includes/default-list-tables.php' );
+
+$table = new WP_Media_Table;
+
 $title = __('Media Library');
 $parent_file = 'upload.php';
 
-if ( ! isset( $_GET['paged'] ) || $_GET['paged'] < 1 )
-	$_GET['paged'] = 1;
-
-if ( isset($_GET['detached']) ) {
-
-	$media_per_page = (int) get_user_option( 'upload_per_page' );
-	if ( empty($media_per_page) || $media_per_page < 1 )
-		$media_per_page = 20;
-	$media_per_page = apply_filters( 'upload_per_page', $media_per_page );
-
-	if ( !empty($lost) ) {
-		$start = ( (int) $_GET['paged'] - 1 ) * $media_per_page;
-		$page_links_total = ceil(count($lost) / $media_per_page);
-		$lost = implode(',', $lost);
-
-		$orphans = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_type = 'attachment' AND ID IN (%s) LIMIT %d, %d", $lost, $start, $media_per_page ) );
-	} else {
-		$start = ( (int) $_GET['paged'] - 1 ) * $media_per_page;
-		$orphans = $wpdb->get_results( $wpdb->prepare( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1 LIMIT %d, %d", $start, $media_per_page ) );
-		$total_orphans = $wpdb->get_var( "SELECT FOUND_ROWS()" );
-		$page_links_total = ceil( $total_orphans / $media_per_page );
-		$wp_query->found_posts = $total_orphans;
-		$wp_query->query_vars['posts_per_page'] = $media_per_page;
-	}
-
-	$post_mime_types = get_post_mime_types();
-	$avail_post_mime_types = get_available_post_mime_types('attachment');
-
-	if ( isset($_GET['post_mime_type']) && !array_intersect( (array) $_GET['post_mime_type'], array_keys($post_mime_types) ) )
-		unset($_GET['post_mime_type']);
-
-} else {
-	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-}
-
-$is_trash = ( isset($_GET['status']) && $_GET['status'] == 'trash' );
-
-wp_enqueue_script('media');
+wp_enqueue_script( 'wp-ajax-response' );
+wp_enqueue_script( 'jquery-ui-draggable' );
+wp_enqueue_script( 'media' );
 
 add_contextual_help( $current_screen,
 	'<p>' . __('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the <em>Screen Options</em> tab to customize the display of this screen.') . '</p>' .
@@ -239,7 +198,7 @@ foreach ( $matches as $type => $reals )
 	foreach ( $reals as $real )
 		$num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real];
 
-$class = ( empty($_GET['post_mime_type']) && !isset($_GET['detached']) && !isset($_GET['status']) ) ? ' class="current"' : '';
+$class = ( empty($_GET['post_mime_type']) && !$detached && !isset($_GET['status']) ) ? ' class="current"' : '';
 $type_links[] = "<li><a href='upload.php'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . '</a>';
 foreach ( $post_mime_types as $mime_type => $label ) {
 	$class = '';
@@ -252,7 +211,7 @@ foreach ( $post_mime_types as $mime_type => $label ) {
 	if ( !empty( $num_posts[$mime_type] ) )
 		$type_links[] = "<li><a href='upload.php?post_mime_type=$mime_type'$class>" . sprintf( _n( $label[2][0], $label[2][1], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</a>';
 }
-$type_links[] = '<li><a href="upload.php?detached=1"' . ( isset($_GET['detached']) ? ' class="current"' : '' ) . '>' . sprintf( _nx( 'Unattached <span class="count">(%s)</span>', 'Unattached <span class="count">(%s)</span>', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</a>';
+$type_links[] = '<li><a href="upload.php?detached=1"' . ( $detached ? ' class="current"' : '' ) . '>' . sprintf( _nx( 'Unattached <span class="count">(%s)</span>', 'Unattached <span class="count">(%s)</span>', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</a>';
 
 if ( !empty($_num_posts['trash']) )
 	$type_links[] = '<li><a href="upload.php?status=trash"' . ( (isset($_GET['status']) && $_GET['status'] == 'trash' ) ? ' class="current"' : '') . '>' . sprintf( _nx( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . '</a>';
@@ -270,234 +229,12 @@ unset($type_links);
 </p>
 </form>
 
-<form id="posts-filter" action="" method="get">
-<?php wp_nonce_field('bulk-media'); ?>
-<?php if ( have_posts() || isset( $orphans ) ) { ?>
-<div class="tablenav">
-<?php
-if ( ! isset($page_links_total) )
-	$page_links_total =  $wp_query->max_num_pages;
-
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'paged', '%#%' ),
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => $page_links_total,
-	'current' => $_GET['paged']
-));
-
-if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-	number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
-	number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
-	number_format_i18n( $wp_query->found_posts ),
-	$page_links
-); echo $page_links_text; ?></div>
-<?php endif; ?>
-
-<div class="alignleft actions">
-<?php if ( ! isset( $orphans ) || ! empty( $orphans ) ) { ?>
-<select name="action" class="select-action">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( $is_trash ) { ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) { ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php } else { ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php } if ( isset($orphans) ) { ?>
-<option value="attach"><?php _e('Attach to a post'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-
-<?php
-if ( !is_singular() && !isset($_GET['detached']) && !$is_trash ) {
-	$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' 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 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 ( isset($_GET['m']) && ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] ) )
-		$default = ' selected="selected"';
-	else
-		$default = '';
-
-	echo "<option$default value='" . esc_attr("$arc_row->yyear$arc_row->mmonth") . "'>";
-	echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear";
-	echo "</option>\n";
-}
-?>
-</select>
-<?php endif; // month_count ?>
-
-<?php do_action('restrict_manage_posts'); ?>
-
-<input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
-
-<?php } // ! is_singular ?>
-
-<?php
-
-} // ! empty( $orphans )
-
-if ( isset($_GET['detached']) ) { ?>
-	<input type="submit" id="find_detached" name="find_detached" value="<?php esc_attr_e('Scan for lost attachments'); ?>" class="button-secondary" />
-<?php } elseif ( isset($_GET['status']) && $_GET['status'] == 'trash' && current_user_can('edit_others_posts') ) { ?>
-	<input type="submit" id="delete_all" name="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php } ?>
-
-</div>
-
-<br class="clear" />
-</div>
-
-<?php } // have_posts() || !empty( $orphans ) ?>
-
-<div class="clear"></div>
-
-<?php if ( ! empty( $orphans ) ) { ?>
-<table class="widefat" cellspacing="0">
-<thead>
-<tr>
-	<th scope="col" class="check-column"><input type="checkbox" /></th>
-	<th scope="col"></th>
-	<th scope="col"><?php /* translators: column name in media */ _ex('Media', 'media column name'); ?></th>
-	<th scope="col"><?php /* translators: column name in media */ _ex('Author', 'media column name'); ?></th>
-	<th scope="col"><?php /* translators: column name in media */ _ex('Date Added', 'media column name'); ?></th>
-</tr>
-</thead>
-
-<tfoot>
-<tr>
-	<th scope="col" class="check-column"><input type="checkbox" /></th>
-	<th scope="col"></th>
-	<th scope="col"><?php /* translators: column name in media */ _ex('Media', 'media column name'); ?></th>
-	<th scope="col"><?php /* translators: column name in media */ _ex('Author', 'media column name'); ?></th>
-	<th scope="col"><?php /* translators: column name in media */ _ex('Date Added', 'media column name'); ?></th>
-</tr>
-</tfoot>
-
-<tbody id="the-list" class="list:post">
-<?php
-		foreach ( $orphans as $post ) {
-			$class = 'alternate' == $class ? '' : 'alternate';
-			$att_title = esc_html( _draft_or_post_title($post->ID) );
-?>
-	<tr id='post-<?php echo $post->ID; ?>' class='<?php echo $class; ?>' valign="top">
-		<th scope="row" class="check-column"><?php if ( current_user_can('edit_post', $post->ID) ) { ?><input type="checkbox" name="media[]" value="<?php echo esc_attr($post->ID); ?>" /><?php } ?></th>
-
-		<td class="media-icon"><?php
-		if ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) { ?>
-			<a href="media.php?action=edit&amp;attachment_id=<?php echo $post->ID; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>"><?php echo $thumb; ?></a>
-<?php	} ?></td>
-
-		<td class="media column-media"><strong><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br />
-		<?php
-		if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
-			echo esc_html( strtoupper( $matches[1] ) );
-		else
-			echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
-		?>
-
-		<div class="row-actions">
-		<?php
-		$actions = array();
-		if ( current_user_can('edit_post', $post->ID) )
-			$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
-		if ( current_user_can('delete_post', $post->ID) )
-			if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-				$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-attachment_' . $post->ID) . "'>" . __('Trash') . "</a>";
-			} else {
-				$delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-				$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-attachment_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
-			}
-		$actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
-		if ( current_user_can('edit_post', $post->ID) )
-			$actions['attach'] = '<a href="#the-list" onclick="findPosts.open(\'media[]\',\''.$post->ID.'\');return false;" class="hide-if-no-js">'.__('Attach').'</a>';
-		$actions = apply_filters( 'media_row_actions', $actions, $post );
-		$action_count = count($actions);
-		$i = 0;
-		foreach ( $actions as $action => $link ) {
-			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-			echo "<span class='$action'>$link$sep</span>";
-		} ?>
-		</div></td>
-		<td class="author column-author"><?php $author = get_userdata($post->post_author); echo $author->display_name; ?></td>
-<?php	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 class="date column-date"><?php echo $h_time ?></td>
-	</tr>
-<?php	} ?>
-</tbody>
-</table>
-
-<?php
-
-} else {
-	include( './edit-attachment-rows.php' );
-} ?>
-
+<form id="posts-filter" action="" method="post">
+<?php $table->display(); ?>
 <div id="ajax-response"></div>
-
-<div class="tablenav">
-
-<?php
-if ( have_posts() || ! empty( $orphans ) ) {
-
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2" class="select-action">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ($is_trash) { ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) { ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php } else { ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php } if (isset($orphans)) { ?>
-<option value="attach"><?php _e('Attach to a post'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-
-<?php if ( isset($_GET['status']) && $_GET['status'] == 'trash' && current_user_can('edit_others_posts') ) { ?>
-	<input type="submit" id="delete_all2" name="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php } ?>
-</div>
-
-<?php } ?>
+<?php find_posts_div(); ?>
 <br class="clear" />
 </div>
-<?php find_posts_div(); ?>
 </form>
 <br class="clear" />
 
diff --git a/wp-admin/users.php b/wp-admin/users.php
index aeaabc3b42..ca6445e5de 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -7,7 +7,7 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );
 
 /** WordPress Registration API */
 require_once( ABSPATH . WPINC . '/registration.php');
@@ -306,21 +306,12 @@ default:
 		exit;
 	}
 
+	require_once( './includes/default-list-tables.php' );
+
+	$table = new WP_Users_Table;
+
 	include('./admin-header.php');
 
-	$usersearch = isset($_GET['usersearch']) ? $_GET['usersearch'] : null;
-	$userspage = isset($_GET['userspage']) ? $_GET['userspage'] : null;
-	$role = isset($_GET['role']) ? $_GET['role'] : null;
-
-	// Query the user IDs for this page
-	$wp_user_search = new WP_User_Search($usersearch, $userspage, $role);
-
-	// Query the post counts for this page
-	$post_counts = count_many_users_posts($wp_user_search->get_results());
-
-	// Query the users for this page
-	cache_users($wp_user_search->get_results());
-
 	$messages = array();
 	if ( isset($_GET['update']) ) :
 		switch($_GET['update']) {
@@ -372,8 +363,8 @@ if ( ! empty($messages) ) {
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); if ( current_user_can( 'create_users' ) ) { ?>  <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a><?php }
-if ( isset($_GET['usersearch']) && $_GET['usersearch'] )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $_GET['usersearch'] ) ); ?>
+if ( $usersearch )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
 </h2>
 
 <div class="filter">
@@ -415,109 +406,14 @@ unset($role_links);
 <form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="screen-reader-text" for="user-search-input"><?php _e( 'Search Users' ); ?>:</label>
-	<input type="text" id="user-search-input" name="usersearch" value="<?php echo esc_attr($wp_user_search->search_term); ?>" />
+	<input type="text" id="user-search-input" name="usersearch" value="<?php echo esc_attr($usersearch); ?>" />
 	<input type="submit" value="<?php esc_attr_e( 'Search Users' ); ?>" class="button" />
 </p>
 </form>
 
-<form id="posts-filter" action="" method="get">
-<div class="tablenav">
-
-<?php if ( $wp_user_search->results_are_paged() ) : ?>
-	<div class="tablenav-pages"><?php $wp_user_search->page_links(); ?></div>
-<?php endif; ?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( !is_multisite() && current_user_can('delete_users') ) { ?>
-<option value="delete"><?php _e('Delete'); ?></option>
-<?php } else { ?>
-<option value="remove"><?php _e('Remove'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-<label class="screen-reader-text" for="new_role"><?php _e('Change role to&hellip;') ?></label><select name="new_role" id="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option><?php wp_dropdown_roles(); ?></select>
-<input type="submit" value="<?php esc_attr_e('Change'); ?>" name="changeit" class="button-secondary" />
-<?php wp_nonce_field('bulk-users'); ?>
-</div>
-
-<br class="clear" />
-</div>
-
-	<?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?>
-		<div class="error">
-			<ul>
-			<?php
-				foreach ( $wp_user_search->search_errors->get_error_messages() as $message )
-					echo "<li>$message</li>";
-			?>
-			</ul>
-		</div>
-	<?php endif; ?>
-
-
-<?php if ( $wp_user_search->get_results() ) : ?>
-
-	<?php if ( $wp_user_search->is_search() ) : ?>
-		<p><a href="users.php"><?php _e('&larr; Back to All Users'); ?></a></p>
-	<?php endif; ?>
-
-<table class="widefat fixed" cellspacing="0">
-<thead>
-<tr class="thead">
-<?php print_column_headers('users') ?>
-</tr>
-</thead>
-
-<tfoot>
-<tr class="thead">
-<?php print_column_headers('users', false) ?>
-</tr>
-</tfoot>
-
-<tbody id="users" class="list:user user-list">
-<?php
-$style = '';
-foreach ( $wp_user_search->get_results() as $userid ) {
-	$user_object = new WP_User($userid);
-	$roles = $user_object->roles;
-	$role = array_shift($roles);
-
-	if ( is_multisite() && empty( $role ) )
-		continue;
-
-	$style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
-	echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] );
-}
-?>
-</tbody>
-</table>
-
-<div class="tablenav">
-
-<?php if ( $wp_user_search->results_are_paged() ) : ?>
-	<div class="tablenav-pages"><?php $wp_user_search->page_links(); ?></div>
-<?php endif; ?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( !is_multisite() && current_user_can('delete_users') ) { ?>
-<option value="delete"><?php _e('Delete'); ?></option>
-<?php } else { ?>
-<option value="remove"><?php _e('Remove'); ?></option>
-<?php } ?></select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
-
-<br class="clear" />
-</div>
-
-<?php endif; ?>
-
+<form id="posts-filter" action="" method="post">
+<?php $table->display(); ?>
 </form>
-</div>
 
 <?php
 if ( is_multisite() ) {
@@ -536,4 +432,3 @@ break;
 } // end of the $doaction switch
 
 include('./admin-footer.php');
-?>
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 4956fa77b6..9ae70e49cc 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -204,6 +204,8 @@ function get_comments( $args = '' ) {
 		'status' => '',
 		'type' => '',
 		'user_id' => '',
+		'search' => '',
+		'count' => false
 	);
 
 	$args = wp_parse_args( $args, $defaults );
@@ -235,7 +237,7 @@ function get_comments( $args = '' ) {
 	else
 		$approved = "( comment_approved = '0' OR comment_approved = '1' )";
 
-	$order = ( 'ASC' == $order ) ? 'ASC' : 'DESC';
+	$order = ( 'ASC' == strtoupper($order) ) ? 'ASC' : 'DESC';
 
 	if ( ! empty( $orderby ) ) {
 		$ordersby = is_array($orderby) ? $orderby : preg_split('/[,\s]/', $orderby);
@@ -269,32 +271,37 @@ function get_comments( $args = '' ) {
 
 	if ( !empty($number) ) {
 		if ( $offset )
-			$number = 'LIMIT ' . $offset . ',' . $number;
+			$limit = 'LIMIT ' . $offset . ',' . $number;
 		else
-			$number = 'LIMIT ' . $number;
-
+			$limit = 'LIMIT ' . $number;
 	} else {
-		$number = '';
+		$limit = '';
 	}
 
-	$post_where = '';
+	$post_where = "WHERE $approved";
 
 	if ( ! empty($post_id) )
-		$post_where .= $wpdb->prepare( 'comment_post_ID = %d AND ', $post_id );
+		$post_where .= $wpdb->prepare( ' AND comment_post_ID = %d', $post_id );
 	if ( '' !== $author_email )
-		$post_where .= $wpdb->prepare( 'comment_author_email = %s AND ', $author_email );
+		$post_where .= $wpdb->prepare( 'AND comment_author_email = %s', $author_email );
 	if ( '' !== $karma )
-		$post_where .= $wpdb->prepare( 'comment_karma = %d AND ', $karma );
+		$post_where .= $wpdb->prepare( 'AND comment_karma = %d', $karma );
 	if ( 'comment' == $type )
-		$post_where .= "comment_type = '' AND ";
+		$post_where .= " AND comment_type = ''";
 	elseif ( ! empty( $type ) )
-		$post_where .= $wpdb->prepare( 'comment_type = %s AND ', $type );
+		$post_where .= $wpdb->prepare( ' AND comment_type = %s', $type );
 	if ( '' !== $parent )
-		$post_where .= $wpdb->prepare( 'comment_parent = %d AND ', $parent );
+		$post_where .= $wpdb->prepare( ' AND comment_parent = %d', $parent );
 	if ( '' !== $user_id )
-		$post_where .= $wpdb->prepare( 'user_id = %d AND ', $user_id );
+		$post_where .= $wpdb->prepare( ' AND user_id = %d', $user_id );
+	if ( '' !== $search )
+		$post_where .= _wp_search_sql($search, array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content'));
+
+	if ( $count )
+		return $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments $post_where ORDER BY $orderby $order $limit" );
+
+	$comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments $post_where ORDER BY $orderby $order $limit" );
 
-	$comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE $post_where $approved ORDER BY $orderby $order $number" );
 	wp_cache_add( $cache_key, $comments, 'comment' );
 
 	return $comments;
@@ -1282,7 +1289,7 @@ function wp_new_comment( $commentdata ) {
 		$post = &get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
 
 		if ( get_option('comments_notify') && $commentdata['comment_approved'] && ( ! isset( $commentdata['user_id'] ) || $post->post_author != $commentdata['user_id'] ) )
-			wp_notify_postauthor($comment_ID, empty( $commentdata['comment_type'] ) ? $commentdata['comment_type'] : '' );
+			wp_notify_postauthor($comment_ID, isset( $commentdata['comment_type'] ) ? $commentdata['comment_type'] : '' );
 	}
 
 	return $comment_ID;
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 9a54c08378..350cdce10a 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -4194,6 +4194,27 @@ function get_file_data( $file, $default_headers, $context = '' ) {
 
 	return $file_data;
 }
+
+/*
+ * Used internally to generate an SQL string for searching across multiple columns
+ *
+ * @access private
+ * @since 3.1.0
+ *
+ * @param string $string
+ * @param array $cols
+ * @return string
+ */
+function _wp_search_sql($string, $cols) {
+	$string = esc_sql($string);
+
+	$searches = array();
+	foreach ( $cols as $col )
+		$searches[] = "$col LIKE '%$string%'";
+
+	return ' AND (' . implode(' OR ', $searches) . ')';
+}
+
 /*
  * Used internally to tidy up the search terms
  *
diff --git a/wp-includes/js/jquery/jquery.query.js b/wp-includes/js/jquery/jquery.query.js
new file mode 100644
index 0000000000..6b8b2366a5
--- /dev/null
+++ b/wp-includes/js/jquery/jquery.query.js
@@ -0,0 +1,224 @@
+/**
+ * jQuery.query - Query String Modification and Creation for jQuery
+ * Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
+ * Licensed under the WTFPL (http://sam.zoy.org/wtfpl/).
+ * Date: 2009/8/13
+ *
+ * @author Blair Mitchelmore
+ * @version 2.1.7
+ *
+ **/
+new function(settings) { 
+  // Various Settings
+  var $separator = settings.separator || '&';
+  var $spaces = settings.spaces === false ? false : true;
+  var $suffix = settings.suffix === false ? '' : '[]';
+  var $prefix = settings.prefix === false ? false : true;
+  var $hash = $prefix ? settings.hash === true ? "#" : "?" : "";
+  var $numbers = settings.numbers === false ? false : true;
+  
+  jQuery.query = new function() {
+    var is = function(o, t) {
+      return o != undefined && o !== null && (!!t ? o.constructor == t : true);
+    };
+    var parse = function(path) {
+      var m, rx = /\[([^[]*)\]/g, match = /^([^[]+)(\[.*\])?$/.exec(path), base = match[1], tokens = [];
+      while (m = rx.exec(match[2])) tokens.push(m[1]);
+      return [base, tokens];
+    };
+    var set = function(target, tokens, value) {
+      var o, token = tokens.shift();
+      if (typeof target != 'object') target = null;
+      if (token === "") {
+        if (!target) target = [];
+        if (is(target, Array)) {
+          target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
+        } else if (is(target, Object)) {
+          var i = 0;
+          while (target[i++] != null);
+          target[--i] = tokens.length == 0 ? value : set(target[i], tokens.slice(0), value);
+        } else {
+          target = [];
+          target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
+        }
+      } else if (token && token.match(/^\s*[0-9]+\s*$/)) {
+        var index = parseInt(token, 10);
+        if (!target) target = [];
+        target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
+      } else if (token) {
+        var index = token.replace(/^\s*|\s*$/g, "");
+        if (!target) target = {};
+        if (is(target, Array)) {
+          var temp = {};
+          for (var i = 0; i < target.length; ++i) {
+            temp[i] = target[i];
+          }
+          target = temp;
+        }
+        target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
+      } else {
+        return value;
+      }
+      return target;
+    };
+    
+    var queryObject = function(a) {
+      var self = this;
+      self.keys = {};
+      
+      if (a.queryObject) {
+        jQuery.each(a.get(), function(key, val) {
+          self.SET(key, val);
+        });
+      } else {
+        jQuery.each(arguments, function() {
+          var q = "" + this;
+          q = q.replace(/^[?#]/,''); // remove any leading ? || #
+          q = q.replace(/[;&]$/,''); // remove any trailing & || ;
+          if ($spaces) q = q.replace(/[+]/g,' '); // replace +'s with spaces
+          
+          jQuery.each(q.split(/[&;]/), function(){
+            var key = decodeURIComponent(this.split('=')[0] || "");
+            var val = decodeURIComponent(this.split('=')[1] || "");
+            
+            if (!key) return;
+            
+            if ($numbers) {
+              if (/^[+-]?[0-9]+\.[0-9]*$/.test(val)) // simple float regex
+                val = parseFloat(val);
+              else if (/^[+-]?[0-9]+$/.test(val)) // simple int regex
+                val = parseInt(val, 10);
+            }
+            
+            val = (!val && val !== 0) ? true : val;
+            
+            if (val !== false && val !== true && typeof val != 'number')
+              val = val;
+            
+            self.SET(key, val);
+          });
+        });
+      }
+      return self;
+    };
+    
+    queryObject.prototype = {
+      queryObject: true,
+      has: function(key, type) {
+        var value = this.get(key);
+        return is(value, type);
+      },
+      GET: function(key) {
+        if (!is(key)) return this.keys;
+        var parsed = parse(key), base = parsed[0], tokens = parsed[1];
+        var target = this.keys[base];
+        while (target != null && tokens.length != 0) {
+          target = target[tokens.shift()];
+        }
+        return typeof target == 'number' ? target : target || "";
+      },
+      get: function(key) {
+        var target = this.GET(key);
+        if (is(target, Object))
+          return jQuery.extend(true, {}, target);
+        else if (is(target, Array))
+          return target.slice(0);
+        return target;
+      },
+      SET: function(key, val) {
+        var value = !is(val) ? null : val;
+        var parsed = parse(key), base = parsed[0], tokens = parsed[1];
+        var target = this.keys[base];
+        this.keys[base] = set(target, tokens.slice(0), value);
+        return this;
+      },
+      set: function(key, val) {
+        return this.copy().SET(key, val);
+      },
+      REMOVE: function(key) {
+        return this.SET(key, null).COMPACT();
+      },
+      remove: function(key) {
+        return this.copy().REMOVE(key);
+      },
+      EMPTY: function() {
+        var self = this;
+        jQuery.each(self.keys, function(key, value) {
+          delete self.keys[key];
+        });
+        return self;
+      },
+      load: function(url) {
+        var hash = url.replace(/^.*?[#](.+?)(?:\?.+)?$/, "$1");
+        var search = url.replace(/^.*?[?](.+?)(?:#.+)?$/, "$1");
+        return new queryObject(url.length == search.length ? '' : search, url.length == hash.length ? '' : hash);
+      },
+      empty: function() {
+        return this.copy().EMPTY();
+      },
+      copy: function() {
+        return new queryObject(this);
+      },
+      COMPACT: function() {
+        function build(orig) {
+          var obj = typeof orig == "object" ? is(orig, Array) ? [] : {} : orig;
+          if (typeof orig == 'object') {
+            function add(o, key, value) {
+              if (is(o, Array))
+                o.push(value);
+              else
+                o[key] = value;
+            }
+            jQuery.each(orig, function(key, value) {
+              if (!is(value)) return true;
+              add(obj, key, build(value));
+            });
+          }
+          return obj;
+        }
+        this.keys = build(this.keys);
+        return this;
+      },
+      compact: function() {
+        return this.copy().COMPACT();
+      },
+      toString: function() {
+        var i = 0, queryString = [], chunks = [], self = this;
+        var encode = function(str) {
+          str = str + "";
+          if ($spaces) str = str.replace(/ /g, "+");
+          return encodeURIComponent(str);
+        };
+        var addFields = function(arr, key, value) {
+          if (!is(value) || value === false) return;
+          var o = [encode(key)];
+          if (value !== true) {
+            o.push("=");
+            o.push(encode(value));
+          }
+          arr.push(o.join(""));
+        };
+        var build = function(obj, base) {
+          var newKey = function(key) {
+            return !base || base == "" ? [key].join("") : [base, "[", key, "]"].join("");
+          };
+          jQuery.each(obj, function(key, value) {
+            if (typeof value == 'object') 
+              build(value, newKey(key));
+            else
+              addFields(chunks, newKey(key), value);
+          });
+        };
+        
+        build(this.keys);
+        
+        if (chunks.length > 0) queryString.push($hash);
+        queryString.push(chunks.join($separator));
+        
+        return queryString.join("");
+      }
+    };
+    
+    return new queryObject(location.search, location.hash);
+  };
+}(jQuery.query || {}); // Pass in jQuery.query as settings object
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index fcd8f55cff..779bb43ba9 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -155,6 +155,9 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m');
 	$scripts->add_data( 'schedule', 'group', 1 );
 
+	$scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7' );
+	$scripts->add_data( 'jquery-query', 'group', 1 );
+
 	$scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m' );
 	$scripts->add_data( 'jquery-hotkeys', 'group', 1 );
 
@@ -335,7 +338,15 @@ function wp_default_scripts( &$scripts ) {
 		$scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20100407' );
 		$scripts->add_data( 'theme-preview', 'group', 1 );
 
-		$scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20091202' );
+		$scripts->add( 'admin-table', "/wp-admin/js/admin-table$suffix.js", array( 'jquery', 'jquery-query' ), '20100626' );
+		$scripts->add_data( 'admin-table', 'group', 1 );
+		$scripts->localize( 'admin-table', 'adminTableL10n', array(
+			'loading' => __('Loading...'),
+			'error' => __('An error has occured while loading the items.'),
+			'search' => __('Search results for &#8220;%s&#8221;')
+		) );
+
+		$scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20100707' );
 		$scripts->add_data( 'inline-edit-post', 'group', 1 );
 		$scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
 			'error' => __('Error while saving the changes.'),
@@ -344,7 +355,7 @@ function wp_default_scripts( &$scripts ) {
 			'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
 		) );
 
-		$scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20090623' );
+		$scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20100615' );
 		$scripts->add_data( 'inline-edit-tax', 'group', 1 );
 		$scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
 			'error' => __('Error while saving the changes.'),
@@ -430,7 +441,7 @@ function wp_default_styles( &$styles ) {
 	// Any rtl stylesheets that don't have a .dev version for ltr
 	$no_suffix = array( 'farbtastic' );
 
-	$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100614' );
+	$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100624' );
 
 	$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20100610' );
 	$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 0939b27fdd..99f340998c 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -51,9 +51,18 @@ function create_initial_taxonomies() {
 	register_taxonomy( 'link_category', 'link', array(
 		'hierarchical' => false,
 		'labels' => array(
-			'name' => __( 'Categories' ),
-			'singular_name' => __( 'Category' ),
-			'update_item' => __( 'Update Category' ),
+			'name' => __( 'Link Categories' ),
+			'singular_name' => __( 'Link Category' ),
+			'search_items' => __( 'Search Link Categories' ),
+			'popular_items' => null,
+			'all_items' => __( 'All Link Categories' ),
+			'edit_item' => __( 'Edit Link Category' ),
+			'update_item' => __( 'Update Link Category' ),
+			'add_new_item' => __( 'Add New Link Category' ),
+			'new_item_name' => __( 'New Link Category Name' ),
+			'separate_items_with_commas' => null,
+			'add_or_remove_items' => null,
+			'choose_from_most_used' => null,
 		),
 		'query_var' => false,
 		'rewrite' => false,
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 2157c92cf3..002c5c0c07 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -325,6 +325,222 @@ function delete_user_option( $user_id, $option_name, $global = false ) {
 	return delete_user_meta( $user_id, $option_name );
 }
 
+/**
+ * WordPress User Query class.
+ *
+ * @since 3.1.0
+ */
+class WP_User_Query {
+
+	/**
+	 * {@internal Missing Description}}
+	 *
+	 * @since 3.1.0
+	 * @access private
+	 * @var array
+	 */
+	var $results;
+
+	/**
+	 * The total number of users for the current query
+	 *
+	 * @since 3.1.0
+	 * @access private
+	 * @var int
+	 */
+	var $total_users = 0;
+
+	var $query_from;
+	var $query_where;
+	var $query_orderby;
+	var $query_limit;
+
+	/**
+	 * Sets up the object properties.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param string|array $args The query variables
+	 * @return WP_User_Query
+	 */
+	function WP_User_Query( $query ) {
+		$this->query_vars = wp_parse_args( $query, array(
+			'search' => '', 'role' => '',
+			'offset' => '', 'number' => '', 'count_total' => true,
+			'orderby' => 'login', 'order' => 'ASC',
+			'meta_key' => '', 'meta_value' => '',
+			'include' => array(), 'exclude' => array(),
+			'fields' => 'all'
+		) );
+
+		$this->prepare_query();
+		$this->query();
+	}
+
+	/**
+	 * Prepare the query variables
+	 *
+	 * @since 3.1.0
+	 * @access private
+	 */
+	function prepare_query() {
+		global $wpdb;
+
+		$qv = &$this->query_vars;
+
+		$this->query_from = " FROM $wpdb->users";
+		$this->query_where = " WHERE 1=1";
+
+		// sorting
+		if ( in_array( $qv['orderby'], array('email', 'url', 'registered') ) ) {
+			$orderby = 'user_' . $qv['orderby'];
+		}
+		elseif ( 'name' == $qv['orderby'] ) {
+			$orderby = 'display_name';
+		}
+		elseif ( 'post_count' == $qv['orderby'] ) {
+			$where = get_posts_by_author_sql('post');
+			$this->query_from .= " LEFT OUTER JOIN (
+				SELECT post_author, COUNT(*) as post_count
+				FROM wp_posts
+				$where
+				GROUP BY post_author
+			) p ON (wp_users.ID = p.post_author)
+			";
+			$orderby = 'post_count';
+		}
+		else {
+			$orderby = 'user_login';
+		}
+
+		$qv['order'] = strtoupper( $qv['order'] );
+		if ( 'ASC' == $qv['order'] )
+			$order = 'ASC';
+		else
+			$order = 'DESC';
+		$this->query_orderby = " ORDER BY $orderby $order";
+
+		// limit
+		if ( $qv['number'] ) {
+			if ( $qv['offset'] )
+				$this->query_limit = $wpdb->prepare(" LIMIT %d, %d", $qv['offset'], $qv['offset'] + $qv['number']);
+			else
+				$this->query_limit = $wpdb->prepare(" LIMIT %d", $qv['number']);
+		}
+
+		$search = trim( $qv['search'] );
+		if ( $search ) {
+			$this->query_where .= _wp_search_sql( $search, array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') );
+		}
+
+		$role = trim( $qv['role'] );
+		if ( $role ) {
+			$this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
+			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $role . '%');
+		} elseif ( is_multisite() ) {
+			$level_key = $wpdb->prefix . 'capabilities'; // wpmu site admins don't have user_levels
+			$this->query_from .= ", $wpdb->usermeta";
+			$this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
+		}
+
+		$meta_key = trim( $qv['meta_key'] );
+		$meta_value = trim( $qv['meta_value'] );
+		if ( $meta_key ) {
+			if ( empty( $meta_value ) ) {
+				$subquery = $wpdb->prepare( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = %s", $meta_key );
+			}
+			else {
+				$subquery = $wpdb->prepare( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = %s AND meta_value = %s", $meta_key, $meta_value );
+			}
+
+			$this->query_where .= " AND $wpdb->users.ID IN ($subquery)";
+		}
+
+		if ( !empty($qv['include']) ) {
+			$ids = implode( ',', wp_parse_id_list( $qv['include'] ) );
+			$this->query_where .= " AND $wpdb->users.ID IN ($ids)";
+		}
+		elseif ( !empty($qv['exclude']) ) {
+			$ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+			$this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
+		}
+
+		do_action_ref_array( 'pre_user_query', array( &$this ) );
+	}
+
+	/**
+	 * Execute the query, with the current variables
+	 *
+	 * @since 3.1.0
+	 * @access private
+	 */
+	function query() {
+		global $wpdb;
+
+		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
+
+		if ( !$this->results )
+			return;
+
+		if ( $this->query_vars['count_total'] )
+			$this->total_users = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where);
+
+		if ( 'all' == $this->query_vars['fields'] ) {
+			cache_users($this->results);
+
+			$r = array();
+			foreach ( $this->results as $userid )
+				$r[ $userid ] = new WP_User( $userid );
+
+			$this->results = $r;
+		}
+	}
+
+	/**
+	 * Return the list of users
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @return array
+	 */
+	function get_results() {
+		return $this->results;
+	}
+
+	/**
+	 * Return the total number of users for the current query
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @return array
+	 */
+	function get_total() {
+		return $this->total_users;
+	}
+}
+
+/**
+ * Retrieve list of users matching criteria.
+ *
+ * @since 3.1.0
+ * @uses $wpdb
+ * @uses WP_User_Query See for default arguments and information.
+ *
+ * @param array $args
+ * @return array List of users.
+ */
+function get_users( $args ) {
+
+	$args = wp_parse_args( $args );
+	$args['count_total'] = false;
+
+	$user_search = new WP_User_Query($args);
+
+	return (array) $user_search->get_results();
+}
+
 /**
  * Get users for the blog.
  *
@@ -429,7 +645,7 @@ function update_user_meta($user_id, $meta_key, $meta_value, $prev_value = '') {
  * Count number of users who have each of the user roles.
  *
  * Assumes there are neither duplicated nor orphaned capabilities meta_values.
- * Assumes role names are unique phrases.  Same assumption made by WP_User_Search::prepare_query()
+ * Assumes role names are unique phrases.  Same assumption made by WP_User_Query::prepare_query()
  * Using $strategy = 'time' this is CPU-intensive and should handle around 10^7 users.
  * Using $strategy = 'memory' this is memory-intensive and should handle around 10^5 users, but see WP Bug #12257.
  *