diff --git a/wp-content/themes/twentythirteen/404.php b/wp-content/themes/twentythirteen/404.php
index 2ebae0a63d..8a57e7fe4e 100644
--- a/wp-content/themes/twentythirteen/404.php
+++ b/wp-content/themes/twentythirteen/404.php
@@ -21,7 +21,7 @@ get_header(); ?>
 					<h2><?php _e( 'This is somewhat embarrassing, isn&rsquo;t it?', 'twentythirteen' ); ?></h2>
 					<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentythirteen' ); ?></p>
 
-					<?php get_search_form(); ?>
+					<?php get_search_form( true, 'html5' ); ?>
 				</div><!-- .page-content -->
 			</div><!-- .page-wrapper -->
 
diff --git a/wp-content/themes/twentythirteen/comments.php b/wp-content/themes/twentythirteen/comments.php
index d52ae084a8..d80a6e60f5 100644
--- a/wp-content/themes/twentythirteen/comments.php
+++ b/wp-content/themes/twentythirteen/comments.php
@@ -38,7 +38,7 @@ if ( post_password_required() )
 			if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
 		?>
 		<nav class="navigation comment-navigation" role="navigation">
-			<h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
+			<h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentythirteen' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentythirteen' ) ); ?></div>
 		</nav>
diff --git a/wp-content/themes/twentythirteen/content-none.php b/wp-content/themes/twentythirteen/content-none.php
index 35ce2b18ad..1d0a890716 100644
--- a/wp-content/themes/twentythirteen/content-none.php
+++ b/wp-content/themes/twentythirteen/content-none.php
@@ -20,12 +20,12 @@
 	<?php elseif ( is_search() ) : ?>
 
 	<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with different keywords.', 'twentythirteen' ); ?></p>
-	<?php get_search_form(); ?>
+	<?php get_search_form( true, 'html5' ); ?>
 
 	<?php else : ?>
 
 	<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentythirteen' ); ?></p>
-	<?php get_search_form(); ?>
+	<?php get_search_form( true, 'html5' ); ?>
 
 	<?php endif; ?>
 </div><!-- .page-content -->
diff --git a/wp-content/themes/twentythirteen/css/ie.css b/wp-content/themes/twentythirteen/css/ie.css
index df93663995..f1ad206ed6 100644
--- a/wp-content/themes/twentythirteen/css/ie.css
+++ b/wp-content/themes/twentythirteen/css/ie.css
@@ -32,7 +32,7 @@ Styles for older IE versions (previous to IE9).
 	left: 100%;
 }
 
-.site-header .searchform .field {
+.site-header .searchform [type="search"] {
 	padding-top: 6px;
 }
 
@@ -174,8 +174,7 @@ img.alignleft {
 	width: 13px;
 }
 
-.ie7 .assistive-text,
-.ie7 .site .screen-reader-text {
+.ie7 .screen-reader-text {
 	clip: rect(1px 1px 1px 1px); /* IE7 */
 }
 
@@ -204,7 +203,7 @@ img.alignleft {
 	left: 100%;
 }
 
-.ie7 .site-header .searchform .field {
+.ie7 .site-header .searchform [type="search"] {
 	background-color: #fff;
 	border: 2px solid #c3c0ab;
 	cursor: text;
diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
index f566160b9e..cb353f727c 100644
--- a/wp-content/themes/twentythirteen/functions.php
+++ b/wp-content/themes/twentythirteen/functions.php
@@ -303,7 +303,7 @@ function twentythirteen_paging_nav() {
 		return;
 	?>
 	<nav class="navigation paging-navigation" role="navigation">
-		<h1 class="assistive-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
+		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
 		<div class="nav-links">
 
 			<?php if ( get_next_posts_link() ) : ?>
@@ -339,7 +339,7 @@ function twentythirteen_post_nav() {
 		return;
 	?>
 	<nav class="navigation post-navigation" role="navigation">
-		<h1 class="assistive-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1>
+		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1>
 		<div class="nav-links">
 
 			<?php previous_post_link( '%link', _x( '<span class="meta-nav">&larr;</span> %title', 'Previous post link', 'twentythirteen' ) ); ?>
diff --git a/wp-content/themes/twentythirteen/header.php b/wp-content/themes/twentythirteen/header.php
index e59aa2ba64..d3a662b9fa 100644
--- a/wp-content/themes/twentythirteen/header.php
+++ b/wp-content/themes/twentythirteen/header.php
@@ -49,9 +49,9 @@ $html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
 			<div id="navbar" class="navbar">
 				<nav id="site-navigation" class="navigation main-navigation" role="navigation">
 					<h3 class="menu-toggle"><?php _e( 'Menu', 'twentythirteen' ); ?></h3>
-					<a class="assistive-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a>
+					<a class="screen-reader-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a>
 					<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
-					<?php get_search_form(); ?>
+					<?php get_search_form( true, 'html5' ); ?>
 				</nav><!-- #site-navigation -->
 			</div><!-- #navbar -->
 		</header><!-- #masthead -->
diff --git a/wp-content/themes/twentythirteen/searchform.php b/wp-content/themes/twentythirteen/searchform.php
deleted file mode 100644
index 604039ba7f..0000000000
--- a/wp-content/themes/twentythirteen/searchform.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * The template for displaying search forms in Twenty Thirteen.
- *
- * @package WordPress
- * @subpackage Twenty_Thirteen
- * @since Twenty Thirteen 1.0
- */
-?>
-<form method="get" id="searchform" class="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">
-	<label for="s" class="assistive-text"><?php _ex( 'Search', 'assistive text', 'twentythirteen' ); ?></label>
-	<input type="search" class="field" name="s" value="<?php echo esc_attr( get_search_query() ); ?>" id="s" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'twentythirteen' ); ?>" />
-	<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php echo esc_attr_x( 'Search', 'submit button', 'twentythirteen' ); ?>" />
-</form>
diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css
index 02b3a071e7..ad971a41d8 100644
--- a/wp-content/themes/twentythirteen/style.css
+++ b/wp-content/themes/twentythirteen/style.css
@@ -537,14 +537,14 @@ hr {
 }
 
 /* Assistive text */
-.assistive-text {
+.screen-reader-text {
 	position: absolute !important;
 	clip: rect(1px, 1px, 1px, 1px);
 }
 
-.assistive-text:hover,
-.assistive-text:active,
-.assistive-text:focus {
+.screen-reader-text:hover,
+.screen-reader-text:active,
+.screen-reader-text:focus {
 	background-color: #f1f1f1;
 	border-radius: 3px;
 	box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
@@ -926,13 +926,13 @@ ul.nav-menu li:hover > ul,
 	width: 100%;
 }
 
-.main-navigation .searchform {
+.site-header .searchform {
 	position: absolute;
 	right: 0;
 	top: 1px;
 }
 
-.site-header .searchform .field {
+.site-header .searchform [type="search"] {
 	background-color: transparent;
 	background-image: url(images/search-icon.png);
 	background-position: 5px center;
@@ -949,7 +949,7 @@ ul.nav-menu li:hover > ul,
 	width: 0;
 }
 
-.site-header .searchform .field:focus {
+.site-header .searchform [type="search"]:focus {
 	background-color: #fff;
 	border: 2px solid #c3c0ab;
 	cursor: text;
@@ -2549,11 +2549,11 @@ footer.entry-meta {
 }
 
 /* Search widget */
-.searchform .submit {
+.searchform [type="submit"] {
 	display: none;
 }
 
-.widget .searchform .field {
+.widget .searchform [type="text"] {
 	width: 100%;
 }
 
@@ -3162,7 +3162,7 @@ footer.entry-meta {
 	(-webkit-min-device-pixel-ratio: 1.25),
 	(min-resolution: 120dpi) {
 
-	.site-header .searchform .field {
+	.site-header .searchform [type="search"] {
 		background-image: url(images/search-icon-2x.png);
 	}
 
@@ -3182,8 +3182,8 @@ footer.entry-meta {
 		font-size: 10pt;
 	}
 
-	footer a[rel=bookmark]:link:after,
-	footer a[rel=bookmark]:visited:after {
+	footer a[rel="bookmark"]:link:after,
+	footer a[rel="bookmark"]:visited:after {
 		content: " [" attr(href) "] "; /* Show URLs */
 	}