Index: wp-admin/categories.php
===================================================================
--- wp-admin/categories.php	(revision 7840)
+++ wp-admin/categories.php	(working copy)
@@ -126,6 +126,7 @@
 <?php endif; ?>
 
 <p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
Index: wp-admin/edit-comments.php
===================================================================
--- wp-admin/edit-comments.php	(revision 7840)
+++ wp-admin/edit-comments.php	(working copy)
@@ -116,6 +116,7 @@
 </ul>
 
 <p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" />
 	<input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
 </p>
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 7840)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -84,9 +84,9 @@
 
 <div class="inside">
 
-<p><strong><?php _e('Publish Status') ?></strong></p>
+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
 <p>
-<select name='post_status' tabindex='4'>
+<select name='post_status' id='post_status' tabindex='4'>
 <?php if ( current_user_can('publish_posts') ) : // Contributors only get "Unpublished" and "Pending Review" ?>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
 <?php if ( 'future' == $post->post_status ) : ?>
@@ -180,7 +180,7 @@
 
 <div id="post-body">
 <div id="titlediv">
-<h3><?php _e('Title') ?></h3>
+<h3><label for="title"><?php _e('Title') ?></label></h3>
 <div id="titlewrap">
 	<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" />
 </div>
@@ -195,7 +195,7 @@
 </div>
 
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-<h3><?php _e('Post') ?></h3>
+<h3><label for="content"><?php _e('Post') ?></label></h3>
 <?php the_editor($post->post_content); ?>
 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
@@ -207,7 +207,7 @@
 <?php echo $form_prevstatus ?>
 
 <div id="tagsdiv" class="postbox <?php echo postbox_classes('tagsdiv', 'post'); ?>">
-<h3><?php _e('Tags'); ?></h3>
+<h3><label for="tags-input"><?php _e('Tags'); ?></label></h3>
 <div class="inside">
 <p id="jaxtag"><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></p>
 <div id="tagchecklist"></div>
@@ -256,7 +256,7 @@
 <h2><?php _e('Advanced Options'); ?></h2>
 
 <div id="postexcerpt" class="postbox <?php echo postbox_classes('postexcerpt', 'post'); ?>">
-<h3><?php _e('Excerpt') ?></h3>
+<h3><label for="excerpt"><?php _e('Excerpt') ?></label></h3>
 <div class="inside"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea>
 <p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p>
 </div>
@@ -309,7 +309,7 @@
 </div>
 
 <div id="passworddiv" class="postbox <?php echo postbox_classes('passworddiv', 'post'); ?>">
-<h3><?php _e('Password Protect This Post') ?></h3>
+<h3><label for="post_password"><?php _e('Password Protect This Post') ?></label></h3>
 <div class="inside">
 <p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
@@ -317,7 +317,7 @@
 </div>
 
 <div id="slugdiv" class="postbox <?php echo postbox_classes('slugdiv', 'post'); ?>">
-<h3><?php _e('Post Slug') ?></h3>
+<h3><label for="post_name"><?php _e('Post Slug') ?></label></h3>
 <div class="inside">
 <input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
 </div>
Index: wp-admin/edit-form-comment.php
===================================================================
--- wp-admin/edit-form-comment.php	(revision 7840)
+++ wp-admin/edit-form-comment.php	(working copy)
@@ -22,9 +22,9 @@
 
 <div class="inside">
 
-<p><strong><?php _e('Approval Status') ?></strong></p>
+<p><strong><label for='comment_status'><?php _e('Approval Status') ?></label></strong></p>
 <p>
-<select name='comment_status'>
+<select name='comment_status' id='comment_status'>
 <option<?php selected( $comment->comment_approved, '1' ); ?> value='1'><?php _e('Approved') ?></option>
 <option<?php selected( $comment->comment_approved, '0' ); ?> value='0'><?php _e('Moderated') ?></option>
 <option<?php selected( $comment->comment_approved, 'spam' ); ?> value='spam'><?php _e('Spam') ?></option>
@@ -64,28 +64,28 @@
 
 <div id="post-body">
 <div id="namediv" class="stuffbox">
-<h3><?php _e('Name') ?></h3>
+<h3><label for="name"><?php _e('Name') ?></label></h3>
 <div class="inside">
 <input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
 </div>
 </div>
 
 <div id="emaildiv" class="stuffbox">
-<h3><?php _e('E-mail') ?></h3>
+<h3><label for="email"><?php _e('E-mail') ?></label></h3>
 <div class="inside">
 <input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
 </div>
 </div>
 
 <div id="uridiv" class="stuffbox">
-<h3><?php _e('URL') ?></h3>
+<h3><label for="newcomment_author_url"><?php _e('URL') ?></label></h3>
 <div class="inside">
 <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" />
 </div>
 </div>
 
 <div id="postdiv" class="postarea">
-<h3><?php _e('Comment') ?></h3>
+<h3><label for="content"><?php _e('Comment') ?></label></h3>
 <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
Index: wp-admin/edit-link-categories.php
===================================================================
--- wp-admin/edit-link-categories.php	(revision 7840)
+++ wp-admin/edit-link-categories.php	(working copy)
@@ -62,6 +62,7 @@
 <?php endif; ?>
 
 <p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
Index: wp-admin/edit-link-form.php
===================================================================
--- wp-admin/edit-link-form.php	(revision 7840)
+++ wp-admin/edit-link-form.php	(working copy)
@@ -74,7 +74,7 @@
 
 <div id="post-body">
 <div id="namediv" class="stuffbox">
-<h3><?php _e('Name') ?></h3>
+<h3><label for="link_name"><?php _e('Name') ?></label></h3>
 <div class="inside">
 	<input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br />
     <?php _e('Example: Nifty blogging software'); ?>
@@ -82,7 +82,7 @@
 </div>
 
 <div id="addressdiv" class="stuffbox">
-<h3><?php _e('Web Address') ?></h3>
+<h3><label for="link_url"><?php _e('Web Address') ?></label></h3>
 <div class="inside">
 	<input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br />
     <?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?>
@@ -90,7 +90,7 @@
 </div>
 
 <div id="descriptiondiv" class="stuffbox">
-<h3><?php _e('Description') ?></h3>
+<h3><label for="link_description"><?php _e('Description') ?></label></h3>
 <div class="inside">
 	<input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br />
     <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
@@ -156,22 +156,22 @@
 <div class="inside">
 <table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
 	<tr>
-		<th style="width: 20%;" scope="row"><?php _e('rel:') ?></th>
+		<th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th>
 		<td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="2">
 			<table cellpadding="3" cellspacing="5" class="form-table">
 				<tr>
-					<th scope="row"> <?php _e('identity') ?> </th>
+					<fieldset><th scope="row"><legend> <?php _e('identity') ?> </legend></th>
 					<td>
 						<label for="me">
 						<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
 						<?php _e('another web address of mine') ?></label>
-					</td>
+					</td></fieldset>
 				</tr>
 				<tr>
-					<th scope="row"> <?php _e('friendship') ?> </th>
+					<fieldset><th scope="row"><legend> <?php _e('friendship') ?> </legend></th>
 					<td>
 						<label for="contact">
 						<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
@@ -181,18 +181,18 @@
 						<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
 						<label for="friendship">
 						<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
-					</td>
+					</td></fieldset>
 				</tr>
 				<tr>
-					<th scope="row"> <?php _e('physical') ?> </th>
+					<fieldset><th scope="row"><legend> <?php _e('physical') ?> </legend></th>
 					<td>
 						<label for="met">
 						<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
 						<?php _e('met') ?></label>
-					</td>
+					</td></fieldset>
 				</tr>
 				<tr>
-					<th scope="row"> <?php _e('professional') ?> </th>
+					<fieldset><th scope="row"><legend> <?php _e('professional') ?> </legend></th>
 					<td>
 						<label for="co-worker">
 						<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
@@ -200,10 +200,10 @@
 						<label for="colleague">
 						<input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
 						<?php _e('colleague') ?></label>
-					</td>
+					</td></fieldset>
 				</tr>
 				<tr>
-					<th scope="row"> <?php _e('geographical') ?> </th>
+					<fieldset><th scope="row"><legend> <?php _e('geographical') ?> </legend></th>
 					<td>
 						<label for="co-resident">
 						<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
@@ -214,10 +214,10 @@
 						<label for="geographical">
 						<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
 						<?php _e('none') ?></label>
-					</td>
+					</td></fieldset>
 				</tr>
 				<tr>
-					<th scope="row"> <?php _e('family') ?> </th>
+					<fieldset><th scope="row"><legend> <?php _e('family') ?> </legend></th>
 					<td>
 						<label for="child">
 						<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
@@ -237,10 +237,10 @@
 						<label for="family">
 						<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
 						<?php _e('none') ?></label>
-					</td>
+					</td></fieldset>
 				</tr>
 				<tr>
-					<th scope="row"> <?php _e('romantic') ?> </th>
+					<fieldset><th scope="row"><legend> <?php _e('romantic') ?> </legend></th>
 					<td>
 						<label for="muse">
 						<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
@@ -254,7 +254,7 @@
 						<label for="romantic">
 						<input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
 						<?php _e('sweetheart') ?></label>
-					</td>
+					</td></fieldset>
 				</tr>
 			</table>
 		</td>
Index: wp-admin/edit-page-form.php
===================================================================
--- wp-admin/edit-page-form.php	(revision 7840)
+++ wp-admin/edit-page-form.php	(working copy)
@@ -69,9 +69,9 @@
 
 <div class="inside">
 
-<p><strong><?php _e('Publish Status') ?></strong></p>
+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
 <p>
-<select name='post_status' tabindex='4'>
+<select name='post_status' tabindex='4' id='post_status'>
 <?php if ( current_user_can('publish_pages') ) : ?>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
 <?php else: ?>
@@ -159,7 +159,7 @@
 
 <div id="post-body">
 <div id="titlediv">
-<h3><?php _e('Title') ?></h3>
+<h3><label for="title"><?php _e('Title') ?></label></h3>
 <div id="titlewrap">
   <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
 </div>
@@ -174,7 +174,7 @@
 </div>
 
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-<h3><?php _e('Page') ?></h3>
+<h3><label for="content"><?php _e('Page') ?></label></h3>
 <?php the_editor($post->post_content); ?>
 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
@@ -221,7 +221,7 @@
 </div>
 
 <div id="pagepassworddiv" class="postbox <?php echo postbox_classes('pagepassworddiv', 'page'); ?>">
-<h3><?php _e('Password Protect This Page') ?></h3>
+<h3><label for="post_password"><?php _e('Password Protect This Page') ?></label></h3>
 <div class="inside">
 <p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
@@ -229,16 +229,16 @@
 </div>
 
 <div id="pageslugdiv" class="postbox <?php echo postbox_classes('pageslugdiv', 'page'); ?>">
-<h3><?php _e('Page Slug') ?></h3>
+<h3><label for="post_name"><?php _e('Page Slug') ?></label></h3>
 <div class="inside">
 <input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
 </div>
 </div>
 
 <div id="pageparentdiv" class="postbox <?php echo postbox_classes('pageparentdiv', 'page'); ?>">
-<h3><?php _e('Page Parent') ?></h3>
+<h3><label for="parent_id"><?php _e('Page Parent') ?></label></h3>
 <div class="inside">
-<select name="parent_id">
+<select name="parent_id" id="parent_id">
 <option value='0'><?php _e('Main Page (no parent)'); ?></option>
 <?php parent_dropdown($post->post_parent); ?>
 </select>
@@ -248,9 +248,9 @@
 
 <?php if ( 0 != count( get_page_templates() ) ) { ?>
 <div id="pagetemplatediv" class="postbox <?php echo postbox_classes('pagetemplatediv', 'page'); ?>">
-<h3><?php _e('Page Template') ?></h3>
+<h3><label for="page_template"><?php _e('Page Template') ?></label></h3>
 <div class="inside">
-<select name="page_template">
+<select name="page_template" id="page_template">
 <option value='default'><?php _e('Default Template'); ?></option>
 <?php page_template_dropdown($post->page_template); ?>
 </select>
@@ -260,7 +260,7 @@
 <?php } ?>
 
 <div id="pageorderdiv" class="postbox <?php echo postbox_classes('pageorderdiv', 'page'); ?>">
-<h3><?php _e('Page Order') ?></h3>
+<h3><label for="menu_order"><?php _e('Page Order') ?></label></h3>
 <div class="inside">
 <p><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p>
 <p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p>
Index: wp-admin/edit-pages.php
===================================================================
--- wp-admin/edit-pages.php	(revision 7840)
+++ wp-admin/edit-pages.php	(working copy)
@@ -111,6 +111,7 @@
 ?>
 
 <p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
 </p>
Index: wp-admin/edit-tags.php
===================================================================
--- wp-admin/edit-tags.php	(revision 7840)
+++ wp-admin/edit-tags.php	(working copy)
@@ -133,6 +133,7 @@
 <?php endif; ?>
 
 <p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
 </p>
Index: wp-admin/edit.php
===================================================================
--- wp-admin/edit.php	(revision 7840)
+++ wp-admin/edit.php	(working copy)
@@ -116,6 +116,7 @@
 ?>
 
 <p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
 </p>
Index: wp-admin/export.php
===================================================================
--- wp-admin/export.php	(revision 7840)
+++ wp-admin/export.php	(working copy)
@@ -22,9 +22,9 @@
 
 <table class="form-table">
 <tr>
-<th><?php _e('Restrict Author'); ?></th>
+<th><label for="author"><?php _e('Restrict Author'); ?></label></th>
 <td>
-<select name="author">
+<select name="author" id="author">
 <option value="all" selected="selected"><?php _e('All Authors'); ?></option>
 <?php
 $authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );
Index: wp-admin/import/greymatter.php
===================================================================
--- wp-admin/import/greymatter.php	(revision 7840)
+++ wp-admin/import/greymatter.php	(working copy)
@@ -38,16 +38,16 @@
 <h3><?php _e('Second step: GreyMatter details:') ?></h3>
 <table class="form-table">
 <tr>
-<td><?php _e('Path to GM files:') ?></td>
-<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
+<td><label for="gmpath"><?php _e('Path to GM files:') ?></label></td>
+<td><input type="text" style="width:300px" name="gmpath" id="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
 </tr>
 <tr>
-<td><?php _e('Path to GM entries:') ?></td>
-<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
+<td><label for="archivespath"><?php _e('Path to GM entries:') ?></label></td>
+<td><input type="text" style="width:300px" name="archivespath" id="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
 </tr>
 <tr>
-<td><?php _e("Last entry's number:") ?></td>
-<td><input type="text" name="lastentry" value="00000001" /><br />
+<td><label for="lastentry"><?php _e("Last entry's number:") ?></label></td>
+<td><input type="text" name="lastentry" id="lastentry" value="00000001" /><br />
 	<?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
 </tr>
 </table>
Index: wp-admin/import/mt.php
===================================================================
--- wp-admin/import/mt.php	(revision 7840)
+++ wp-admin/import/mt.php	(working copy)
@@ -166,9 +166,9 @@
 		$j = -1;
 		foreach ($authors as $author) {
 			++ $j;
-			echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
+			echo '<li><label>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
 			$this->users_form($j);
-			echo '</li>';
+			echo '</label></li>';
 		}
 
 		echo '<input type="submit" value="'.__('Submit').'">'.'<br />';
Index: wp-admin/import/wordpress.php
===================================================================
--- wp-admin/import/wordpress.php	(revision 7840)
+++ wp-admin/import/wordpress.php	(working copy)
@@ -218,7 +218,7 @@
 	function users_form($n, $author) {
 
 		if ( $this->allow_create_users() ) {
-			printf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30"> <br />');
+			printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30"></label> <br />');
 		}
 		else {
 			echo __('Map to existing').'<br />';
Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php	(revision 7840)
+++ wp-admin/includes/media.php	(working copy)
@@ -956,6 +956,7 @@
 <input type="hidden" name="post_mime_type" value="<?php echo attribute_escape( $_GET['post_mime_type'] ); ?>" />
 
 <div id="search-filter">
+	<label class="hidden" for="post-search-input"><?php _e('Search Media');?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<input type="submit" value="<?php echo attribute_escape( __( 'Search Media' ) ); ?>" class="button" />
 </div>
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 7840)
+++ wp-admin/includes/template.php	(working copy)
@@ -800,8 +800,8 @@
 <p><strong><?php _e( 'Add a new custom field:' ) ?></strong></p>
 <table id="newmeta" cellspacing="3" cellpadding="3">
 	<tr>
-<th colspan="2"><?php _e( 'Key' ) ?></th>
-<th><?php _e( 'Value' ) ?></th>
+<th colspan="2"><label for="metakeyselect"><?php _e( 'Key' ) ?></label></th>
+<th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
 </tr>
 	<tr valign="top">
 		<td style="width: 18%;" class="textright">
@@ -815,7 +815,7 @@
 		echo "\n\t<option value='$key'>$key</option>";
 	}
 ?>
-</select> <?php _e( 'or' ); ?>
+</select> <label for="metakeyinput"><?php _e( 'or' ); ?></label>
 <?php endif; ?>
 </td>
 <td><input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" /></td>
Index: wp-admin/link-import.php
===================================================================
--- wp-admin/link-import.php	(revision 7840)
+++ wp-admin/link-import.php	(working copy)
@@ -30,19 +30,19 @@
 <input type="hidden" name="step" value="1" />
 <input type="hidden" name="MAX_FILE_SIZE" value="30000" />
 <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://" />
+<h3><label for="opml_url"><?php _e('Specify an OPML URL:'); ?></label></h3>
+<input type="text" name="opml_url" id="opml_url" size="50" style="width: 90%;" value="http://" />
 </div>
 
 <div style="width: 48%;" class="alignleft">
-<h3><?php _e('Or choose from your local disk:'); ?></h3>
+<h3><label for="userfile"><?php _e('Or choose from your local disk:'); ?></label></h3>
 <input id="userfile" name="userfile" type="file" size="30" />
 </div>
 
 </div>
 
-<p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these links in.') ?><br />
-<?php _e('Category:') ?> <select name="cat_id">
+<p style="clear: both; margin-top: 1em;"><label for="cat_id"><?php _e('Now select a category you want to put these links in.') ?></label><br />
+<?php _e('Category:') ?> <select name="cat_id" id="cat_id">
 <?php
 $categories = get_terms('link_category', 'get=all');
 foreach ($categories as $category) {
Index: wp-admin/link-manager.php
===================================================================
--- wp-admin/link-manager.php	(revision 7840)
+++ wp-admin/link-manager.php	(working copy)
@@ -78,6 +78,7 @@
 <h2><?php printf( __( 'Manage Links (<a href="%s">add new</a>)' ), 'link-add.php' ); ?></h2>
 
 <p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Links' ); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
 </p>
Index: wp-admin/options-discussion.php
===================================================================
--- wp-admin/options-discussion.php	(revision 7840)
+++ wp-admin/options-discussion.php	(working copy)
@@ -13,7 +13,7 @@
 <?php wp_nonce_field('update-options') ?>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Default article settings') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Default article settings') ?></legend></th>
 <td>
 <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')); ?> />
@@ -28,10 +28,10 @@
 <?php _e('Allow people to post comments on the article') ?></label>
 <br />
 <small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
-</td>
+</td></fieldset>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('E-mail me whenever') ?></th>
+<fieldset><th scope="row"><legend><?php _e('E-mail me whenever') ?></legend></th>
 <td>
 <label for="comments_notify">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
@@ -40,10 +40,10 @@
 <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>
-</td>
+</td></fieldset>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Before a comment appears') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Before a comment appears') ?></legend></th>
 <td>
 <label for="comment_moderation">
 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
@@ -52,27 +52,27 @@
 <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_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>
-</td>
+</td></fieldset>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Comment Moderation') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Comment Moderation') ?></legend></th>
 <td>
-<p><?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" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
+<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" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></label></p>
 
-<p><?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 "press" will match "WordPress".') ?></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 "press" will match "WordPress".') ?></label></p>
 <p>
 <textarea name="moderation_keys" cols="60" rows="10" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
 </p>
-</td>
+</td></fieldset>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Comment Blacklist') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Comment Blacklist') ?></legend></th>
 <td>
-<p><?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 "press" will match "WordPress".') ?></p>
+<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 "press" will match "WordPress".') ?></label></p>
 <p>
 <textarea name="blacklist_keys" cols="60" rows="10" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea>
 </p>
-</td>
+</td></fieldset>
 </tr>
 </table>
 
@@ -84,7 +84,7 @@
 
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Avatar display') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Avatar display') ?></legend></th>
 <td>
 <?php
 	$yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars'));
@@ -93,10 +93,10 @@
 		echo "\n\t<label><input type='radio' name='show_avatars' value='$key' $selected> $value</label><br />";
 	}
 ?>
-</td>
+</td></fieldset>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Maximum Rating') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Maximum Rating') ?></legend></th>
 <td>
 
 <?php
@@ -107,7 +107,7 @@
 endforeach;
 ?>
 
-</td>
+</td></fieldset>
 </tr>
 
 </table>
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php	(revision 7840)
+++ wp-admin/options-general.php	(working copy)
@@ -13,31 +13,31 @@
 <?php wp_nonce_field('update-options') ?>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Blog Title') ?></th>
+<th scope="row"><label for="blogname"><?php _e('Blog Title') ?></label></th>
 <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Tagline') ?></th>
+<th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
 <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
 <br />
 <?php _e('In a few words, explain what this blog is about.') ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('WordPress address (URL)') ?></th>
+<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'); ?>" size="40" class="code<?php if ( defined( 'WP_SITEURL' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Blog address (URL)') ?></th>
+<th scope="row"><label for="home"><?php _e('Blog address (URL)') ?></label></th>
 <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code<?php if ( defined( 'WP_HOME' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /><br /><?php _e('Enter the address here if you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('E-mail address') ?> </th>
+<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'); ?>" size="40" class="code" />
 <br />
 <?php _e('This address is used for admin purposes, like new user notification.') ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Membership') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Membership') ?></legend></th>
 <td> <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><br />
@@ -45,18 +45,18 @@
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
 <?php _e('Users must be registered and logged in to comment') ?>
 </label>
-</td>
+</td></fieldset>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('New User Default Role') ?></th>
-<td><label for="default_role">
-<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
+<th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
+<td>
+<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
 </td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Timezone') ?> </th>
+<th scope="row"><label for="gmt_offset"><?php _e('Timezone') ?> </label></th>
 <td>
-<select name="gmt_offset">
+<select name="gmt_offset" id="gmt_offset">
 <?php
 $current_offset = get_option('gmt_offset');
 $offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
@@ -87,18 +87,18 @@
 </td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Date Format') ?></th>
+<th scope="row"><label for="date_format"><?php _e('Date Format') ?></label></th>
 <td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
 <?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Time Format') ?></th>
+<th scope="row"><label for="time_format"><?php _e('Time Format') ?></label></th>
 <td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
 <?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong><br />
 <?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') ?></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Week Starts On') ?></th>
+<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">
 <?php
 for ($day_index = 0; $day_index <= 6; $day_index++) :
Index: wp-admin/options-misc.php
===================================================================
--- wp-admin/options-misc.php	(revision 7840)
+++ wp-admin/options-misc.php	(working copy)
@@ -15,7 +15,7 @@
 <h3><?php _e('Uploading'); ?></h3>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Store uploads in this folder'); ?></th>
+<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" class="code" value="<?php echo attribute_escape(str_replace(ABSPATH, '', get_option('upload_path'))); ?>" size="40" />
 <br />
 <?php _e('Default is <code>wp-content/uploads</code>'); ?>
@@ -23,7 +23,7 @@
 </tr>
 
 <tr valign="top">
-<th scope="row"><?php _e('Full URL path to files (optional)'); ?></th>
+<th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files (optional)'); ?></label></th>
 <td><input name="upload_url_path" type="text" id="upload_url_path" class="code" value="<?php echo attribute_escape( get_option('upload_url_path')); ?>" size="40" />
 </td>
 </tr>
@@ -43,7 +43,7 @@
 
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Thumbnail size') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Thumbnail size') ?></legend></th>
 <td>
 <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'); ?>" size="6" />
@@ -51,16 +51,16 @@
 <input name="thumbnail_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" size="6" /><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>
+</td></fieldset>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Medium size') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Medium size') ?></legend></th>
 <td>
 <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'); ?>" size="6" />
 <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'); ?>" size="6" />
-</td>
+</td></fieldset>
 </tr>
 </table>
 
Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php	(revision 7840)
+++ wp-admin/options-permalink.php	(working copy)
@@ -170,11 +170,11 @@
 
 <table class="form-table">
 	<tr>
-		<th><?php _e('Category base'); ?></th>
+		<th><label for="category_base"><?php _e('Category base'); ?></label></th>
 		<td><input name="category_base" id="category_base" type="text" class="code"  value="<?php echo attribute_escape($category_base); ?>" size="30" /></td>
 	</tr>
 	<tr>
-		<th><?php _e('Tag base'); ?></th>
+		<th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
 		<td><input name="tag_base" id="tag_base" type="text" class="code"  value="<?php echo attribute_escape($tag_base); ?>" size="30" /></td>
 	</tr>
 </table>
Index: wp-admin/options-privacy.php
===================================================================
--- wp-admin/options-privacy.php	(revision 7840)
+++ wp-admin/options-privacy.php	(working copy)
@@ -13,14 +13,14 @@
 <?php wp_nonce_field('update-options') ?>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Blog Visibility') ?> </th>
+<fieldset><th scope="row"><legend><?php _e('Blog Visibility') ?> </legend></th>
 <td>
 <p><input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
 <label for="blog-public"><?php _e('I would like my blog to be visible to everyone, including search engines (like Google, Sphere, Technorati) and archivers');?></label></p>
 <p><input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
 <label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal visitors'); ?></label></p>
 <?php do_action('blog_privacy_selector'); ?>
-</td>
+</td></fieldset>
 </tr>
 </table>
 
Index: wp-admin/options-reading.php
===================================================================
--- wp-admin/options-reading.php	(revision 7840)
+++ wp-admin/options-reading.php	(working copy)
@@ -14,7 +14,7 @@
 <table class="form-table">
 <?php if ( get_pages() ): ?>
 <tr valign="top">
-<th scope="row"><?php _e('Front page displays')?></th>
+<fieldset><th scope="row"><legend><?php _e('Front page displays')?></legend></th>
 <td>
 	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
@@ -37,29 +37,29 @@
 	</p>
 </div>
 <?php endif; ?>
-</td>
+</td></fieldset>
 </tr>
 <?php endif; ?>
 <tr valign="top">
-<th scope="row"><?php _e('Blog pages show at most') ?></th>
+<th scope="row"><label for="posts_per_page"><?php _e('Blog pages show at most') ?></label></th>
 <td>
 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> <?php _e('posts') ?>
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Syndication feeds show the most recent') ?></th>
+<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'); ?>" size="3" /> <?php _e('posts') ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('For each article in a feed, show') ?> </th>
+<fieldset><th scope="row"><legend><?php _e('For each article in a feed, show') ?> </legend></th>
 <td>
 <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>
-</td>
+</td></fieldset>
 </tr>
 
 <tr valign="top">
-<th scope="row"><?php _e('Encoding for pages and feeds') ?></th>
+<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'); ?>" size="20" class="code" /><br />
 <?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></td>
 </tr>
Index: wp-admin/options-writing.php
===================================================================
--- wp-admin/options-writing.php	(revision 7840)
+++ wp-admin/options-writing.php	(working copy)
@@ -14,21 +14,21 @@
 
 <table class="form-table">
 <tr valign="top">
-<th scope="row"> <?php _e('Size of the post box') ?></th>
+<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'); ?>" size="2" style="width: 1.5em;" />
 <?php _e('lines') ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Formatting') ?></th>
+<fieldset><th scope="row"><legend><?php _e('Formatting') ?></legend></th>
 <td>
 <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>
-</td>
+</td></fieldset>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Default Post Category') ?></th>
+<th scope="row"><label for="default_category"><?php _e('Default Post Category') ?></label></th>
 <td><select name="default_category" id="default_category">
 <?php
 $categories = get_categories('get=all');
@@ -42,7 +42,7 @@
 </select></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Default Link Category') ?></th>
+<th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
 <td><select name="default_link_category" id="default_link_category">
 <?php
 $link_categories = get_terms('link_category', 'get=all');
@@ -62,24 +62,24 @@
 
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Mail Server') ?></th>
+<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'); ?>" size="40" />
 <label for="mailserver_port"><?php _e('Port') ?></label>
 <input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option('mailserver_port'); ?>" size="6" />
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Login Name') ?></th>
+<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'); ?>" size="40" /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Password') ?></th>
+<th scope="row"><label for="mailserver_pass"><?php _e('Password') ?></label></th>
 <td>
 <input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option('mailserver_pass'); ?>" size="40" />
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Default Mail Category') ?></th>
+<th scope="row"><label for="default_email_category"><?php _e('Default Mail Category') ?></label></th>
 <td><select name="default_email_category" id="default_email_category">
 <?php
 //Alreay have $categories from default_category
@@ -98,7 +98,7 @@
 
 <?php if ( get_option('blog_public') ) : ?>
 
-<p><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></p>
+<p><label for="ping_sites"><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></label></p>
 
 <textarea name="ping_sites" id="ping_sites" style="width: 98%;" rows="3" cols="50"><?php form_option('ping_sites'); ?></textarea>
 
Index: wp-admin/options.php
===================================================================
--- wp-admin/options.php	(revision 7840)
+++ wp-admin/options.php	(working copy)
@@ -73,7 +73,7 @@
 	}
 	echo "
 <tr>
-	<th scope='row'>$option->option_name</th>
+	<th scope='row'><label for='$option->option_name'>$option->option_name</label></th>
 <td>";
 
 	if (strpos($value, "\n") !== false) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>" . wp_specialchars($value) . "</textarea>";
Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 7840)
+++ wp-admin/setup-config.php	(working copy)
@@ -68,28 +68,28 @@
 	<p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
 	<table class="form-table">
 		<tr>
-			<th scope="row">Database Name</th>
-			<td><input name="dbname" type="text" size="25" value="wordpress" /></td>
+			<th scope="row"><label for="dbname">Database Name</label></th>
+			<td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
 			<td>The name of the database you want to run WP in. </td>
 		</tr>
 		<tr>
-			<th scope="row">User Name</th>
-			<td><input name="uname" type="text" size="25" value="username" /></td>
+			<th scope="row"><label for="uname">User Name</label></th>
+			<td><input name="uname" id="uname" type="text" size="25" value="username" /></td>
 			<td>Your MySQL username</td>
 		</tr>
 		<tr>
-			<th scope="row">Password</th>
-			<td><input name="pwd" type="text" size="25" value="password" /></td>
+			<th scope="row"><label for="pwd">Password</label></th>
+			<td><input name="pwd" id="pwd" type="text" size="25" value="password" /></td>
 			<td>...and MySQL password.</td>
 		</tr>
 		<tr>
-			<th scope="row">Database Host</th>
-			<td><input name="dbhost" type="text" size="25" value="localhost" /></td>
+			<th scope="row"><label for="dbhost">Database Host</label></th>
+			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
 			<td>99% chance you won't need to change this value.</td>
 		</tr>
 		<tr>
-			<th scope="row">Table Prefix</th>
-			<td><input name="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
+			<th scope="row"><label for="prefix">Table Prefix</label></th>
+			<td><input name="prefix" id="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
 			<td>If you want to run multiple WordPress installations in a single database, change this.</td>
 		</tr>
 	</table>
Index: wp-admin/sidebar.php
===================================================================
--- wp-admin/sidebar.php	(revision 7840)
+++ wp-admin/sidebar.php	(working copy)
@@ -60,8 +60,8 @@
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
 <input type="hidden" name="mode" value="sidebar" />
 <?php wp_nonce_field('add-post'); ?>
-<p><?php _e('Title:'); ?>
-<input type="text" name="post_title" size="20" tabindex="1" style="width: 100%;" />
+<p><label for="post_title"><?php _e('Title:'); ?></label>
+<input type="text" name="post_title" id="post_title" size="20" tabindex="1" style="width: 100%;" />
 </p>
 <p><?php _e('Categories:'); ?>
 <span class="sidebar-categories">
@@ -69,8 +69,8 @@
 </span>
 </p>
 <p>
-Post:
-<textarea rows="8" cols="12" style="width: 100%" name="content" tabindex="2"></textarea>
+<label for="content">Post:</label>
+<textarea rows="8" cols="12" style="width: 100%" name="content" id="content" tabindex="2"></textarea>
 </p>
 <p>
 	<input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft'); ?>" />
Index: wp-admin/theme-editor.php
===================================================================
--- wp-admin/theme-editor.php	(revision 7840)
+++ wp-admin/theme-editor.php	(working copy)
@@ -92,7 +92,7 @@
 <div class="bordertitle">
 	<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>
+		<strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
 		<select name="theme" id="theme">
 <?php
 	foreach ($themes as $a_theme) {
Index: wp-admin/update.php
===================================================================
--- wp-admin/update.php	(revision 7840)
+++ wp-admin/update.php	(working copy)
@@ -45,19 +45,19 @@
 <p><?php _e('To perform the requested update, FTP connection information is required.') ?></p>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Hostname:') ?></th>
+<th scope="row"><label for="hostname"><?php _e('Hostname:') ?></label></th>
 <td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname) ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Username:') ?></th>
+<th scope="row"><label for="username"><?php _e('Username:') ?></label></th>
 <td><input name="username" type="text" id="username" value="<?php echo attribute_escape($username) ?>"<?php if( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Password:') ?></th>
+<th scope="row"><label for="password"><?php _e('Password:') ?></label></th>
 <td><input name="password" type="password" id="password" value=""<?php if( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /><?php if( defined('FTP_PASS') && !empty($password) ) echo '<em>'.__('(Password not shown)').'</em>'; ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Use SSL:') ?></th>
+<th scope="row"><label for="ssl"><?php _e('Use SSL:') ?></label></th>
 <td>
 <select name="ssl" id="ssl"<?php if( defined('FTP_SSL') ) echo ' disabled="disabled"' ?>>
 <?php
Index: wp-admin/upload.php
===================================================================
--- wp-admin/upload.php	(revision 7840)
+++ wp-admin/upload.php	(working copy)
@@ -125,6 +125,7 @@
 ?>
 
 <p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Media' ); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<input type="submit" value="<?php _e( 'Search Media' ); ?>" class="button" />
 </p>
Index: wp-admin/user-edit.php
===================================================================
--- wp-admin/user-edit.php	(revision 7840)
+++ wp-admin/user-edit.php	(working copy)
@@ -161,7 +161,7 @@
 	</tr>
 <?php endif; ?>
 <tr>
-<th scope="row"><?php _e('Admin Color Scheme')?></th>
+<fieldset><th scope="row"><legend><?php _e('Admin Color Scheme')?></legend></th>
 <td>
 <?php
 $current_color = get_user_option('admin_color');
@@ -181,7 +181,7 @@
 	<label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label>
 </div>
 <?php endforeach; ?>
-</td>
+</td></fieldset>
 </tr>
 </table>
 
Index: wp-admin/users.php
===================================================================
--- wp-admin/users.php	(revision 7840)
+++ wp-admin/users.php	(working copy)
@@ -145,13 +145,13 @@
 	?>
 	</ul>
 <?php if ( $go_delete ) : ?>
-	<p><?php _e('What should be done with posts and links owned by this user?'); ?></p>
+	<fieldset><p><legend><?php _e('What should be done with posts and links owned by this user?'); ?></legend></p>
 	<ul style="list-style:none;">
 		<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
 		<?php _e('Delete all posts and links.'); ?></label></li>
 		<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
 		<?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:')."</label> $user_dropdown"; ?></li>
-	</ul>
+	</ul></fieldset>
 	<input type="hidden" name="action" value="dodelete" />
 	<p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" class="button-secondary" /></p>
 <?php else : ?>
@@ -287,6 +287,7 @@
 ?>
 </ul>
 	<p id="post-search">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Users' ); ?>:</label>
 	<input type="text" id="post-search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
 	<input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
 	</p>
@@ -403,29 +404,29 @@
 <?php wp_nonce_field('add-user') ?>
 <table class="form-table">
 	<tr class="form-field form-required">
-		<th scope="row"><?php _e('Username (required)') ?><input name="action" type="hidden" id="action" value="adduser" /></th>
+		<th scope="row"><label for="user_login"><?php _e('Username (required)') ?></label><input name="action" type="hidden" id="action" value="adduser" /></th>
 		<td ><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" /></td>
 	</tr>
 	<tr class="form-field">
-		<th scope="row"><?php _e('First Name') ?> </th>
+		<th scope="row"><label for="first_name"><?php _e('First Name') ?> </label></th>
 		<td><input name="first_name" type="text" id="first_name" value="<?php echo $new_user_firstname; ?>" /></td>
 	</tr>
 	<tr class="form-field">
-		<th scope="row"><?php _e('Last Name') ?> </th>
+		<th scope="row"><label for="last_name"><?php _e('Last Name') ?> </label></th>
 		<td><input name="last_name" type="text" id="last_name" value="<?php echo $new_user_lastname; ?>" /></td>
 	</tr>
 	<tr class="form-field form-required">
-		<th scope="row"><?php _e('E-mail (required)') ?></th>
+		<th scope="row"><label for="email"><?php _e('E-mail (required)') ?></label></th>
 		<td><input name="email" type="text" id="email" value="<?php echo $new_user_email; ?>" /></td>
 	</tr>
 	<tr class="form-field">
-		<th scope="row"><?php _e('Website') ?></th>
+		<th scope="row"><label for="url"><?php _e('Website') ?></label></th>
 		<td><input name="url" type="text" id="url" value="<?php echo $new_user_uri; ?>" /></td>
 	</tr>
 
 <?php if ( apply_filters('show_password_fields', true) ) : ?>
 	<tr class="form-field form-required">
-		<th scope="row"><?php _e('Password (twice)') ?> </th>
+		<th scope="row"><label for="pass1"><?php _e('Password (twice)') ?> </label></th>
 		<td><input name="pass1" type="password" id="pass1" />
 		<br />
 		<input name="pass2" type="password" id="pass2" /></td>
@@ -433,7 +434,7 @@
 <?php endif; ?>
 
 	<tr class="form-field">
-		<th scope="row"><?php _e('Role'); ?></th>
+		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="role">
 			<?php
 			if ( !$new_user_role )
Index: wp-admin/widgets.php
===================================================================
--- wp-admin/widgets.php	(revision 7840)
+++ wp-admin/widgets.php	(working copy)
@@ -232,15 +232,16 @@
 
 	<h2><?php _e( 'Widgets' ); ?></h2>
 	<p id="widget-search">
+		<label class="hidden" for="widget-search-input"><?php _e( 'Search Widgets' ); ?>:</label>
 		<input type="text" id="widget-search-input" name="s" value="<?php echo attribute_escape( $widget_search ); ?>" />
 		<input type="submit" class="button" value="<?php _e( 'Search Widgets' ); ?>" />
 	</p>
 
 	<div class="widget-liquid-left-holder">
 	<div id="available-widgets-filter" class="widget-liquid-left">
-		<h3><?php _e('Available Widgets'); ?></h3>
+		<h3><label for="show"><?php _e('Available Widgets'); ?></label></h3>
 		<div class="nav">
-			<select name="show">
+			<select name="show" id="show">
 <?php foreach ( $show_values as $show_value => $show_text ) : $show_value = attribute_escape( $show_value ); ?>
 				<option value='<?php echo $show_value; ?>'<?php selected( $show_value, $show ); ?>><?php echo wp_specialchars( $show_text ); ?></option>
 <?php endforeach; ?>
@@ -254,7 +255,7 @@
 	</div>
 
 	<div id="available-sidebars" class="widget-liquid-right">
-		<h3><?php _e('Current Widgets'); ?></h3>
+		<h3><label for="sidebar-selector"><?php _e('Current Widgets'); ?></label></h3>
 
 		<div class="nav">
 			<select id="sidebar-selector" name="sidebar">
Index: wp-admin/wp-admin.css
===================================================================
--- wp-admin/wp-admin.css	(revision 7840)
+++ wp-admin/wp-admin.css	(working copy)
@@ -1503,3 +1503,7 @@
 table.diff .diff-deletedline del, table.diff .diff-addedline ins {
 	text-decoration: none;
 }
+
+fieldset {
+	border: 0;
+}
Index: wp-content/themes/default/searchform.php
===================================================================
--- wp-content/themes/default/searchform.php	(revision 7840)
+++ wp-content/themes/default/searchform.php	(working copy)
@@ -1,4 +1,5 @@
 <form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
+<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
 <div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
 <input type="submit" id="searchsubmit" value="Search" />
 </div>
Index: wp-content/themes/default/style.css
===================================================================
--- wp-content/themes/default/style.css	(revision 7840)
+++ wp-content/themes/default/style.css	(working copy)
@@ -616,6 +616,10 @@
 	text-align: center;
 	}
 
+.hidden {
+	display: none;
+	}
+
 hr {
 	display: none;
 	}
Index: wp-includes/widgets.php
===================================================================
--- wp-includes/widgets.php	(revision 7840)
+++ wp-includes/widgets.php	(working copy)
@@ -461,6 +461,7 @@
 		<?php echo $before_widget; ?>
 			<form id="searchform" method="get" action="<?php bloginfo('home'); ?>">
 			<div>
+			<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
 			<input type="text" name="s" id="s" size="15" /><br />
 			<input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" />
 			</div>