Index: wp-admin/options-privacy.php
===================================================================
--- wp-admin/options-privacy.php	(revision 19602)
+++ wp-admin/options-privacy.php	(working copy)
@@ -38,20 +38,20 @@
 <form method="post" action="options.php">
 <?php settings_fields('privacy'); ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e( 'Site Visibility' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Site Visibility' ); ?> </span></legend>
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><?php _e( 'Site Visibility' ); ?> </div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Site Visibility' ); ?> </span></legend>
 <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
 <label for="blog-public"><?php _e( 'Allow search engines to index this site.' );?></label><br/>
 <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
 <label for="blog-norobots"><?php _e( 'Ask search engines not to index this site.' ); ?></label>
 <p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
 <?php do_action('blog_privacy_selector'); ?>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php do_settings_fields('privacy', 'default'); ?>
-</table>
+</div>
 
 <?php do_settings_sections('privacy'); ?>
 
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php	(revision 19602)
+++ wp-admin/options-general.php	(working copy)
@@ -91,48 +91,48 @@
 <form method="post" action="options.php">
 <?php settings_fields('general'); ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="blogname"><?php _e('Site Title') ?></label></th>
-<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
-<td><input name="blogdescription" type="text" id="blogdescription" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></td>
-</tr>
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><label for="blogname"><?php _e('Site Title') ?></label></div>
+<div class="field-input"><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="blogdescription"><?php _e('Tagline') ?></label></div>
+<div class="field-input"><input name="blogdescription" type="text" id="blogdescription" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
+<span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></div>
+</div>
 <?php if ( !is_multisite() ) { ?>
-<tr valign="top">
-<th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="admin_email"><?php _e('E-mail Address') ?> </label></th>
-<td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text" />
-<span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Membership') ?></th>
-<td> <fieldset><legend class="screen-reader-text"><span><?php _e('Membership') ?></span></legend><label for="users_can_register">
+<div class="field-row">
+<div class="field-label"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></div>
+<div class="field-input"><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="home"><?php _e('Site Address (URL)') ?></label></div>
+<div class="field-input"><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
+<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="admin_email"><?php _e('E-mail Address') ?> </label></div>
+<div class="field-input"><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text" />
+<span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Membership') ?></div>
+<div class="field-input"> <fieldset><legend class="screen-reader-text"><span><?php _e('Membership') ?></span></legend><label for="users_can_register">
 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
 <?php _e('Anyone can register') ?></label>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
-<td>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="default_role"><?php _e('New User Default Role') ?></label></div>
+<div class="field-input">
 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
-</td>
-</tr>
+</div>
+</div>
 <?php } else { ?>
-<tr valign="top">
-<th scope="row"><label for="new_admin_email"><?php _e('E-mail Address') ?> </label></th>
-<td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text code" />
+<div class="field-row">
+<div class="field-label"><label for="new_admin_email"><?php _e('E-mail Address') ?> </label></div>
+<div class="field-input"><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text code" />
 <span class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span>
 <?php
 $new_admin_email = get_option( 'new_admin_email' );
@@ -141,10 +141,10 @@
 <p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
 </div>
 <?php endif; ?>
-</td>
-</tr>
+</div>
+</div>
 <?php } ?>
-<tr>
+<div class="field-row">
 <?php
 $current_offset = get_option('gmt_offset');
 $tzstring = get_option('timezone_string');
@@ -166,8 +166,8 @@
 }
 
 ?>
-<th scope="row"><label for="timezone_string"><?php _e('Timezone') ?></label></th>
-<td>
+<div class="field-label"><label for="timezone_string"><?php _e('Timezone') ?></label></div>
+<div class="field-input">
 
 <select id="timezone_string" name="timezone_string">
 <?php echo wp_timezone_choice($tzstring); ?>
@@ -223,12 +223,12 @@
 	?>
 	</span>
 <?php endif; ?>
-</td>
+</div>
 
-</tr>
-<tr>
-<th scope="row"><?php _e('Date Format') ?></th>
-<td>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Date Format') ?></div>
+<div class="field-input">
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
 <?php
 
@@ -257,11 +257,11 @@
 	echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
 ?>
 	</fieldset>
-</td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Time Format') ?></th>
-<td>
+</div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Time Format') ?></div>
+<div class="field-input">
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
 <?php
 
@@ -288,36 +288,36 @@
 	;
 ?>
 	</fieldset>
-</td>
-</tr>
-<tr>
-<th scope="row"><label for="start_of_week"><?php _e('Week Starts On') ?></label></th>
-<td><select name="start_of_week" id="start_of_week">
+</div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="start_of_week"><?php _e('Week Starts On') ?></label></div>
+<div class="field-input"><select name="start_of_week" id="start_of_week">
 <?php
 for ($day_index = 0; $day_index <= 6; $day_index++) :
 	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
 	echo "\n\t<option value='" . esc_attr($day_index) . "' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
 endfor;
 ?>
-</select></td>
-</tr>
+</select></div>
+</div>
 <?php do_settings_fields('general', 'default'); ?>
 <?php
 	$languages = get_available_languages();
 	if ( is_multisite() && !empty( $languages ) ):
 ?>
-	<tr valign="top">
-		<th width="33%" scope="row"><?php _e('Site Language') ?></th>
-		<td>
+	<div class="field-row">
+		<div class="field-label"><?php _e('Site Language') ?></div>
+		<div class="field-input">
 			<select name="WPLANG" id="WPLANG">
 				<?php mu_dropdown_languages( $languages, get_option('WPLANG') ); ?>
 			</select>
-		</td>
-	</tr>
+		</div>
+	</div>
 <?php
 	endif;
 ?>
-</table>
+</div>
 
 <?php do_settings_sections('general'); ?>
 
Index: wp-admin/options-media.php
===================================================================
--- wp-admin/options-media.php	(revision 19602)
+++ wp-admin/options-media.php	(working copy)
@@ -55,95 +55,95 @@
 <h3><?php _e('Image sizes') ?></h3>
 <p><?php _e('The sizes listed below determine the maximum dimensions in pixels to use when inserting an image into the body of a post.'); ?></p>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Thumbnail size') ?></th>
-<td>
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><?php _e('Thumbnail size') ?></div>
+<div class="field-input">
 <label for="thumbnail_size_w"><?php _e('Width'); ?></label>
 <input name="thumbnail_size_w" type="text" id="thumbnail_size_w" value="<?php form_option('thumbnail_size_w'); ?>" class="small-text" />
 <label for="thumbnail_size_h"><?php _e('Height'); ?></label>
 <input name="thumbnail_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" class="small-text" /><br />
 <input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked('1', get_option('thumbnail_crop')); ?>/>
 <label for="thumbnail_crop"><?php _e('Crop thumbnail to exact dimensions (normally thumbnails are proportional)'); ?></label>
-</td>
-</tr>
+</div>
+</div>
 
-<tr valign="top">
-<th scope="row"><?php _e('Medium size') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Medium size'); ?></span></legend>
+<div class="field-row">
+<div class="field-label"><?php _e('Medium size') ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Medium size'); ?></span></legend>
 <label for="medium_size_w"><?php _e('Max Width'); ?></label>
 <input name="medium_size_w" type="text" id="medium_size_w" value="<?php form_option('medium_size_w'); ?>" class="small-text" />
 <label for="medium_size_h"><?php _e('Max Height'); ?></label>
 <input name="medium_size_h" type="text" id="medium_size_h" value="<?php form_option('medium_size_h'); ?>" class="small-text" />
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><?php _e('Large size') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Large size'); ?></span></legend>
+<div class="field-row">
+<div class="field-label"><?php _e('Large size') ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Large size'); ?></span></legend>
 <label for="large_size_w"><?php _e('Max Width'); ?></label>
 <input name="large_size_w" type="text" id="large_size_w" value="<?php form_option('large_size_w'); ?>" class="small-text" />
 <label for="large_size_h"><?php _e('Max Height'); ?></label>
 <input name="large_size_h" type="text" id="large_size_h" value="<?php form_option('large_size_h'); ?>" class="small-text" />
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
 <?php do_settings_fields('media', 'default'); ?>
-</table>
+</div>
 
 <h3><?php _e('Embeds') ?></h3>
 
-<table class="form-table">
+<div class="form-fields">
 
-<tr valign="top">
-<th scope="row"><?php _e('Auto-embeds'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('When possible, embed the media content from a URL directly onto the page. For example: links to Flickr and YouTube.'); ?></span></legend>
+<div class="field-row">
+<div class="field-label"><?php _e('Auto-embeds'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('When possible, embed the media content from a URL directly onto the page. For example: links to Flickr and YouTube.'); ?></span></legend>
 <label for="embed_autourls"><input name="embed_autourls" type="checkbox" id="embed_autourls" value="1" <?php checked( '1', get_option('embed_autourls') ); ?>/> <?php _e('When possible, embed the media content from a URL directly onto the page. For example: links to Flickr and YouTube.'); ?></label>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><?php _e('Maximum embed size') ?></th>
-<td>
+<div class="field-row">
+<div class="field-label"><?php _e('Maximum embed size') ?></div>
+<div class="field-input">
 <label for="embed_size_w"><?php _e('Width'); ?></label>
 <input name="embed_size_w" type="text" id="embed_size_w" value="<?php form_option('embed_size_w'); ?>" class="small-text" />
 <label for="embed_size_h"><?php _e('Height'); ?></label>
 <input name="embed_size_h" type="text" id="embed_size_h" value="<?php form_option('embed_size_h'); ?>" class="small-text" />
 <?php if ( !empty($content_width) ) echo '<br />' . __("If the width value is left blank, embeds will default to the max width of your theme."); ?>
-</td>
-</tr>
+</div>
+</div>
 
 <?php do_settings_fields('media', 'embeds'); ?>
-</table>
+</div>
 
 <?php if ( !is_multisite() ) : ?>
 <h3><?php _e('Uploading Files'); ?></h3>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
-<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></div>
+<div class="field-input"><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
 <span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
-</td>
-</tr>
+</div>
+</div>
 
-<tr valign="top">
-<th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
-<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
+<div class="field-row">
+<div class="field-label"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></div>
+<div class="field-input"><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
 <span class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
-</td>
-</tr>
+</div>
+</div>
 
-<tr>
-<th scope="row" colspan="2" class="th-full">
+<div class="field-row">
+<div class="field-label label-full">
 <label for="uploads_use_yearmonth_folders">
 <input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
 <?php _e('Organize my uploads into month- and year-based folders'); ?>
 </label>
-</th>
-</tr>
+</div>
+</div>
 
 <?php do_settings_fields('media', 'uploads'); ?>
-</table>
+</div>
 <?php endif; ?>
 
 <?php do_settings_sections('media'); ?>
Index: wp-admin/options-discussion.php
===================================================================
--- wp-admin/options-discussion.php	(revision 19602)
+++ wp-admin/options-discussion.php	(working copy)
@@ -38,10 +38,10 @@
 <form method="post" action="options.php">
 <?php settings_fields('discussion'); ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Default article settings'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Default article settings'); ?></span></legend>
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><?php _e('Default article settings'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Default article settings'); ?></span></legend>
 <label for="default_pingback_flag">
 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
 <?php _e('Attempt to notify any blogs linked to from the article'); ?></label>
@@ -55,11 +55,11 @@
 <?php _e('Allow people to post comments on new articles'); ?></label>
 <br />
 <small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Other comment settings'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Other comment settings'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
 <label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail'); ?></label>
 <br />
 <label for="comment_registration">
@@ -115,11 +115,11 @@
 printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
 
 ?></label>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('E-mail me whenever'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever'); ?></span></legend>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('E-mail me whenever'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever'); ?></span></legend>
 <label for="comments_notify">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
 <?php _e('Anyone posts a comment'); ?> </label>
@@ -127,40 +127,40 @@
 <label for="moderation_notify">
 <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> />
 <?php _e('A comment is held for moderation'); ?> </label>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Before a comment appears'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears'); ?></span></legend>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Before a comment appears'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears'); ?></span></legend>
 <label for="comment_moderation">
 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
 <?php _e('An administrator must always approve the comment'); ?> </label>
 <br />
 <label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment'); ?></label>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Comment Moderation'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Comment Moderation'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
 <p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
 
 <p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
 <textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
 </p>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Comment Blacklist'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Comment Blacklist'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
 <p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
 <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
 </p>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php do_settings_fields('discussion', 'default'); ?>
-</table>
+</div>
 
 <h3><?php _e('Avatars'); ?></h3>
 
@@ -168,10 +168,10 @@
 
 <?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Avatar Display'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><?php _e('Avatar Display'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
 <?php
 	$yesorno = array( 0 => __( 'Don&#8217;t show Avatars' ), 1 => __( 'Show Avatars' ) );
 	foreach ( $yesorno as $key => $value) {
@@ -179,11 +179,11 @@
 		echo "\n\t<label><input type='radio' name='show_avatars' value='" . esc_attr($key) . "' $selected/> $value</label><br />";
 	}
 ?>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Maximum Rating'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Maximum Rating'); ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
 
 <?php
 $ratings = array(
@@ -202,11 +202,11 @@
 endforeach;
 ?>
 
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Default Avatar'); ?></th>
-<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Default Avatar'); ?></div>
+<div class="field-input defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
 
 <?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address.'); ?><br />
 
@@ -239,10 +239,10 @@
 echo apply_filters('default_avatar_select', $avatar_list);
 ?>
 
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php do_settings_fields('discussion', 'avatars'); ?>
-</table>
+</div>
 
 <?php do_settings_sections('discussion'); ?>
 
Index: wp-admin/options-reading.php
===================================================================
--- wp-admin/options-reading.php	(revision 19602)
+++ wp-admin/options-reading.php	(working copy)
@@ -68,7 +68,7 @@
 
 <?php if ( ! get_pages() ) : ?>
 <input name="show_on_front" type="hidden" value="posts" />
-<table class="form-table">
+<div class="form-fields">
 <?php
 	if ( 'posts' != get_option( 'show_on_front' ) ) :
 		update_option( 'show_on_front', 'posts' );
@@ -78,10 +78,10 @@
 	if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) )
 		update_option( 'show_on_front', 'posts' );
 ?>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e( 'Front page displays' ); ?></th>
-<td id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Front page displays' ); ?></span></legend>
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><?php _e( 'Front page displays' ); ?></div>
+<div class="field-input" id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Front page displays' ); ?></span></legend>
 	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked( 'posts', get_option( 'show_on_front' ) ); ?> />
 		<?php _e( 'Your latest posts' ); ?>
@@ -99,34 +99,34 @@
 <?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>
 <div id="front-page-warning" class="error inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same!' ); ?></p></div>
 <?php endif; ?>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php endif; ?>
-<tr valign="top">
-<th scope="row"><label for="posts_per_page"><?php _e( 'Blog pages show at most' ); ?></label></th>
-<td>
+<div class="field-row">
+<div class="field-label"><label for="posts_per_page"><?php _e( 'Blog pages show at most' ); ?></label></div>
+<div class="field-input">
 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option( 'posts_per_page' ); ?>" class="small-text" /> <?php _e( 'posts' ); ?>
-</td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="posts_per_rss"><?php _e( 'Syndication feeds show the most recent' ); ?></label></th>
-<td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option( 'posts_per_rss' ); ?>" class="small-text" /> <?php _e( 'items' ); ?></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e( 'For each article in a feed, show' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
+</div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="posts_per_rss"><?php _e( 'Syndication feeds show the most recent' ); ?></label></div>
+<div class="field-input"><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option( 'posts_per_rss' ); ?>" class="small-text" /> <?php _e( 'items' ); ?></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e( 'For each article in a feed, show' ); ?> </div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
 <p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?>	/> <?php _e( 'Full text' ); ?></label><br />
 <label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Summary' ); ?></label></p>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><label for="blog_charset"><?php _e( 'Encoding for pages and feeds' ); ?></label></th>
-<td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option( 'blog_charset' ); ?>" class="regular-text" />
-<span class="description"><?php _e( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended, if you are adventurous there are some <a href="http://en.wikipedia.org/wiki/Character_set">other encodings</a>)' ); ?></span></td>
-</tr>
+<div class="field-row">
+<div class="field-label"><label for="blog_charset"><?php _e( 'Encoding for pages and feeds' ); ?></label></div>
+<div class="field-input"><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option( 'blog_charset' ); ?>" class="regular-text" />
+<span class="description"><?php _e( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended, if you are adventurous there are some <a href="http://en.wikipedia.org/wiki/Character_set">other encodings</a>)' ); ?></span></div>
+</div>
 <?php do_settings_fields( 'reading', 'default' ); ?>
-</table>
+</div>
 
 <?php do_settings_sections( 'reading' ); ?>
 
Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php	(revision 19602)
+++ wp-admin/options-permalink.php	(working copy)
@@ -191,39 +191,39 @@
 );
 ?>
 <h3><?php _e('Common Settings'); ?></h3>
-<table class="form-table">
-	<tr>
-		<th><label><input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></th>
-		<td><code><?php echo get_option('home'); ?>/?p=123</code></td>
-	</tr>
-	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
-	</tr>
-	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
-	</tr>
-	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/123'; ?></code></td>
-	</tr>
-	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[4]); ?>" class="tog" <?php checked($structures[4], $permalink_structure); ?> /> <?php _e('Post name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
-	</tr>
-	<tr>
-		<th>
+<div class="form-fields">
+	<div class="field-row">
+		<div class="field-label"><label><input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></div>
+		<div class="field-input"><code><?php echo get_option('home'); ?>/?p=123</code></div>
+	</div>
+	<div class="field-row">
+		<div class="field-label"><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></div>
+		<div class="field-input"><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></div>
+	</div>
+	<div class="field-row">
+		<div class="field-label"><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></div>
+		<div class="field-input"><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></div>
+	</div>
+	<div class="field-row">
+		<div class="field-label"><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></div>
+		<div class="field-input"><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/123'; ?></code></div>
+	</div>
+	<div class="field-row">
+		<div class="field-label"><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[4]); ?>" class="tog" <?php checked($structures[4], $permalink_structure); ?> /> <?php _e('Post name'); ?></label></div>
+		<div class="field-input"><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></div>
+	</div>
+	<div class="field-row">
+		<div class="field-label">
 			<label><input name="selection" id="custom_selection" type="radio" value="custom" class="tog" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
 			<?php _e('Custom Structure'); ?>
 			</label>
-		</th>
-		<td>
+		</div>
+		<div class="field-input">
 			<?php echo $blog_prefix; ?>
 			<input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
-		</td>
-	</tr>
-</table>
+		</div>
+	</div>
+</div>
 
 <h3><?php _e('Optional'); ?></h3>
 <?php if ( $is_apache || $iis7_permalinks ) : ?>
@@ -232,17 +232,17 @@
 	<p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
 <?php endif; ?>
 
-<table class="form-table">
-	<tr>
-		<th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
-		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
-	</tr>
-	<tr>
-		<th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
-		<td><?php echo $blog_prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
-	</tr>
+<div class="form-fields">
+	<div class="field-row">
+		<div class="field-label"><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></div>
+		<div class="field-input"><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></div>
+	</div>
+	<div class="field-row">
+		<div class="field-label"><label for="tag_base"><?php _e('Tag base'); ?></label></div>
+		<div class="field-input"><?php echo $blog_prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></div>
+	</div>
 	<?php do_settings_fields('permalink', 'optional'); ?>
-</table>
+</div>
 
 <?php do_settings_sections('permalink'); ?>
 
Index: wp-admin/options-writing.php
===================================================================
--- wp-admin/options-writing.php	(revision 19602)
+++ wp-admin/options-writing.php	(working copy)
@@ -69,56 +69,56 @@
 <form method="post" action="options.php">
 <?php settings_fields('writing'); ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="default_post_edit_rows"> <?php _e('Size of the post box') ?></label></th>
-<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" class="small-text" />
-<?php _e('lines') ?></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Formatting') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><label for="default_post_edit_rows"> <?php _e('Size of the post box') ?></label></div>
+<div class="field-input"><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" class="small-text" />
+<?php _e('lines') ?></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('Formatting') ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_option('use_smilies')); ?> />
 <?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label><br />
 <label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_option('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="default_category"><?php _e('Default Post Category') ?></label></th>
-<td>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="default_category"><?php _e('Default Post Category') ?></label></div>
+<div class="field-input">
 <?php
 wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_category', 'orderby' => 'name', 'selected' => get_option('default_category'), 'hierarchical' => true));
 ?>
-</td>
-</tr>
+</div>
+</div>
 <?php
 if ( current_theme_supports( 'post-formats' ) ) :
 	$post_formats = get_theme_support( 'post-formats' );
 	if ( is_array( $post_formats[0] ) ) :
 ?>
-<tr valign="top">
-<th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
-<td>
+<div class="field-row">
+<div class="field-label"><label for="default_post_format"><?php _e('Default Post Format') ?></label></div>
+<div class="field-input">
 	<select name="default_post_format" id="default_post_format">
 		<option value="0"><?php _e('Standard'); ?></option>
 <?php foreach ( $post_formats[0] as $format ): ?>
 		<option<?php selected( get_option('default_post_format'), $format ); ?> value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
 <?php endforeach; ?>
 	</select>
-</td>
-</tr>
+</div>
+</div>
 <?php endif; endif; ?>
-<tr valign="top">
-<th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
-<td>
+<div class="field-row">
+<div class="field-label"><label for="default_link_category"><?php _e('Default Link Category') ?></label></div>
+<div class="field-input">
 <?php
 wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category', 'orderby' => 'name', 'selected' => get_option('default_link_category'), 'hierarchical' => true, 'taxonomy' => 'link_category'));
 ?>
-</td>
-</tr>
+</div>
+</div>
 <?php do_settings_fields('writing', 'default'); ?>
-</table>
+</div>
 
 
 <h3 class="title"><?php _e('Press This') ?></h3>
@@ -135,57 +135,57 @@
 <h3><?php _e('Post via e-mail') ?></h3>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="mailserver_url"><?php _e('Mail Server') ?></label></th>
-<td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" class="regular-text code" />
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><label for="mailserver_url"><?php _e('Mail Server') ?></label></div>
+<div class="field-input"><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" class="regular-text code" />
 <label for="mailserver_port"><?php _e('Port') ?></label>
 <input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option('mailserver_port'); ?>" class="small-text" />
-</td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="mailserver_login"><?php _e('Login Name') ?></label></th>
-<td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option('mailserver_login'); ?>" class="regular-text" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="mailserver_pass"><?php _e('Password') ?></label></th>
-<td>
+</div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="mailserver_login"><?php _e('Login Name') ?></label></div>
+<div class="field-input"><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option('mailserver_login'); ?>" class="regular-text" /></div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="mailserver_pass"><?php _e('Password') ?></label></div>
+<div class="field-input">
 <input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option('mailserver_pass'); ?>" class="regular-text" />
-</td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="default_email_category"><?php _e('Default Mail Category') ?></label></th>
-<td>
+</div>
+</div>
+<div class="field-row">
+<div class="field-label"><label for="default_email_category"><?php _e('Default Mail Category') ?></label></div>
+<div class="field-input">
 <?php
 wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_email_category', 'orderby' => 'name', 'selected' => get_option('default_email_category'), 'hierarchical' => true));
 ?>
-</td>
-</tr>
+</div>
+</div>
 <?php do_settings_fields('writing', 'post_via_email'); ?>
-</table>
+</div>
 <?php } ?>
 
 <h3><?php _e('Remote Publishing') ?></h3>
 <p><?php printf(__('To post to WordPress from a desktop blogging client or remote website that uses the Atom Publishing Protocol or one of the XML-RPC publishing interfaces you must enable them below.')) ?></p>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Atom Publishing Protocol') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Atom Publishing Protocol') ?></span></legend>
+<div class="form-fields">
+<div class="field-row">
+<div class="field-label"><?php _e('Atom Publishing Protocol') ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Atom Publishing Protocol') ?></span></legend>
 <label for="enable_app">
 <input name="enable_app" type="checkbox" id="enable_app" value="1" <?php checked('1', get_option('enable_app')); ?> />
 <?php _e('Enable the Atom Publishing Protocol.') ?></label><br />
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('XML-RPC') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('XML-RPC') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="field-row">
+<div class="field-label"><?php _e('XML-RPC') ?></div>
+<div class="field-input"><fieldset><legend class="screen-reader-text"><span><?php _e('XML-RPC') ?></span></legend>
 <label for="enable_xmlrpc">
 <input name="enable_xmlrpc" type="checkbox" id="enable_xmlrpc" value="1" <?php checked('1', get_option('enable_xmlrpc')); ?> />
 <?php _e('Enable the WordPress, Movable Type, MetaWeblog and Blogger XML-RPC publishing protocols.') ?></label><br />
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php do_settings_fields('writing', 'remote_publishing'); ?>
-</table>
+</div>
 
 <?php if ( apply_filters( 'enable_update_services_configuration', true ) ) { ?>
 <h3><?php _e('Update Services') ?></h3>
Index: wp-admin/options.php
===================================================================
--- wp-admin/options.php	(revision 19602)
+++ wp-admin/options.php	(working copy)
@@ -175,7 +175,7 @@
   <?php wp_nonce_field('options-options') ?>
   <input type="hidden" name="action" value="update" />
   <input type='hidden' name='option_page' value='options' />
-  <table class="form-table">
+  <div class="form-fields">
 <?php
 $options = $wpdb->get_results( "SELECT * FROM $wpdb->options ORDER BY option_name" );

@@ -201,18 +201,18 @@
 	}
 	$name = esc_attr( $option->option_name );
 	echo "
-<tr>
-	<th scope='row'><label for='$name'>" . esc_html( $option->option_name ) . "</label></th>
-<td>";
+<div class='field-row>
+	<div class='field-label'><label for='$name'>" . esc_html( $option->option_name ) . "</label></div>
+<div class='field-input'>";
 	if ( strpos( $value, "\n" ) !== false )
 		echo "<textarea class='$class' name='$name' id='$name' cols='30' rows='5'>" . esc_textarea( $value ) . "</textarea>";
 	else
 		echo "<input class='regular-text $class' type='text' name='$name' id='$name' value='" . esc_attr( $value ) . "'" . disabled( $disabled, true, false ) . " />";
-	echo "</td>
-</tr>";
+	echo "</div>
+</div>";
 endforeach;
 ?>
-  </table>
+  </div>

 <input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />