diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 808710c94c..65fb76b31f 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -349,7 +349,8 @@ a:hover,
 div.dashboard-widget-submit input:hover,
 .subsubsub a:hover,
 .subsubsub a.current:hover,
-.ui-tabs-nav a:hover {
+.ui-tabs-nav a:hover,
+.plugins .inactive a:hover {
 	color: #d54e21;
 }
 
@@ -468,8 +469,8 @@ a,
 #the-comment-list p.comment-author strong a,
 #media-upload a.del-link,
 #media-items a.delete,
-.ui-tabs-nav a,
-.plugins a.delete {
+.plugins a.delete,
+.ui-tabs-nav a {
 	color: #1c6280;
 }
 
@@ -580,15 +581,15 @@ input.readonly, textarea.readonly {
 
 #all-plugins-table .inactive,
 #all-plugins-table .inactive th,
-#all-plugins-table .inactive td {
-	color: #777;
+#all-plugins-table .inactive td,
+#all-plugins-table .inactive a {
+	color: #888;
 }
 
 .plugins .active,
 .plugins .active th,
 .plugins .active td {
 	color: #000;
-	background-color: #f5f5f5;
 }
 
 #the-comment-list .unapproved,
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 4c802a2c64..c1ed19411d 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -349,7 +349,8 @@ a:hover,
 div.dashboard-widget-submit input:hover,
 .subsubsub a:hover,
 .subsubsub a.current:hover,
-.ui-tabs-nav a:hover {
+.ui-tabs-nav a:hover,
+.plugins .inactive a:hover {
 	color: #d54e21;
 }
 
@@ -464,8 +465,8 @@ a,
 #the-comment-list p.comment-author strong a,
 #media-upload a.del-link,
 #media-items a.delete,
-.ui-tabs-nav a,
-.plugins a.delete {
+.plugins a.delete,
+.ui-tabs-nav a {
 	color: #21759b;
 }
 
@@ -575,15 +576,15 @@ input.readonly, textarea.readonly {
 
 #all-plugins-table .inactive,
 #all-plugins-table .inactive th,
-#all-plugins-table .inactive td {
-	color: #777;
+#all-plugins-table .inactive td,
+#all-plugins-table .inactive a {
+	color: #888;
 }
 
 .plugins .active,
 .plugins .active th,
 .plugins .active td {
 	color: #000;
-	background-color: #f5f5f5;
 }
 
 #the-comment-list .unapproved,
diff --git a/wp-admin/js/plugin-install.dev.js b/wp-admin/js/plugin-install.dev.js
index 6037ca4df7..fabb1aa6b1 100644
--- a/wp-admin/js/plugin-install.dev.js
+++ b/wp-admin/js/plugin-install.dev.js
@@ -11,7 +11,7 @@ jQuery(document).ready(function($) {
 				tbWindow.css({'top':'20px','margin-top':'0'});
 		};
 
-		return $('#dashboard_plugins a.thickbox, #install-plugins a.thickbox').each( function() {
+		return $('#dashboard_plugins a.thickbox, .plugins a.thickbox').each( function() {
 			var href = $(this).attr('href');
 			if ( ! href )
 				return;
diff --git a/wp-admin/js/plugin-install.js b/wp-admin/js/plugin-install.js
index ca4a55380e..cbe0c5e26b 100644
--- a/wp-admin/js/plugin-install.js
+++ b/wp-admin/js/plugin-install.js
@@ -1 +1 @@
-jQuery(document).ready(function(b){var a=function(){var f=b("#TB_window"),e=b(window).width(),d=b(window).height(),c=(720<e)?720:e;if(f.size()){f.width(c-50).height(d-45);b("#TB_iframeContent").width(c-50).height(d-75);f.css({"margin-left":"-"+parseInt(((c-50)/2),10)+"px"});if(!(b.browser.msie&&b.browser.version.substr(0,1)<7)){f.css({top:"20px","margin-top":"0"})}}return b("#dashboard_plugins a.thickbox, #install-plugins a.thickbox").each(function(){var g=b(this).attr("href");if(!g){return}g=g.replace(/&width=[0-9]+/g,"");g=g.replace(/&height=[0-9]+/g,"");b(this).attr("href",g+"&width="+(c-80)+"&height="+(d-85))})};a().click(function(){b("#TB_title").css({"background-color":"#222",color:"#cfcfcf"});b("#TB_ajaxWindowTitle").html("<strong>"+plugininstallL10n.plugin_information+"</strong>&nbsp;"+b(this).attr("title"));return false});b("#plugin-information #sidemenu a").click(function(){var c=b(this).attr("name");b("#plugin-information-header a.current").removeClass("current");b(this).addClass("current");b("#section-holder div.section").hide();b("#section-"+c).show();return false})});
\ No newline at end of file
+jQuery(document).ready(function(b){var a=function(){var f=b("#TB_window"),e=b(window).width(),d=b(window).height(),c=(720<e)?720:e;if(f.size()){f.width(c-50).height(d-45);b("#TB_iframeContent").width(c-50).height(d-75);f.css({"margin-left":"-"+parseInt(((c-50)/2),10)+"px"});if(!(b.browser.msie&&b.browser.version.substr(0,1)<7)){f.css({top:"20px","margin-top":"0"})}}return b("#dashboard_plugins a.thickbox, .plugins a.thickbox").each(function(){var g=b(this).attr("href");if(!g){return}g=g.replace(/&width=[0-9]+/g,"");g=g.replace(/&height=[0-9]+/g,"");b(this).attr("href",g+"&width="+(c-80)+"&height="+(d-85))})};a().click(function(){b("#TB_title").css({"background-color":"#222",color:"#cfcfcf"});b("#TB_ajaxWindowTitle").html("<strong>"+plugininstallL10n.plugin_information+"</strong>&nbsp;"+b(this).attr("title"));return false});b("#plugin-information #sidemenu a").click(function(){var c=b(this).attr("name");b("#plugin-information-header a.current").removeClass("current");b(this).addClass("current");b("#section-holder div.section").hide();b("#section-"+c).show();return false})});
\ No newline at end of file
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 44049f2709..7782965fdc 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -381,12 +381,7 @@ function print_plugins_table($plugins, $context = '') {
 		<th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th>
 		<td class='plugin-title'><strong>{$plugin_data['Name']}</strong></td>
 		<td class='desc'><p>{$plugin_data['Description']}</p></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 );
-
-		echo "
+	</tr>
 	<tr class='$class second'>
 		<td></td>
 		<td class='plugin-title'>";
@@ -415,6 +410,9 @@ function print_plugins_table($plugins, $context = '') {
 		echo implode(' | ', $plugin_meta);
 		echo "</p></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>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 32f5dcf8e1..4d222b3c09 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -71,19 +71,32 @@ select option {
 	padding: 7px 0;
 }
 
-.plugins td,
-.plugins th {
+.widefat .plugins td,
+.widefat .plugins th {
 	border-bottom: 0 none;
+}
+
+.plugins .inactive td,
+.plugins .inactive th,
+.plugins .active td,
+.plugins .active th {
+	border-top-style: solid;
+	border-top-width: 1px;
 	padding: 4px 7px 0;
 }
 
 .plugins .second td,
 .plugins .second th {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
+	border-top: 0 none;
 	padding: 0 7px 4px;
 }
 
+.plugins-php .widefat tfoot th,
+.plugins-php .widefat tfoot td {
+	border-top-style: solid;
+	border-top-width: 1px;
+}
+
 .import-system {
 	font-size: 16px;
 }
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 944785550d..ea5c044d1e 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -362,7 +362,7 @@ function wp_default_scripts( &$scripts ) {
 			'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
 		) );
 
-		$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery' ), '20090506' );
+		$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery' ), '20090520' );
 		$scripts->add_data( 'plugin-install', 'group', 1 );
 		$scripts->localize( 'plugin-install', 'plugininstallL10n', array(
 			'plugin_information' => __('Plugin Information:'),
@@ -415,9 +415,9 @@ function wp_default_styles( &$styles ) {
 	$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
 
 	// all colors stylesheets need to have the same query strings (cache manifest compat)
-	$colors_version = '20090520';
+	$colors_version = '20090520a';
 	
-	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090518' );
+	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090520' );
 	$styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
 
 	$styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090514' );