diff --git a/layouts/_default/section.html b/layouts/_default/section.html
index 1fdac193..4ad891b6 100644
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -60,17 +60,17 @@
                 </article>
                 </section>
                 {{ else }}
-                <article data-post-type="{{ .Params.posttype }}" data-post-id="{{ .Params.slug }}" class="h-entry" id="response">
+                <article class="{{ .Params.posttype }} h-entry entry" id="response">
                       <section class="author" style="display:none;">
                         <a rel="author" class="p-author  h-card" rel="me" href="https://jk.nipponalba.scot"><img src="/images/profile.jpg"/><div class="title">{{ .Site.Params.Title }}</div></a>
                       </section>
-                      <section class="h-cite"><p>{{ .Site.Params.Title }}
+                      <section class="xrayReply"><p>{{ .Site.Params.Title }}
                           {{ if eq .Params.posttype "like-of" }} liked  <i class="fa fa-thumbs-up fa-1.5x fa-fw" aria-hidden="true" title="Likes"></i> <a href="{{ .Params.xAuthorUrl }}" target="_blank">{{ .Params.xAuthor }}</a>'s <a href="{{ index .Params "like-of" }}" class="u-like-of">{{ .Params.xPostType }}</a>{{ end }}
                           {{ if eq .Params.posttype "in-reply-to" }} replied to  <i class="fa fa-comment fa-1.5x fa-fw" aria-hidden="true" title="Likes"></i> <a href="{{ .Params.xAuthorUrl }}" target="_blank">{{ .Params.xAuthor }}</a>'s <a href="{{ index .Params "in-reply-to" }}" class="u-in-reply-to">{{ .Params.xPostType }}</a>{{ end }}
                           {{ if eq .Params.posttype "repost-of"  }}  shared  <i class="fa fa-share fa-1.5x fa-fw" aria-hidden="true" title="Likes"></i> <a href="{{ .Params.xAuthorUrl }}" target="_blank">{{ .Params.xAuthor }}</a>'s <a href="{{ index .Params "repost-of" }}" class="u-repost-of">{{ .Params.xPostType }}</a>{{ end }}</p>
                           {{ if .Params.xContent }}<section class="replyContext"><span class="remotePhoto"><a href="{{ .Params.xAuthorUrl }}" target="_blank"><img src="{{ .Params.xPhoto }}" title="{{ .Params.xAuthor }}" alt="{{ .Params.xAuthor }}'s avatar"/></a></span><span class="response-date">{{ dateFormat "Mon, 02 Jan 2006 15:04:05 GMT" .Params.xPublished }}</span><span class="response-text">{{ plainify .Params.xContent }}
                           {{ if .Params.xContentPhoto }}<br/><br/>{{ range .Params.xContentPhoto }}<img class="u-photo xContentPhoto" src="{{ . }}"/>{{ end }}{{ end }}</span></section>{{end}}
-                          {{ if .Content }}<br/>{{ .Content }}{{ end }}
+                          {{ if .Content }}<section class="e-content p-name"><br/>{{ .Content }}</section>{{ end }}
                           {{ if not (eq .Type "article") }}<section class="info">
                               <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><span class="info-date"><a href="{{ .Permalink }}" class="u-url"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></a></span><br/>
                               </section>{{ end }}
diff --git a/themes/nipponalba/layouts/_default/single.html b/themes/nipponalba/layouts/_default/single.html
index 14967d40..07973f0b 100644
--- a/themes/nipponalba/layouts/_default/single.html
+++ b/themes/nipponalba/layouts/_default/single.html
@@ -89,17 +89,17 @@
 {{ end }}</section>
 {{ end }}</section>
 {{ else }}
-<article data-post-type="{{ .Params.posttype }}" data-post-id="{{ .Params.slug }}" class="h-entry entry" id="response">
+<article class="{{ .Params.posttype }} h-entry entry" id="response">
       <section class="author" style="display:none;">
         <a rel="author" class="p-author  h-card" rel="me" href="https://jk.nipponalba.scot"><img src="/images/profile.jpg"/><div class="title">{{ .Site.Params.Title }}</div></a>
       </section>
-      <section class="h-cite"><p>{{ .Site.Params.Title }}
+      <section class="xrayReply"><p>{{ .Site.Params.Title }}
           {{ if eq .Params.posttype "like-of" }} liked  <i class="fa fa-thumbs-up fa-1.5x fa-fw" aria-hidden="true" title="Likes"></i> <a href="{{ .Params.xAuthorUrl }}" target="_blank">{{ .Params.xAuthor }}</a>'s <a href="{{ index .Params "like-of" }}" class="u-like-of u-target">{{ .Params.xPostType }}</a>{{ end }}
           {{ if eq .Params.posttype "in-reply-to" }} replied to  <i class="fa fa-comment fa-1.5x fa-fw" aria-hidden="true" title="Likes"></i> <a href="{{ .Params.xAuthorUrl }}" target="_blank">{{ .Params.xAuthor }}</a>'s <a href="{{ index .Params "in-reply-to" }}" class="u-in-reply-to u-target">{{ .Params.xPostType }}</a>{{ end }}
           {{ if eq .Params.posttype "repost-of"  }}  shared  <i class="fa fa-share fa-1.5x fa-fw" aria-hidden="true" title="Likes"></i> <a href="{{ .Params.xAuthorUrl }}" target="_blank">{{ .Params.xAuthor }}</a>'s <a href="{{ index .Params "repost-of" }}" class="u-repost-of u-target">{{ .Params.xPostType }}</a>{{ end }}</p>
           {{ if .Params.xContent }}<section class="replyContext"><span class="remotePhoto"><a href="{{ .Params.xAuthorUrl }}" target="_blank"><img src="{{ .Params.xPhoto }}" title="{{ .Params.xAuthor }}" alt="{{ .Params.xAuthor }}'s avatar"/></a></span><span class="response-date">{{ dateFormat "Mon, 02 Jan 2006 15:04:05 GMT" .Params.xPublished }}</span><span class="response-text">{{ plainify .Params.xContent }}
           {{ if .Params.xContentPhoto }}<br/><br/>{{ range .Params.xContentPhoto }}<img class="u-photo xContentPhoto" src="{{ . }}"/>{{ end }}{{ end }}</span></section>{{end}}
-          {{ if .Content }}<section class="p-name e-content"><br/>{{ .Content }}</section>{{ end }}
+          {{ if .Content }}<section class="e-content p-name"><br/>{{ .Content }}</section>{{ end }}
           </section>
           {{ if not (eq .Type "article") }}<section class="info">
           </section>{{ end }}
diff --git a/themes/nipponalba/static/css/style.css b/themes/nipponalba/static/css/style.css
index 35523412..85207c55 100644
--- a/themes/nipponalba/static/css/style.css
+++ b/themes/nipponalba/static/css/style.css
@@ -488,7 +488,7 @@ margin-bottom: 300px;
   max-width:700px;
   padding: 10px;
 }
-#response .h-cite .replyContext{
+#response .xrayReply .replyContext{
   background-color: var(--border-colour);
   display:grid;
   min-height: 80px;