diff --git a/wp-content/themes/twentythirteen/comments.php b/wp-content/themes/twentythirteen/comments.php
index d80a6e60f5..85b2afc1c5 100644
--- a/wp-content/themes/twentythirteen/comments.php
+++ b/wp-content/themes/twentythirteen/comments.php
@@ -50,6 +50,6 @@ if ( post_password_required() )
 
 	<?php endif; // have_comments() ?>
 
-	<?php comment_form(); ?>
+	<?php comment_form( array( 'format' => 'html5' ) ); ?>
 
 </div><!-- #comments -->
\ No newline at end of file
diff --git a/wp-content/themes/twentythirteen/rtl.css b/wp-content/themes/twentythirteen/rtl.css
index 518f69f485..de6ca8dcf4 100644
--- a/wp-content/themes/twentythirteen/rtl.css
+++ b/wp-content/themes/twentythirteen/rtl.css
@@ -652,10 +652,7 @@ div.nav-menu > ul {
 	content: normal;
 }
 
-#commentform label[for="author"],
-#commentform label[for="email"],
-#commentform label[for="url"],
-#commentform label[for="comment"] {
+#commentform label {
 	float: right;
 }
 
diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css
index ac4d208939..0b3b94e29b 100644
--- a/wp-content/themes/twentythirteen/style.css
+++ b/wp-content/themes/twentythirteen/style.css
@@ -2393,10 +2393,7 @@ footer.entry-meta {
 	margin-bottom: 8px;
 }
 
-#commentform label[for="author"],
-#commentform label[for="email"],
-#commentform label[for="url"],
-#commentform label[for="comment"] {
+#commentform label {
 	float: left;
 	padding: 5px 0;
 	width: 100px;
@@ -2406,7 +2403,9 @@ footer.entry-meta {
 	color: #ed331c;
 }
 
-#commentform input[type="text"] {
+#commentform input[type="text"],
+#commentform input[type="email"],
+#commentform input[type="url"] {
 	max-width: 270px;
 	width: 60%;
 }
@@ -3027,7 +3026,9 @@ footer.entry-meta {
 		width:         calc(100% - 104px);
 	}
 
-	#commentform input[type="text"] {
+	#commentform input[type="text"],
+	#commentform input[type="email"],
+	#commentform input[type="url"] {
 		width: -webkit-calc(100% - 100px);
 		width:         calc(100% - 100px);
 	}