diff --git a/themes/neff/layouts/_default/li.html b/themes/neff/layouts/_default/li.html
index 78c8664..3798075 100755
--- a/themes/neff/layouts/_default/li.html
+++ b/themes/neff/layouts/_default/li.html
@@ -14,7 +14,7 @@
                 &nbsp;<a href="{{ .RelPermalink }}">{{ i18n "read-more" }}&#8230;</a>
             {{- end -}}
             <footer>
-                <time class="list-item-lastmod" datetime="{{ .Lastmod }}">{{ .Lastmod.Format "02.01.2006 15:04" }}</time>
+                <time class="list-item-lastmod" datetime='{{ .Lastmod.Format "2006-01-02T15:04-07:00" }}'>{{ .Lastmod.Format "02.01.2006 15:04" }}</time>
             </footer>
         </div>
     </div>
diff --git a/themes/neff/layouts/partials/schema/article.jsonld b/themes/neff/layouts/partials/schema/article.jsonld
index b09754b..f44d3cd 100755
--- a/themes/neff/layouts/partials/schema/article.jsonld
+++ b/themes/neff/layouts/partials/schema/article.jsonld
@@ -23,8 +23,8 @@
 			{{ partial "schema/organization.jsonld" (dict "org" . "ctx" $context "short" true) }}
 		{{- end -}},
     "copyrightYear": "{{ .post.Date.Format "2006" }}",
-    "datePublished": "{{ .post.PublishDate | safeHTML }}",
-    "dateModified": "{{ .post.Lastmod | safeHTML }}",
+    "datePublished": {{ .post.PublishDate.Format "2006-01-02T15:04-07:00" | jsonify }},
+    "dateModified": {{ .post.Lastmod.Format "2006-01-02T15:04-07:00" | jsonify }},
     "url": "{{ .post.Permalink }}",
     "wordCount": "{{ .post.WordCount }}",
     "keywords": "{{ with .post.Keywords }}{{ delimit . ", " }}{{ end }}",
diff --git a/themes/neff/layouts/partials/schema/post.jsonld b/themes/neff/layouts/partials/schema/post.jsonld
index 2c795cf..87537a2 100755
--- a/themes/neff/layouts/partials/schema/post.jsonld
+++ b/themes/neff/layouts/partials/schema/post.jsonld
@@ -23,12 +23,10 @@
 			{{ partial "schema/organization.jsonld" (dict "org" . "ctx" $context "short" true) }}
 		{{- end -}},
     "copyrightYear": "{{ .post.Date.Format "2006" }}",
-    "datePublished": "{{ .post.PublishDate | safeHTML }}",
-    "dateModified": "{{ .post.Lastmod | safeHTML }}",
+    "datePublished": {{ .post.PublishDate.Format "2006-01-02T15:04-07:00" | jsonify }},
+    "dateModified": {{ .post.Lastmod.Format "2006-01-02T15:04-07:00" | jsonify }},
     "url": "{{ .post.Permalink }}",
     "wordCount": "{{ .post.WordCount }}",
     "keywords": "{{ with .post.Keywords }}{{ delimit . ", " }}{{ end }}",
-	{{ $imageURL := path.Join .post.RelPermalink "bilder/" .post.Params.featuredImage }}
-	"image": {{ partial "schema/image.jsonld" (dict "url" $imageURL "ctx" .ctx) }},
-  "articleBody": {{ .ctx.Content | jsonify }}
+    "articleBody": {{ delimit .post.PlainWords " " | jsonify }}
 }
diff --git a/themes/neff/layouts/partials/schema/site.jsonld b/themes/neff/layouts/partials/schema/site.jsonld
index 5c4d971..18df8ce 100755
--- a/themes/neff/layouts/partials/schema/site.jsonld
+++ b/themes/neff/layouts/partials/schema/site.jsonld
@@ -21,7 +21,7 @@
     {{ with .ctx.Site.Params.description }}
     "description": "{{ . }}",
     {{ end }}
-    "dateModified": "{{ .site.Lastmod }}",
-    "dateCreated": "{{ .site.PublishDate }}"
+    "datePublished": {{ .site.PublishDate.Format "2006-01-02T15:04-07:00" | jsonify }},
+    "dateModified": {{ .site.Lastmod.Format "2006-01-02T15:04-07:00" | jsonify }},
     {{ end }}
 }
\ No newline at end of file
diff --git a/themes/neff/layouts/partials/single.html b/themes/neff/layouts/partials/single.html
index 977a07a..31b2d51 100755
--- a/themes/neff/layouts/partials/single.html
+++ b/themes/neff/layouts/partials/single.html
@@ -17,6 +17,6 @@
 {{- end -}}
 <footer class="single-footer padding">
     <p>
-    <i class="fa fa-calendar"></i> <time datetime='{{ .Lastmod.Format "2006-01-02T15:04-06:00" }}'>{{ .Lastmod.Format "02.01.2006 15:04" }}</time>
+    <i class="fa fa-calendar"></i> <time datetime='{{ .Lastmod.Format "2006-01-02T15:04-07:00" }}'>{{ .Lastmod.Format "02.01.2006 15:04" }}</time>
     </p>
 </footer>
\ No newline at end of file