diff --git src/wp-content/themes/twentyeleven/404.php src/wp-content/themes/twentyeleven/404.php
index 2dc9998c1d..c07c70fa07 100644
--- src/wp-content/themes/twentyeleven/404.php
+++ src/wp-content/themes/twentyeleven/404.php
@@ -14,18 +14,18 @@ get_header(); ?>
 
 			<article id="post-0" class="post error404 not-found">
 				<header class="entry-header">
-					<h1 class="entry-title"><?php _e( 'This is somewhat embarrassing, isn&rsquo;t it?', 'twentyeleven' ); ?></h1>
+					<h1 class="entry-title"><?php esc_html_e( 'This is somewhat embarrassing, isn&rsquo;t it?', 'twentyeleven' ); ?></h1>
 				</header>
 
 				<div class="entry-content">
-					<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching, or one of the links below, can help.', 'twentyeleven' ); ?></p>
+					<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching, or one of the links below, can help.', 'twentyeleven' ); ?></p>
 
 					<?php get_search_form(); ?>
 
 					<?php the_widget( 'WP_Widget_Recent_Posts', array( 'number' => 10 ), array( 'widget_id' => '404' ) ); ?>
 
 					<div class="widget">
-						<h2 class="widgettitle"><?php _e( 'Most Used Categories', 'twentyeleven' ); ?></h2>
+						<h2 class="widgettitle"><?php esc_html_e( 'Most Used Categories', 'twentyeleven' ); ?></h2>
 						<ul>
 						<?php
 						wp_list_categories(
diff --git src/wp-content/themes/twentyeleven/archive.php src/wp-content/themes/twentyeleven/archive.php
index a21e626b70..7e36e139ae 100644
--- src/wp-content/themes/twentyeleven/archive.php
+++ src/wp-content/themes/twentyeleven/archive.php
@@ -32,7 +32,7 @@ get_header(); ?>
 							/* translators: %s: Date. */
 							printf( __( 'Yearly Archives: %s', 'twentyeleven' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentyeleven' ) ) . '</span>' );
 						} else {
-							_e( 'Blog Archives', 'twentyeleven' );
+							esc_html_e( 'Blog Archives', 'twentyeleven' );
 						}
 						?>
 					</h1>
@@ -64,11 +64,11 @@ get_header(); ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentyeleven' ); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
+						<p><?php esc_html_e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->
diff --git src/wp-content/themes/twentyeleven/author.php src/wp-content/themes/twentyeleven/author.php
index ad2117324f..033bd6f170 100644
--- src/wp-content/themes/twentyeleven/author.php
+++ src/wp-content/themes/twentyeleven/author.php
@@ -99,11 +99,11 @@ get_header(); ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentyeleven' ); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
+						<p><?php esc_html_e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->
diff --git src/wp-content/themes/twentyeleven/category.php src/wp-content/themes/twentyeleven/category.php
index e9bc2e7052..ed6a8b61c5 100644
--- src/wp-content/themes/twentyeleven/category.php
+++ src/wp-content/themes/twentyeleven/category.php
@@ -63,11 +63,11 @@ get_header(); ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentyeleven' ); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
+						<p><?php esc_html_e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->
diff --git src/wp-content/themes/twentyeleven/comments.php src/wp-content/themes/twentyeleven/comments.php
index 0787c43b22..23bf0e3111 100644
--- src/wp-content/themes/twentyeleven/comments.php
+++ src/wp-content/themes/twentyeleven/comments.php
@@ -14,7 +14,7 @@
 ?>
 	<div id="comments">
 	<?php if ( post_password_required() ) : ?>
-		<p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyeleven' ); ?></p>
+		<p class="nopassword"><?php esc_html_e( 'This post is password protected. Enter the password to view any comments.', 'twentyeleven' ); ?></p>
 	</div><!-- #comments -->
 		<?php
 			/*
@@ -50,7 +50,7 @@
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
 		<nav id="comment-nav-above">
-			<h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyeleven' ); ?></h1>
+			<h1 class="assistive-text"><?php esc_html_e( 'Comment navigation', 'twentyeleven' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyeleven' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyeleven' ) ); ?></div>
 		</nav>
@@ -71,7 +71,7 @@
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
 		<nav id="comment-nav-below">
-			<h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyeleven' ); ?></h1>
+			<h1 class="assistive-text"><?php esc_html_e( 'Comment navigation', 'twentyeleven' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyeleven' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyeleven' ) ); ?></div>
 		</nav>
@@ -84,7 +84,7 @@
 		 */
 		if ( ! comments_open() && get_comments_number() ) :
 			?>
-		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyeleven' ); ?></p>
+		<p class="nocomments"><?php esc_html_e( 'Comments are closed.', 'twentyeleven' ); ?></p>
 		<?php endif; ?>
 
 	<?php endif; // have_comments() ?>
diff --git src/wp-content/themes/twentyeleven/content-aside.php src/wp-content/themes/twentyeleven/content-aside.php
index 03dd772249..c115f84733 100644
--- src/wp-content/themes/twentyeleven/content-aside.php
+++ src/wp-content/themes/twentyeleven/content-aside.php
@@ -16,7 +16,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-				<h3 class="entry-format"><?php _e( 'Aside', 'twentyeleven' ); ?></h3>
+				<h3 class="entry-format"><?php esc_html_e( 'Aside', 'twentyeleven' ); ?></h3>
 			</hgroup>
 
 			<?php if ( comments_open() && ! post_password_required() ) : ?>
diff --git src/wp-content/themes/twentyeleven/content-gallery.php src/wp-content/themes/twentyeleven/content-gallery.php
index 9ecb7073b1..31cf92b717 100644
--- src/wp-content/themes/twentyeleven/content-gallery.php
+++ src/wp-content/themes/twentyeleven/content-gallery.php
@@ -16,7 +16,7 @@
 	<header class="entry-header">
 		<hgroup>
 			<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-			<h3 class="entry-format"><?php _e( 'Gallery', 'twentyeleven' ); ?></h3>
+			<h3 class="entry-format"><?php esc_html_e( 'Gallery', 'twentyeleven' ); ?></h3>
 		</hgroup>
 
 		<div class="entry-meta">
@@ -107,7 +107,7 @@
 		<span class="sep"> | </span>
 		<?php endif; // End if $show_sep. ?>
 		<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
-		<?php endif; // End if comments_open(). ?>
+		<?php endif; ?>
 
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-meta -->
diff --git src/wp-content/themes/twentyeleven/content-image.php src/wp-content/themes/twentyeleven/content-image.php
index c404733014..78450d2269 100644
--- src/wp-content/themes/twentyeleven/content-image.php
+++ src/wp-content/themes/twentyeleven/content-image.php
@@ -15,7 +15,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-				<h3 class="entry-format"><?php _e( 'Image', 'twentyeleven' ); ?></h3>
+				<h3 class="entry-format"><?php esc_html_e( 'Image', 'twentyeleven' ); ?></h3>
 			</hgroup>
 
 			<?php if ( comments_open() && ! post_password_required() ) : ?>
diff --git src/wp-content/themes/twentyeleven/content-link.php src/wp-content/themes/twentyeleven/content-link.php
index 2f30a85e3f..81a69db612 100644
--- src/wp-content/themes/twentyeleven/content-link.php
+++ src/wp-content/themes/twentyeleven/content-link.php
@@ -16,7 +16,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-				<h3 class="entry-format"><?php _e( 'Link', 'twentyeleven' ); ?></h3>
+				<h3 class="entry-format"><?php esc_html_e( 'Link', 'twentyeleven' ); ?></h3>
 			</hgroup>
 
 			<?php if ( comments_open() && ! post_password_required() ) : ?>
diff --git src/wp-content/themes/twentyeleven/content-quote.php src/wp-content/themes/twentyeleven/content-quote.php
index 3dc531b8ad..33d6b9cb35 100644
--- src/wp-content/themes/twentyeleven/content-quote.php
+++ src/wp-content/themes/twentyeleven/content-quote.php
@@ -12,7 +12,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-				<h3 class="entry-format"><?php _e( 'Quote', 'twentyeleven' ); ?></h3>
+				<h3 class="entry-format"><?php esc_html_e( 'Quote', 'twentyeleven' ); ?></h3>
 			</hgroup>
 
 			<div class="entry-meta">
@@ -83,7 +83,7 @@
 			<span class="sep"> | </span>
 			<?php endif; // End if $show_sep. ?>
 			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
-			<?php endif; // End if comments_open(). ?>
+			<?php endif; ?>
 
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- .entry-meta -->
diff --git src/wp-content/themes/twentyeleven/content-status.php src/wp-content/themes/twentyeleven/content-status.php
index 60a1e4d9ba..1206a0b653 100644
--- src/wp-content/themes/twentyeleven/content-status.php
+++ src/wp-content/themes/twentyeleven/content-status.php
@@ -16,7 +16,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-				<h3 class="entry-format"><?php _e( 'Status', 'twentyeleven' ); ?></h3>
+				<h3 class="entry-format"><?php esc_html_e( 'Status', 'twentyeleven' ); ?></h3>
 			</hgroup>
 
 			<?php if ( comments_open() && ! post_password_required() ) : ?>
diff --git src/wp-content/themes/twentyeleven/content.php src/wp-content/themes/twentyeleven/content.php
index f6294d2ab7..b52e8ab86e 100644
--- src/wp-content/themes/twentyeleven/content.php
+++ src/wp-content/themes/twentyeleven/content.php
@@ -13,7 +13,7 @@
 			<?php if ( is_sticky() ) : ?>
 				<hgroup>
 					<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-					<h3 class="entry-format"><?php _e( 'Featured', 'twentyeleven' ); ?></h3>
+					<h3 class="entry-format"><?php esc_html_e( 'Featured', 'twentyeleven' ); ?></h3>
 				</hgroup>
 			<?php else : ?>
 			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
@@ -66,8 +66,8 @@
 					$show_sep = true;
 					?>
 			</span>
-				<?php endif; // End if categories. ?>
-			<?php endif; // End if is_object_in_taxonomy( get_post_type(), 'category' ). ?>
+				<?php endif; ?>
+			<?php endif; ?>
 
 			<?php if ( is_object_in_taxonomy( get_post_type(), 'post_tag' ) ) : // Hide tag text when not supported. ?>
 				<?php
@@ -85,15 +85,15 @@
 					$show_sep = true;
 					?>
 			</span>
-				<?php endif; // End if $tags_list. ?>
-			<?php endif; // End if is_object_in_taxonomy( get_post_type(), 'post_tag' ). ?>
+				<?php endif; ?>
+			<?php endif; ?>
 
 			<?php if ( comments_open() ) : ?>
 				<?php if ( $show_sep ) : ?>
 			<span class="sep"> | </span>
 			<?php endif; // End if $show_sep. ?>
 			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
-			<?php endif; // End if comments_open(). ?>
+			<?php endif; ?>
 
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- .entry-meta -->
diff --git src/wp-content/themes/twentyeleven/functions.php src/wp-content/themes/twentyeleven/functions.php
index 7dc3bf52ef..6761b8f729 100644
--- src/wp-content/themes/twentyeleven/functions.php
+++ src/wp-content/themes/twentyeleven/functions.php
@@ -288,7 +288,7 @@ if ( ! function_exists( 'twentyeleven_setup' ) ) :
 		// Indicate widget sidebars can use selective refresh in the Customizer.
 		add_theme_support( 'customize-selective-refresh-widgets' );
 	}
-endif; // twentyeleven_setup()
+endif;
 
 /**
  * Enqueue scripts and styles for front end.
@@ -351,7 +351,7 @@ if ( ! function_exists( 'twentyeleven_header_style' ) ) :
 	</style>
 		<?php
 	}
-endif; // twentyeleven_header_style()
+endif;
 
 if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
 	/**
@@ -401,7 +401,7 @@ if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
 	</style>
 		<?php
 	}
-endif; // twentyeleven_admin_header_style()
+endif;
 
 if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
 	/**
@@ -431,7 +431,7 @@ if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
 		</div>
 		<?php
 	}
-endif; // twentyeleven_admin_header_image()
+endif;
 
 /**
  * Set the post excerpt length to 40 words.
@@ -461,7 +461,7 @@ if ( ! function_exists( 'twentyeleven_continue_reading_link' ) ) :
 	function twentyeleven_continue_reading_link() {
 		return ' <a href="' . esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';
 	}
-endif; // twentyeleven_continue_reading_link()
+endif;
 
 /**
  * Replace "[...]" in the Read More link with an ellipsis.
@@ -605,14 +605,14 @@ if ( ! function_exists( 'twentyeleven_content_nav' ) ) :
 		if ( $wp_query->max_num_pages > 1 ) :
 			?>
 			<nav id="<?php echo esc_attr( $html_id ); ?>">
-				<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
+				<h3 class="assistive-text"><?php esc_html_e( 'Post navigation', 'twentyeleven' ); ?></h3>
 				<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div>
 				<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div>
 			</nav><!-- #nav-above -->
 			<?php
 	endif;
 	}
-endif; // twentyeleven_content_nav()
+endif;
 
 /**
  * Return the first link from the post content. If none found, the
@@ -712,7 +712,7 @@ if ( ! function_exists( 'twentyeleven_comment' ) ) :
 			case 'trackback':
 				?>
 		<li class="post pingback">
-		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
+		<p><?php esc_html_e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
 				<?php
 				break;
 			default:
@@ -785,7 +785,7 @@ if ( ! function_exists( 'twentyeleven_comment' ) ) :
 				break;
 		endswitch;
 	}
-endif; // twentyeleven_comment()
+endif;
 
 if ( ! function_exists( 'twentyeleven_posted_on' ) ) :
 	/**
diff --git src/wp-content/themes/twentyeleven/header.php src/wp-content/themes/twentyeleven/header.php
index 62d9b344dd..4d91641c18 100644
--- src/wp-content/themes/twentyeleven/header.php
+++ src/wp-content/themes/twentyeleven/header.php
@@ -8,6 +8,9 @@
  * @subpackage Twenty_Eleven
  * @since Twenty Eleven 1.0
  */
+
+ global $post;
+
 ?><!DOCTYPE html>
 <!--[if IE 6]>
 <html id="ie6" <?php language_attributes(); ?>>
@@ -145,7 +148,7 @@ if ( is_singular() && get_option( 'thread_comments' ) ) {
 			<?php endif; ?>
 
 			<nav id="access">
-				<h3 class="assistive-text"><?php _e( 'Main menu', 'twentyeleven' ); ?></h3>
+				<h3 class="assistive-text"><?php esc_html_e( 'Main menu', 'twentyeleven' ); ?></h3>
 				<?php
 				/*
 				 * Our navigation menu. If one isn't filled out, wp_nav_menu() falls back to wp_page_menu().
diff --git src/wp-content/themes/twentyeleven/index.php src/wp-content/themes/twentyeleven/index.php
index a4a7c04f18..9066201e0f 100644
--- src/wp-content/themes/twentyeleven/index.php
+++ src/wp-content/themes/twentyeleven/index.php
@@ -37,11 +37,11 @@ get_header(); ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentyeleven' ); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
+						<p><?php esc_html_e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->
diff --git src/wp-content/themes/twentyeleven/search.php src/wp-content/themes/twentyeleven/search.php
index f7902d35f0..d0501bfaa4 100644
--- src/wp-content/themes/twentyeleven/search.php
+++ src/wp-content/themes/twentyeleven/search.php
@@ -49,11 +49,11 @@ get_header(); ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentyeleven' ); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyeleven' ); ?></p>
+						<p><?php esc_html_e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyeleven' ); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->
diff --git src/wp-content/themes/twentyeleven/searchform.php src/wp-content/themes/twentyeleven/searchform.php
index bd8cdca1b4..047aff0f9f 100644
--- src/wp-content/themes/twentyeleven/searchform.php
+++ src/wp-content/themes/twentyeleven/searchform.php
@@ -8,7 +8,7 @@
  */
 ?>
 	<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
-		<label for="s" class="assistive-text"><?php _e( 'Search', 'twentyeleven' ); ?></label>
+		<label for="s" class="assistive-text"><?php esc_html_e( 'Search', 'twentyeleven' ); ?></label>
 		<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
 		<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
 	</form>
diff --git src/wp-content/themes/twentyeleven/showcase.php src/wp-content/themes/twentyeleven/showcase.php
index c867b830d9..9db28cc81f 100644
--- src/wp-content/themes/twentyeleven/showcase.php
+++ src/wp-content/themes/twentyeleven/showcase.php
@@ -80,7 +80,7 @@ get_header(); ?>
 						?>
 
 					<div class="featured-posts">
-					<h1 class="showcase-heading"><?php _e( 'Featured Post', 'twentyeleven' ); ?></h1>
+					<h1 class="showcase-heading"><?php esc_html_e( 'Featured Post', 'twentyeleven' ); ?></h1>
 
 						<?php
 						// Let's roll.
@@ -173,7 +173,7 @@ get_header(); ?>
 				<?php endif; // End check for sticky posts. ?>
 
 				<section class="recent-posts">
-					<h1 class="showcase-heading"><?php _e( 'Recent Posts', 'twentyeleven' ); ?></h1>
+					<h1 class="showcase-heading"><?php esc_html_e( 'Recent Posts', 'twentyeleven' ); ?></h1>
 
 					<?php
 
diff --git src/wp-content/themes/twentyeleven/sidebar.php src/wp-content/themes/twentyeleven/sidebar.php
index 6dbc7c5461..bc37d9aa61 100644
--- src/wp-content/themes/twentyeleven/sidebar.php
+++ src/wp-content/themes/twentyeleven/sidebar.php
@@ -16,14 +16,14 @@ if ( 'content' !== $current_layout ) :
 			<?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
 
 				<aside id="archives" class="widget">
-					<h3 class="widget-title"><?php _e( 'Archives', 'twentyeleven' ); ?></h3>
+					<h3 class="widget-title"><?php esc_html_e( 'Archives', 'twentyeleven' ); ?></h3>
 					<ul>
 						<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
 					</ul>
 				</aside>
 
 				<aside id="meta" class="widget">
-					<h3 class="widget-title"><?php _e( 'Meta', 'twentyeleven' ); ?></h3>
+					<h3 class="widget-title"><?php esc_html_e( 'Meta', 'twentyeleven' ); ?></h3>
 					<ul>
 						<?php wp_register(); ?>
 						<li><?php wp_loginout(); ?></li>
diff --git src/wp-content/themes/twentyeleven/single.php src/wp-content/themes/twentyeleven/single.php
index 186bb378d8..bde18bba35 100644
--- src/wp-content/themes/twentyeleven/single.php
+++ src/wp-content/themes/twentyeleven/single.php
@@ -18,7 +18,7 @@ get_header(); ?>
 					?>
 
 					<nav id="nav-single">
-						<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
+						<h3 class="assistive-text"><?php esc_html_e( 'Post navigation', 'twentyeleven' ); ?></h3>
 						<span class="nav-previous"><?php previous_post_link( '%link', __( '<span class="meta-nav">&larr;</span> Previous', 'twentyeleven' ) ); ?></span>
 						<span class="nav-next"><?php next_post_link( '%link', __( 'Next <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></span>
 					</nav><!-- #nav-single -->
diff --git src/wp-content/themes/twentyeleven/tag.php src/wp-content/themes/twentyeleven/tag.php
index 23517622f0..0388b8f839 100644
--- src/wp-content/themes/twentyeleven/tag.php
+++ src/wp-content/themes/twentyeleven/tag.php
@@ -63,11 +63,11 @@ get_header(); ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentyeleven' ); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
+						<p><?php esc_html_e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->