diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 76433192bb..e51ad22127 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -130,27 +130,27 @@ endif; ?>
 	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <div class="tablenav">
 
-<div style="float: left">
+<div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-categories'); ?>
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <table class="widefat">
 	<thead>
 	<tr>
-		<th scope="col" class="check-column"><div style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById('posts-filter'));" /></div></th>
+		<th scope="col" class="check-column"><input type="checkbox" onclick="checkAll(document.getElementById('posts-filter'));" /></th>
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col"><?php _e('Description') ?></th>
-        <th scope="col" style="text-align: center"><?php _e('Posts') ?></th>
+        <th scope="col" class="num"><?php _e('Posts') ?></th>
 	</tr>
 	</thead>
 	<tbody id="the-list" class="list:cat">
@@ -161,10 +161,10 @@ cat_rows();
 </table>
 </form>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <div class="tablenav">
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
 </div>
diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index 6b3438ee2b..3ed3b82870 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -79,7 +79,7 @@ if ( 'spam' == $_GET['dt'] ) {
 <table width="100%">
 <tr>
 <td><input type='button' class="button" value='<?php _e('No'); ?>' onclick="self.location='<?php echo get_option('siteurl'); ?>/wp-admin/edit-comments.php';" /></td>
-<td style="text-align: right;"><input type='submit' class="button" value='<?php echo $button; ?>' /></td>
+<td class="textright"><input type='submit' class="button" value='<?php echo $button; ?>' /></td>
 </tr>
 </table>
 
diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css
index 5bd9e2fcc8..d4b6f721be 100644
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -27,9 +27,10 @@ textarea, input, select {
 }
 
 .alignleft { float: left; }
-
 .alignright { float: right; }
 
+.textleft { text-align: left; }
+.textright { text-align: right; }
 
 .clear { clear: both; height: 2px; }
 
@@ -82,6 +83,10 @@ textarea, input, select {
 	width: 3%;
 }
 
+.widefat .num {
+	text-align: center;
+}
+
 .wrap, .updated, .error {
 	margin: 0;
 	margin-left: 15px;
diff --git a/wp-admin/css/theme-editor.css b/wp-admin/css/theme-editor.css
index eaaa946fdb..2c59e97b8b 100644
--- a/wp-admin/css/theme-editor.css
+++ b/wp-admin/css/theme-editor.css
@@ -18,6 +18,14 @@
 	margin: 0;
 }
 
+h3#bordertitle {
+	margin-bottom: 10px;
+}
+
+#templateside h4 {
+	margin-bottom: 0px;
+}
+
 #templateside ol, #templateside ul {
 	list-style: none;
 	margin: .5em;
@@ -35,10 +43,24 @@
 	bottom: 25px;
 }
 
+#themeselector select {
+	margin: 0;
+	padding: 0;
+}
+
 .nonessential {
 	font-size: small;
 }
 
 .highlight {
 	padding: 1px;
-}
\ No newline at end of file
+}
+
+div.bordertitle h2 {
+	border: none;
+	padding-bottom: 0px;
+}
+
+div.tablenav {
+	margin-right: 210px;
+}
diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php
index 8eb90660f6..2a1ab994dd 100644
--- a/wp-admin/edit-attachment-rows.php
+++ b/wp-admin/edit-attachment-rows.php
@@ -33,7 +33,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	case 'cb':
 		?>
-		<th scope="row" style="text-align: center"><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /></th>
+		<th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /></th>
 		<?php
 		break;
 
@@ -95,7 +95,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	case 'comments':
 		?>
-		<td style="text-align: center">
+		<td class="num">
 		<?php
 		$left = get_pending_comments_num( $post->ID );
 		$pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index b5dc2143fe..4d237e03c8 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -162,7 +162,7 @@ if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
-<div style="float: left">
+<div class="alignleft">
 <?php if ( 'approved' != $comment_status ): ?>
 <input type="submit" value="<?php _e('Approve'); ?>" name="approveit" class="button-secondary" />
 <?php endif; ?>
@@ -175,17 +175,18 @@ if ( $page_links )
 <?php wp_nonce_field('bulk-comments'); ?>
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
+
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 <?php
 if ($comments) {
 ?>
 <table class="widefat">
 <thead>
   <tr>
-    <th scope="col" style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById('comments-form'));" /></th>
+    <th scope="col" class="check-column"><input type="checkbox" onclick="checkAll(document.getElementById('comments-form'));" /></th>
     <th scope="col"><?php _e('Comment') ?></th>
     <th scope="col"><?php _e('Date') ?></th>
     <th scope="col"><?php _e('Actions') ?></th>
@@ -236,7 +237,7 @@ if ($comments) {
 if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
 </div>
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index b8c9b3d882..9eb7a6daf8 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -133,7 +133,7 @@ if ($post_ID) {
 </div>
 
 <p class="submit">
-<input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" class="button" />
+<input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
 <?php
 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
 ?>
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 0cc4915b43..d10cf34a64 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -51,7 +51,7 @@ $time = mysql2date(get_option('time_format'), $comment->comment_date);
 </div>
 
 <p class="submit">
-<input type="submit" name="save" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
+<input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
 <?php
 echo "<a href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID", 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>";
 ?>
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 0f939f77d3..d0713e951d 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -58,7 +58,7 @@ edCanvas = document.getElementById('content');
 	<input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />
 
 	 <?php if ( current_user_can('edit_posts') ) : ?>
-	<input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="<?php _e('Publish') ?>" />
+	<input name="publish" type="submit" id="publish" tabindex="6" value="<?php _e('Publish') ?>" class="button button-highlighted" />
 <?php endif; ?>
 
 <?php if ('bookmarklet' != $mode) {
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 10bc7b15e5..b8379adff3 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -59,7 +59,7 @@ endif; ?>
 	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <div class="tablenav">
 
@@ -81,15 +81,15 @@ if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
-<div style="float: left">
+<div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-link-categories'); ?>
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <table class="widefat">
 	<thead>
@@ -124,7 +124,7 @@ if ( $categories ) {
 </table>
 </form>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <div class="tablenav">
 
@@ -132,7 +132,7 @@ if ( $categories ) {
 if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
 </div>
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index df0e794bd9..843a9ff68e 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -52,7 +52,7 @@ function xfn_check($class, $value = '', $deprecated = '') {
 </div>
 
 <p class="submit">
-<input type="submit" class="button" name="save" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
+<input type="submit" class="button" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
 <?php
 if ( ( 'edit' == $action) && current_user_can('manage_links') )
 	echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link_id", 'delete-bookmark_' . $link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>";
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 321a463554..981daeca41 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -111,7 +111,7 @@ if ($post_ID) {
 </div>
 
 <p class="submit">
-<input type="submit" name="save" class="button" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
+<input type="submit" name="save" class="button" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
 <?php
 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
 ?>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 71fe7a9acb..b1123598ac 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -117,15 +117,15 @@ endif;
 
 <div class="tablenav">
 
-<div style="float: left">
+<div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-pages'); ?>
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <?php
 
@@ -161,7 +161,7 @@ if ($posts) {
 ?>
 
 <div class="tablenav">
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
 <?php
diff --git a/wp-admin/edit-post-rows.php b/wp-admin/edit-post-rows.php
index 9968934aa1..e238be8db4 100644
--- a/wp-admin/edit-post-rows.php
+++ b/wp-admin/edit-post-rows.php
@@ -105,7 +105,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	case 'comments':
 		?>
-		<td style="text-align: center">
+		<td class="num">
 		<?php
 		$left = get_pending_comments_num( $post->ID );
 		$pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index fe6b89f736..38e1ee6288 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -122,7 +122,7 @@ endif; ?>
 	<input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
 </p>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <div class="tablenav">
 
@@ -144,15 +144,15 @@ if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
-<div style="float: left">
+<div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-tags'); ?>
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <table class="widefat">
 	<thead>
@@ -173,7 +173,7 @@ $count = tag_rows( $pagenum, $tagsperpage, $searchterms );
 </table>
 </form>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <div class="tablenav">
 
@@ -181,7 +181,7 @@ $count = tag_rows( $pagenum, $tagsperpage, $searchterms );
 if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
 </div>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 21824db689..80346b1888 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -134,7 +134,7 @@ if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
-<div style="float: left">
+<div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-posts'); ?>
 <?php
@@ -174,10 +174,10 @@ foreach ($arc_result as $arc_row) {
 <?php } ?>
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <?php include( 'edit-post-rows.php' ); ?>
 
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index b43c2daba7..94dff14aaf 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -823,7 +823,7 @@ jQuery(function($){
 	<input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onClick="return top.tb_remove();"><?php _e('Cancel'); ?></a>
 	</p>
 	<input type="hidden" name="post_id" id="post_id" value="<?php echo $post_id; ?>" />
-	<br style="clear:both" />
+	<br class="clear" />
 </div>
 <?php
 }
@@ -989,7 +989,7 @@ if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
-<div style="float: left">
+<div class="alignleft">
 <?php
 
 $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";
@@ -1024,7 +1024,7 @@ foreach ($arc_result as $arc_row) {
 
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 </form>
 
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 9e78d93044..0b963781eb 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -56,7 +56,7 @@ function _cat_row( $category, $level, $name_override = false ) {
 		<th scope='row' class='check-column'><input type='checkbox' name='delete[]' value='$category->term_id' /></th>
 		<td>$edit</td>
 		<td>$category->description</td>
-		<td style='text-align: center;'>$posts_count</td>\n\t</tr>\n";
+		<td class='num'>$posts_count</td>\n\t</tr>\n";
 
 	return apply_filters('cat_row', $output);
 }
@@ -84,7 +84,7 @@ function link_cat_row( $category ) {
 		'<th scope="row" class="check-column"> <input type="checkbox" name="delete[]" value="' . $category->term_id . '" /></th>' .
 		"<td>$edit</td>
 		<td>$category->description</td>
-		<td style='text-align: center;'>$count</td></tr>";
+		<td class='num'>$count</td></tr>";
 
 	return apply_filters( 'link_cat_row', $output );
 }
@@ -276,7 +276,7 @@ function tag_rows( $page = 1, $pagesize = 20, $searchterms = '' ) {
 // define the columns to display, the syntax is 'internal name' => 'display name'
 function wp_manage_posts_columns() {
 	$posts_columns = array();
-	$posts_columns['cb'] = '<div style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById(\'posts-filter\'));" /></div>';
+	$posts_columns['cb'] = '<input type="checkbox" onclick="checkAll(document.getElementById(\'posts-filter\'));" />';
 	if ( 'draft' === $_GET['post_status'] )
 		$posts_columns['modified'] = __('Modified');
 	elseif ( 'pending' === $_GET['post_status'] )
@@ -298,7 +298,7 @@ function wp_manage_posts_columns() {
 // define the columns to display, the syntax is 'internal name' => 'display name'
 function wp_manage_media_columns() {
 	$posts_columns = array();
-	$posts_columns['cb'] = '<div style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById(\'posts-filter\'));" /></div>';
+	$posts_columns['cb'] = '<input type="checkbox" onclick="checkAll(document.getElementById(\'posts-filter\'));" />';
 	$posts_columns['icon'] = '';
 	$posts_columns['media'] = _c('Media|media column header');
 	$posts_columns['desc'] = _c('Description|media column header');
@@ -313,7 +313,7 @@ function wp_manage_media_columns() {
 
 function wp_manage_pages_columns() {
 	$posts_columns = array();
-	$posts_columns['cb'] = '<div style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById(\'posts-filter\'));" /></div>';
+	$posts_columns['cb'] = '<input type="checkbox" onclick="checkAll(document.getElementById(\'posts-filter\'));" />';
 	if ( 'draft' === $_GET['post_status'] )
 		$posts_columns['modified'] = __('Modified');
 	elseif ( 'pending' === $_GET['post_status'] )
@@ -400,7 +400,7 @@ foreach ($posts_columns as $column_name=>$column_display_name) {
 
 	case 'comments':
 		?>
-		<td style="text-align: center">
+		<td class="num">
 		<?php
 		$left = get_pending_comments_num( $page->ID );
 		$pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
@@ -627,7 +627,7 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true
 ?>
   <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
 <?php if ( $checkbox ) : ?>
-    <td style="text-align: center;"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
+    <td class="check-column"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
 <?php endif; ?>
     <td class="comment">
     <p class="comment-author"><strong><a class="row-title" href="comment.php?action=editcomment&amp;c=<?php echo $comment->comment_ID?>"><?php comment_author(); ?></a></strong><br />
@@ -769,7 +769,7 @@ function meta_form() {
 <th><?php _e( 'Value' ) ?></th>
 </tr>
 	<tr valign="top">
-		<td style="text-align: right; width: 18%;">
+		<td style="width: 18%;" class="textright">
 <?php if ( $keys ) : ?>
 <select id="metakeyselect" name="metakeyselect" tabindex="7">
 <option value="#NONE#"><?php _e( '- Select -' ); ?></option>
@@ -877,7 +877,7 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
 function browse_happy() {
 	$getit = __( 'WordPress recommends a better browser' );
 	echo '
-		<p id="bh" style="float: right"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></p>
+		<p id="bh" class="alignright"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></p>
 		';
 }
 
diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php
index 1d4476cdf9..f2183f6bf9 100644
--- a/wp-admin/link-import.php
+++ b/wp-admin/link-import.php
@@ -29,12 +29,12 @@ switch ($step) {
 <div style="width: 70%; margin: auto; height: 8em;">
 <input type="hidden" name="step" value="1" />
 <input type="hidden" name="MAX_FILE_SIZE" value="30000" />
-<div style="width: 48%; float: left;">
+<div style="width: 48%;" class="alignleft">
 <h3><?php _e('Specify an OPML URL:'); ?></h3>
 <input type="text" name="opml_url" size="50" style="width: 90%;" value="http://" />
 </div>
 
-<div style="width: 48%; float: left;">
+<div style="width: 48%;" class="alignleft">
 <h3><?php _e('Or choose from your local disk:'); ?></h3>
 <input id="userfile" name="userfile" type="file" size="30" />
 </div>
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 9e5b0fdb5a..1ee0135d88 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -84,11 +84,11 @@ if ( isset($_GET['deleted']) ) {
 	<input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
 </p>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <div class="tablenav">
 
-<div style="float: left">
+<div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php
 $categories = get_terms('link_category', "hide_empty=1");
@@ -113,10 +113,10 @@ echo $select_order;
 
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <?php
 $link_columns = array(
@@ -220,7 +220,7 @@ if ( $links ) {
 <div id="ajax-response"></div>
 
 <div class="tablenav">
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
 
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index f8e23a44f3..95a2a16e1c 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -15,7 +15,7 @@ include('admin-header.php');
 <table class="form-table">
 <tr valign="top">
 <th scope="row"> <?php _e('Size of the post box') ?></th>
-<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " />
+<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em;" />
 <?php _e('lines') ?></td>
 </tr>
 <tr valign="top">
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 168a76bfc2..ab46c82dfb 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -99,10 +99,10 @@ default:
 <?php endif; ?>
  <div class="wrap">
 <div class="bordertitle">
-	<h2 style="border: none; padding-bottom: 0px;"><?php _e('Plugin Editor'); ?></h2>
+	<h2><?php _e('Plugin Editor'); ?></h2>
 </div>
-<div class="tablenav" style="margin-right: 210px;">
-<div style="float: left;">
+<div class="tablenav">
+<div class="alignleft">
 <big><strong><?php
 	if ( in_array($file, (array) get_option('active_plugins')) ) {
 		if (is_writeable($real_file)) {
@@ -119,13 +119,13 @@ default:
 	}
 	?></strong></big>
 </div>
-<br style="clear: both;" />
+<br class="clear" />
 </div>
-<br style="clear: both;" />
+<br class="clear" />
 	<div id="templateside">
-	<h3 id="bordertitle" style="margin-bottom: 10px;"><?php _e("Plugin Files"); ?></h3>
+	<h3 id="bordertitle"><?php _e("Plugin Files"); ?></h3>
 
-	<h4 style="margin-bottom: 0px;"><?php _e('Plugins'); ?></h4>
+	<h4><?php _e('Plugins'); ?></h4>
 	<ul>
 <?php foreach($plugin_files as $plugin_file) : ?>
 		<li><a href="plugin-editor.php?file=<?php echo "$plugin_file"; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li>
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index c444bb3a7a..eaa5011ef3 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -83,7 +83,7 @@ if (empty($plugins)) {
 ?>
 
 <div class="tablenav">
-	<div style="float: left">
+	<div class="alignleft">
 	<?php
 	$active = get_option('active_plugins');
 	$inactive = get_option('deactivated_plugins');
@@ -98,16 +98,16 @@ if (empty($plugins)) {
 	} // endif active/inactive plugin check
 	?>
 	</div>
-	<br style="clear:both;">
+	<br class="clear" />
 </div>
 
-<br style="clear:both;">
+<br class="clear" />
 
 <table class="widefat">
 	<thead>
 	<tr>
 		<th><?php _e('Plugin'); ?></th>
-		<th style="text-align: center"><?php _e('Version'); ?></th>
+		<th class="num"><?php _e('Version'); ?></th>
 		<th><?php _e('Description'); ?></th>
 		<th <?php if ( current_user_can('edit_plugins') ) echo ' colspan="2"'; ?>><?php _e('Action'); ?></th>
 	</tr>
diff --git a/wp-admin/sidebar.php b/wp-admin/sidebar.php
index d950b38a41..e580f4a74d 100644
--- a/wp-admin/sidebar.php
+++ b/wp-admin/sidebar.php
@@ -73,7 +73,7 @@ Post:
 <p>
 	<input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="Save as Draft" />
 <?php if ( current_user_can('publish_posts') ) : ?>
-	<input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="Publish" />
+	<input name="publish" type="submit" id="publish" tabindex="6" value="Publish" class="button button-highlighted" />
 <?php endif; ?>
 </p>
 </div>
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 591990b35b..f17a48c118 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -90,10 +90,10 @@ $desc_header = ( $description != $file_show ) ? "$description</strong> (%s)" : "
 ?>
 <div class="wrap">
 <div class="bordertitle">
-	<h2 style="border: none; padding-bottom: 0px;"><?php _e('Theme Editor'); ?></h2>
+	<h2><?php _e('Theme Editor'); ?></h2>
 	<form id="themeselector" name="theme" action="theme-editor.php" method="post">
 		<strong><?php _e('Select theme to edit:'); ?> </strong>
-		<select name="theme" id="theme" style="margin: 0; padding: 0;">
+		<select name="theme" id="theme">
 <?php
 	foreach ($themes as $a_theme) {
 	$theme_name = $a_theme['Name'];
@@ -107,20 +107,20 @@ $desc_header = ( $description != $file_show ) ? "$description</strong> (%s)" : "
 		<input type="submit" name="Submit" value="<?php _e('Select') ?>" class="button" />
 	</form>
 </div>
-<div class="tablenav" style="margin-right: 210px;">
-<div style="float: left;">
+<div class="tablenav">
+<div class="alignleft">
 <big><strong><?php echo sprintf($desc_header, $file_show); ?></big>
 </div>
-<br style="clear: both;" />
+<br class="clear" />
 </div>
-<br style="clear: both;" />
+<br class="clear" />
 	<div id="templateside">
-	<h3 id="bordertitle" style="margin-bottom: 10px;"><?php _e("Theme Files"); ?></h3>
+	<h3 id="bordertitle"><?php _e("Theme Files"); ?></h3>
 
 <?php
 if ($allowed_files) :
 ?>
-	<h4 style="margin-bottom: 0px;"><?php _e('Templates'); ?></h4>
+	<h4><?php _e('Templates'); ?></h4>
 	<ul>
 <?php foreach($themes[$theme]['Template Files'] as $template_file) :
 		$description = get_file_description($template_file);
@@ -131,7 +131,7 @@ if ($allowed_files) :
 		<li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
 <?php endforeach; ?>
 	</ul>
-	<h4 style="margin-bottom: 0px;"><?php echo _c('Styles|Theme stylesheets in theme editor'); ?></h4>
+	<h4><?php echo _c('Styles|Theme stylesheets in theme editor'); ?></h4>
 	<ul>
 <?php foreach($themes[$theme]['Stylesheet Files'] as $style_file) :
 		$description = get_file_description($style_file);
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index c137fb912f..90bd179966 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -136,7 +136,7 @@ if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
-<div style="float: left">
+<div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-media'); ?>
 <?php
@@ -176,10 +176,10 @@ foreach ($arc_result as $arc_row) {
 
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <?php include( 'edit-attachment-rows.php' ); ?>
 
@@ -193,7 +193,7 @@ foreach ($arc_result as $arc_row) {
 if ( $page_links )
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
 <?php
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index d46002cf48..a6fc4867bc 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -322,7 +322,7 @@ if ( $show_password_fields ) :
 ?>
 
 <?php if (count($profileuser->caps) > count($profileuser->roles)): ?>
-<br style="clear: both;" />
+<br class="clear" />
 	<table width="99%" style="border: none;" cellspacing="2" cellpadding="3" class="editform">
 		<tr>
 			<th scope="row"><?php _e('Additional Capabilities:') ?></th>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 0836b33135..98f0020f86 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -297,17 +297,17 @@ unset($role_links);
 	<div class="tablenav-pages"><?php $wp_user_search->page_links(); ?></div>
 <?php endif; ?>
 
-<div style="float: left">
+<div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <select name="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option>"<?php wp_dropdown_roles(); ?></select>
 <input type="submit" value="<?php _e('Change'); ?>" name="changeit" class="button-secondary" />
 <?php wp_nonce_field('bulk-users'); ?>
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 	<?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?>
 		<div class="error">
@@ -359,7 +359,7 @@ foreach ( $wp_user_search->get_results() as $userid ) {
 	<div class="tablenav-pages"><?php $wp_user_search->page_links(); ?></div>
 <?php endif; ?>
 
-<br style="clear:both;" />
+<br class="clear" />
 </div>
 
 </form>
@@ -377,7 +377,7 @@ foreach ( $wp_user_search->get_results() as $userid ) {
 	}
 ?>
 
-<br style="clear:both;" />
+<br class="clear" />
 
 <div class="wrap">
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index a90b3c2cf5..71abe80fb6 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -151,7 +151,7 @@ form#upload #post_content {
 	list-style: square;
 }
 
-.submit input, .button, .button-secondary {
+.submit input, .button, .button-secondary, .button-highlighted {
 	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
 	padding: 2px 3px;
 	border: none;
@@ -166,6 +166,10 @@ form#upload #post_content {
 	text-decoration: none;	
 }
 
+.button-highlighted {
+	font-weight: bold;
+}
+
 select {
 	font: 12px/14px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
 	padding: 0;