diff --git a/core/modules/comment/templates/comment.html.twig b/core/modules/comment/templates/comment.html.twig
index 575510f..0ddc465 100644
--- a/core/modules/comment/templates/comment.html.twig
+++ b/core/modules/comment/templates/comment.html.twig
@@ -74,7 +74,7 @@
   the server which comments are new for the user. Rendering the final
   "new" indicator here would break the render cache.
   #}
-  <mark class="hidden new" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
+  <mark data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
 
   {% if title %}
     <h3{{ title_attributes }}>{{ title }}</h3>
@@ -84,7 +84,7 @@
 
   <footer>
     {{ user_picture }}
-    <p class="submitted">{{ submitted }}</p>
+    <p>{{ submitted }}</p>
 
     {#
       Indicate the semantic relationship between parent and child comments
@@ -92,7 +92,7 @@
       reader without this information.
     #}
     {% if parent %}
-      <p class="parent visually-hidden">{{ parent }}</p>
+      <p>{{ parent }}</p>
     {% endif %}
 
     {{ permalink }}
@@ -102,7 +102,7 @@
     {{ content|without('links') }}
 
     {% if signature %}
-      <div class="user-signature">
+      <div>
         {{ signature }}
       </div>
     {% endif %}
diff --git a/core/modules/comment/templates/comment.html.twig b/core/themes/classy/comment/comment.html.twig
similarity index 100%
copy from core/modules/comment/templates/comment.html.twig
copy to core/themes/classy/comment/comment.html.twig
diff --git a/core/themes/classy/comment/field--comment.html.twig b/core/themes/classy/comment/field--comment.html.twig
new file mode 100644
index 0000000..9aae572
--- /dev/null
+++ b/core/themes/classy/comment/field--comment.html.twig
@@ -0,0 +1,39 @@
+{#
+/**
+ * @file
+ * Default theme override for comment fields.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional title output populated by modules, intended to
+ *   be displayed after the main title tag that appears in the template.
+ * - comments: List of comments rendered through comment.html.twig.
+ * - content_attributes: HTML attributes for the form title.
+ * - comment_form: The 'Add new comment' form.
+ * - comment_display_mode: Is the comments are threaded.
+ * - comment_type: The comment type bundle ID for the comment field.
+ *
+ * @see template_preprocess_field()
+ * @see comment_preprocess_field()
+ */
+#}
+<section{{ attributes }}>
+  {% if comments and not label_hidden %}
+    {{ title_prefix }}
+    <h2{{ title_attributes }}>{{ label }}</h2>
+    {{ title_suffix }}
+  {% endif %}
+
+  {{ comments }}
+
+  {% if comment_form %}
+    <h2{{ content_attributes }}>{{ 'Add new comment'|t }}</h2>
+    {{ comment_form }}
+  {% endif %}
+
+</section>