diff --git a/templates/entry-meta.php b/templates/entry-meta.php
index 7061f47..e0ba57e 100644
--- a/templates/entry-meta.php
+++ b/templates/entry-meta.php
@@ -1,2 +1,2 @@
-<time class="updated" datetime="<?php echo get_the_time('c'); ?>" pubdate><?php echo get_the_date(); ?></time>
+<time class="published" datetime="<?php echo get_the_time('c'); ?>"><?php echo get_the_date(); ?></time>
 <p class="byline author vcard"><?php echo __('By', 'roots'); ?> <a href="<?php echo get_author_posts_url(get_the_author_meta('ID')); ?>" rel="author" class="fn"><?php echo get_the_author(); ?></a></p>
diff --git a/templates/searchform.php b/templates/searchform.php
index 81b560a..ab85998 100644
--- a/templates/searchform.php
+++ b/templates/searchform.php
@@ -1,9 +1,9 @@
-<form role="search" method="get" id="searchform" class="form-inline" action="<?php echo home_url('/'); ?>">
+<form role="search" method="get" class="search-form form-inline" action="<?php echo home_url('/'); ?>">
   <div class="input-group">
-    <input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" id="s" class="form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
-    <label class="hide" for="s"><?php _e('Search for:', 'roots'); ?></label>
+    <input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
+    <label class="hide"><?php _e('Search for:', 'roots'); ?></label>
     <span class="input-group-btn">
-      <button type="submit" id="searchsubmit" class="btn btn-default"><?php _e('Search', 'roots'); ?></button>
+      <button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'roots'); ?></button>
     </span>
   </div>
 </form>