diff --git a/wp-content/themes/default/archive.php b/wp-content/themes/default/archive.php
index 3d4d8b8e94..70c2a8cec8 100644
--- a/wp-content/themes/default/archive.php
+++ b/wp-content/themes/default/archive.php
@@ -7,7 +7,7 @@
 get_header();
 ?>
 
-	<div id="content" class="narrowcolumn">
+	<div id="content" class="narrowcolumn" role="main">
 
 		<?php if (have_posts()) : ?>
 
diff --git a/wp-content/themes/default/footer.php b/wp-content/themes/default/footer.php
index 49ab67660d..02f6d1930a 100644
--- a/wp-content/themes/default/footer.php
+++ b/wp-content/themes/default/footer.php
@@ -6,7 +6,7 @@
 ?>
 
 <hr />
-<div id="footer">
+<div id="footer" role="contentinfo">
 <!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
 	<p>
 		<?php bloginfo('name'); ?> is proudly powered by
diff --git a/wp-content/themes/default/header.php b/wp-content/themes/default/header.php
index 63f20d3355..8b09aebd99 100644
--- a/wp-content/themes/default/header.php
+++ b/wp-content/themes/default/header.php
@@ -36,7 +36,7 @@ if ( !empty($withcomments) && !is_single() ) {
 <div id="page">
 
 
-<div id="header">
+<div id="header" role="banner">
 	<div id="headerimg">
 		<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
 		<div class="description"><?php bloginfo('description'); ?></div>
diff --git a/wp-content/themes/default/index.php b/wp-content/themes/default/index.php
index 0d70c2305d..ae5bf8057b 100644
--- a/wp-content/themes/default/index.php
+++ b/wp-content/themes/default/index.php
@@ -6,7 +6,7 @@
 
 get_header(); ?>
 
-	<div id="content" class="narrowcolumn">
+	<div id="content" class="narrowcolumn" role="main">
 
 	<?php if (have_posts()) : ?>
 
diff --git a/wp-content/themes/default/page.php b/wp-content/themes/default/page.php
index bd77efb679..660e47744b 100644
--- a/wp-content/themes/default/page.php
+++ b/wp-content/themes/default/page.php
@@ -6,7 +6,7 @@
 
 get_header(); ?>
 
-	<div id="content" class="narrowcolumn">
+	<div id="content" class="narrowcolumn" role="main">
 
 		<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 		<div class="post" id="post-<?php the_ID(); ?>">
@@ -24,4 +24,4 @@ get_header(); ?>
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/default/search.php b/wp-content/themes/default/search.php
index 3e93ffce75..4e7ad6dd6b 100644
--- a/wp-content/themes/default/search.php
+++ b/wp-content/themes/default/search.php
@@ -6,7 +6,7 @@
 
 get_header(); ?>
 
-	<div id="content" class="narrowcolumn">
+	<div id="content" class="narrowcolumn" role="main">
 
 	<?php if (have_posts()) : ?>
 
@@ -45,4 +45,4 @@ get_header(); ?>
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 79c3122939..d6bdf386d9 100644
--- a/wp-content/themes/default/sidebar.php
+++ b/wp-content/themes/default/sidebar.php
@@ -4,7 +4,7 @@
  * @subpackage Default_Theme
  */
 ?>
-	<div id="sidebar">
+	<div id="sidebar" role="complementary">
 		<ul>
 			<?php 	/* Widgetized sidebar, if you have the plugin installed. */
 					if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
@@ -47,8 +47,10 @@
 
 			<?php } ?>
 
-			</li> <?php }?>
-
+			</li>
+		<?php }?>
+		</ul> 
+		<ul role="navigation">
 			<?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
 
 			<li><h2>Archives</h2>
@@ -58,7 +60,8 @@
 			</li>
 
 			<?php wp_list_categories('show_count=1&title_li=<h2>Categories</h2>'); ?>
-
+		</ul>
+		<ul>
 			<?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
 				<?php wp_list_bookmarks(); ?>
 
diff --git a/wp-content/themes/default/single.php b/wp-content/themes/default/single.php
index c657467d9b..49d75c0447 100644
--- a/wp-content/themes/default/single.php
+++ b/wp-content/themes/default/single.php
@@ -7,7 +7,7 @@
 get_header();
 ?>
 
-	<div id="content" class="widecolumn">
+	<div id="content" class="widecolumn" role="main">
 
 	<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 552d590e0e..ced59d14ee 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -118,7 +118,7 @@ function get_search_form() {
 	if ( '' != locate_template(array('searchform.php'), true) )
 		return;
 
-	$form = '<form method="get" id="searchform" action="' . get_option('home') . '/" >
+	$form = '<form role="search" method="get" id="searchform" action="' . get_option('home') . '/" >
 	<div><label class="hidden" for="s">' . __('Search for:') . '</label>
 	<input type="text" value="' . attribute_escape(apply_filters('the_search_query', get_search_query())) . '" name="s" id="s" />
 	<input type="submit" id="searchsubmit" value="'.attribute_escape(__('Search')).'" />