diff --git a/wp-content/themes/twentyten/404.php b/wp-content/themes/twentyten/404.php
index c326df7a12..b557039a62 100644
--- a/wp-content/themes/twentyten/404.php
+++ b/wp-content/themes/twentyten/404.php
@@ -11,7 +11,7 @@
 <?php get_header(); ?>
 
 	<div id="container">
-		<div id="content">
+		<div id="content" role="main">
 
 			<div id="post-0" class="post error404 not-found">
 				<h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
diff --git a/wp-content/themes/twentyten/archive.php b/wp-content/themes/twentyten/archive.php
index cfb2556018..600688e071 100644
--- a/wp-content/themes/twentyten/archive.php
+++ b/wp-content/themes/twentyten/archive.php
@@ -16,7 +16,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 <?php the_post(); ?>
 
diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php
index 59c09e4307..8adb04ac66 100644
--- a/wp-content/themes/twentyten/attachment.php
+++ b/wp-content/themes/twentyten/attachment.php
@@ -11,7 +11,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 <?php the_post(); ?>
 
diff --git a/wp-content/themes/twentyten/author.php b/wp-content/themes/twentyten/author.php
index a4826e741a..5c27dcba97 100644
--- a/wp-content/themes/twentyten/author.php
+++ b/wp-content/themes/twentyten/author.php
@@ -11,7 +11,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 <?php the_post(); ?>
 
diff --git a/wp-content/themes/twentyten/category.php b/wp-content/themes/twentyten/category.php
index ad2a3d9d8b..c6a2977dea 100644
--- a/wp-content/themes/twentyten/category.php
+++ b/wp-content/themes/twentyten/category.php
@@ -11,7 +11,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 				<h1 class="page-title"><?php
 					printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php
index c0aab87c7c..e6c5ad57a2 100644
--- a/wp-content/themes/twentyten/footer.php
+++ b/wp-content/themes/twentyten/footer.php
@@ -12,7 +12,7 @@
 ?>
 	</div><!-- #main -->
 
-	<div id="footer">
+	<div id="footer" role="contentinfo">
 		<div id="colophon">
 
 <?php get_sidebar( 'footer' ); ?>
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index 1cec1dc311..97f743e238 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -45,7 +45,7 @@
 <div id="wrapper" class="hfeed">
 	<div id="header">
 		<div id="masthead">
-			<div id="branding">
+			<div id="branding" role="banner">
 				<?php $heading_tag = ( is_home() || is_front_page() )? 'h1' : 'div'; ?>
 				<<?php echo $heading_tag; ?> id="site-title">
 					<span>
@@ -67,7 +67,7 @@
 					<?php endif; ?>
 			</div><!-- #branding -->
 
-			<div id="access">
+			<div id="access" role="navigation">
 				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
 				<?php wp_nav_menu( array( 'sort_column' => 'menu_order', 'container_class' => 'menu-header' ) ); ?>
 			</div><!-- #access -->
diff --git a/wp-content/themes/twentyten/index.php b/wp-content/themes/twentyten/index.php
index 26363b0185..29cfb2dbac 100644
--- a/wp-content/themes/twentyten/index.php
+++ b/wp-content/themes/twentyten/index.php
@@ -17,7 +17,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 			<?php
 			/* Run the loop to output the posts.
diff --git a/wp-content/themes/twentyten/onecolumn-page.php b/wp-content/themes/twentyten/onecolumn-page.php
index 866639001e..f32eaeabdf 100644
--- a/wp-content/themes/twentyten/onecolumn-page.php
+++ b/wp-content/themes/twentyten/onecolumn-page.php
@@ -14,7 +14,7 @@
 <?php get_header(); ?>
 
 		<div id="container" class="onecolumn">
-			<div id="content">
+			<div id="content" role="main">
 
 <?php the_post(); ?>
 
diff --git a/wp-content/themes/twentyten/page.php b/wp-content/themes/twentyten/page.php
index 2945a3d0a2..a7d2a62012 100644
--- a/wp-content/themes/twentyten/page.php
+++ b/wp-content/themes/twentyten/page.php
@@ -16,7 +16,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 <?php the_post(); ?>
 
diff --git a/wp-content/themes/twentyten/search.php b/wp-content/themes/twentyten/search.php
index 134b90b3bd..870b072c7b 100644
--- a/wp-content/themes/twentyten/search.php
+++ b/wp-content/themes/twentyten/search.php
@@ -11,7 +11,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 <?php if ( have_posts() ) : ?>
 				<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
diff --git a/wp-content/themes/twentyten/sidebar-footer.php b/wp-content/themes/twentyten/sidebar-footer.php
index 569dc5ac00..6d6b08693b 100644
--- a/wp-content/themes/twentyten/sidebar-footer.php
+++ b/wp-content/themes/twentyten/sidebar-footer.php
@@ -16,7 +16,7 @@
 		is_active_sidebar( 'fourth-footer-widget-area' )
 	) :
 ?>
-			<div id="footer-widget-area">
+			<div id="footer-widget-area" role="complementary">
 <?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?>
 					<div id="first" class="widget-area">
 						<ul class="xoxo">
diff --git a/wp-content/themes/twentyten/sidebar.php b/wp-content/themes/twentyten/sidebar.php
index 57481866b4..3bcfe57393 100644
--- a/wp-content/themes/twentyten/sidebar.php
+++ b/wp-content/themes/twentyten/sidebar.php
@@ -8,7 +8,7 @@
  */
 ?>
 
-		<div id="primary" class="widget-area">
+		<div id="primary" class="widget-area" role="complementary">
 			<ul class="xoxo">
 <?php if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : // begin primary widget area ?>
 			<li id="search" class="widget-container widget_search">
@@ -35,7 +35,7 @@
 		</div><!-- #primary .widget-area -->
 
 <?php if ( is_active_sidebar( 'secondary-widget-area' ) ) : // Nothing here by default and design ?>
-		<div id="secondary" class="widget-area">
+		<div id="secondary" class="widget-area" role="complementary">
 			<ul class="xoxo">
 				<?php dynamic_sidebar( 'secondary-widget-area' ); ?>
 			</ul>
diff --git a/wp-content/themes/twentyten/single.php b/wp-content/themes/twentyten/single.php
index e166139133..4378e321ed 100644
--- a/wp-content/themes/twentyten/single.php
+++ b/wp-content/themes/twentyten/single.php
@@ -11,7 +11,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
 
diff --git a/wp-content/themes/twentyten/tag.php b/wp-content/themes/twentyten/tag.php
index 46fc968f36..e5294c811b 100644
--- a/wp-content/themes/twentyten/tag.php
+++ b/wp-content/themes/twentyten/tag.php
@@ -11,7 +11,7 @@
 <?php get_header(); ?>
 
 		<div id="container">
-			<div id="content">
+			<div id="content" role="main">
 
 <?php the_post(); ?>