diff --git a/themes/nluug/layouts/partials/head.html b/themes/nluug/layouts/partials/head.html
index bbde381..1b17134 100644
--- a/themes/nluug/layouts/partials/head.html
+++ b/themes/nluug/layouts/partials/head.html
@@ -15,11 +15,5 @@
     {{ partialCached "style.html" . }}
 
     <!-- Schema.org opmaak -->
-    {{ if .IsHome -}}
-      {{ partial "schemas/schema_WebSite.html" . }}
-    {{- else if .IsPage -}}
-      {{ if or (in .Params.content_types "Person") }}
-        {{ partial "schemas/schema_Person.html" . }}
-      {{ end }}
-    {{ end }}
+    {{ partial "schemas/include-relevant-schemas.html" . }}
 </head>
diff --git a/themes/nluug/layouts/partials/schemas/include-relevant-schemas.html b/themes/nluug/layouts/partials/schemas/include-relevant-schemas.html
new file mode 100644
index 0000000..ce66cb7
--- /dev/null
+++ b/themes/nluug/layouts/partials/schemas/include-relevant-schemas.html
@@ -0,0 +1,12 @@
+{{ if .IsHome -}}
+
+  {{ partial "schemas/schema_Organization.html" . }}
+  {{ partial "schemas/schema_WebSite.html" . }}
+
+{{- else if .IsPage -}}
+
+  {{ if or (in .Params.content_types "Person") }}
+    {{ partial "schemas/schema_Person.html" . }}
+  {{ end }}
+
+{{ end }}
diff --git a/themes/nluug/layouts/partials/schemas/schema_Organization.html b/themes/nluug/layouts/partials/schemas/schema_Organization.html
new file mode 100644
index 0000000..2260687
--- /dev/null
+++ b/themes/nluug/layouts/partials/schemas/schema_Organization.html
@@ -0,0 +1,8 @@
+<script type="application/ld+json">
+  {
+    "@context": "https://schema.org/",
+    "@type": "Organization",
+    "url": "{{ .Site.BaseURL }}",
+    "logo": "{{ .Site.Params.logoHiRes | absURL | default .Site.Params.textEmptyValue }}"
+  }
+</script>
diff --git a/themes/nluug/layouts/partials/schemas/schema_Person.html b/themes/nluug/layouts/partials/schemas/schema_Person.html
index e8d394c..791e188 100644
--- a/themes/nluug/layouts/partials/schemas/schema_Person.html
+++ b/themes/nluug/layouts/partials/schemas/schema_Person.html
@@ -3,62 +3,43 @@
 {{ $location := index .Site.Data.location .Site.Params.primarylocation }}
 <script type="application/ld+json">
 {
-"@context": "http://www.schema.org",
+"@context": "https://www.schema.org",
 "@type": "Person",
 "@id": "{{ .Permalink }}",
-"name": "{{ $author.name }}",
+"name": "{{ $author.name | default .Site.Params.textEmptyValue }}",
 "alternateName": "{{ $author.name }}",
 {{ if $author.nationality }}"nationality": "{{ $author.nationality }}",{{ end }}
-{{ if $author.address }}
-"birthPlace" : {
-	"@type": "Place",
-    "address": {
-  		"@type": "PostalAddress",
-		"addressLocality": "{{ $author.address.city }}",
-		"addressRegion": "{{ $author.address.region }}",
-        "addressCountry": "{{ $author.address.country }}"
-	}
-},{{ end }}
 "affiliation": [
-	{
-		"@type": "Organization",
-		"name": "{{ .Site.Params.name }}",
-		"sameAs": [ {{ partial "schemas/schema_Social.html" .Site.Params }}
-		]
-  	}
+ {
+  "@type": "Organization",
+  "name": "{{ .Site.Params.name }}",
+  "sameAs": [ {{ partial "schemas/schema_Social.html" .Site.Params }}
+  ]
+ }
 ],
-{{ if $author.education }}
-"alumniOf": [
-	{
-	 "@type": "CollegeOrUniversity",
-	 "name": "{{ $author.education.university }}",
-	 "sameAs": "{{ $author.education.url }}"
-	}
-],
-{{ end }}
 {{ if $author.gender }}"gender": "{{ $author.gender }}",{{ end }}
 {{ if $author.jobfunction }}"Description": "{{ $author.jobfunction }}",{{ end }}
 {{ if $author.description }}"disambiguatingDescription": "{{ $author.description }},{{ end }}
 {{ if $author.jobtitle }}"jobTitle": "{{ $author.jobtitle }}",{{ end }}
 "worksFor": [
-	{
-		"@type": "Organization",
-		"name": "{{ .Site.Params.name }}",
-		"sameAs": [ {{ partial "schemas/schema_Social.html" .Site.Params }}
-		]
-	}
+ {
+  "@type": "Organization",
+  "name": "{{ .Site.Params.name | default .Site.Params.textEmptyValue }}",
+  "sameAs": [ {{ partial "schemas/schema_Social.html" .Site.Params }}
+  ]
+ }
 ],
 "url": "{{ .Site.BaseURL }}",
 "image": "{{ $author.thumbnail | absURL }}",
 {{ if $author.address }}
 "address": {
-	"@type": "PostalAddress",
-	"addressLocality": "{{ $author.address.city }}",
-	"addressRegion": "{{ $author.address.region }}",
-	"addressCountry": "{{ $author.address.country }}"
+ "@type": "PostalAddress",
+ "addressLocality": "{{ $author.address.city }}",
+ "addressRegion": "{{ $author.address.region }}",
+ "addressCountry": "{{ $author.address.country }}"
 },{{ end }}
 "sameAs": [ {{ partial "schemas/schema_Social.html" $author }}
-	]
+ ]
 }
 </script>
 {{ end }}
diff --git a/themes/nluug/layouts/partials/schemas/schema_WebSite.html b/themes/nluug/layouts/partials/schemas/schema_WebSite.html
index 7ec3b2d..4e68451 100644
--- a/themes/nluug/layouts/partials/schemas/schema_WebSite.html
+++ b/themes/nluug/layouts/partials/schemas/schema_WebSite.html
@@ -5,13 +5,13 @@
  {
   "@context": "https://schema.org",
   "@type": "Webpage",
-  "specialty": "{{ .Site.Params.description | default .Site.Params.textNoTitle }}",
+  "specialty": "{{ .Site.Params.description | default .Site.Params.textEmptyValue }}",
   "mainContentOfPage": {
    "@context": "https://schema.org/",
    "@type": "WebPageElement",
    "cssSelector": ".body-contentTODO"
   },
-  "primaryImageOfPage": "{{ .Site.Params.imageurl | absURL }}"
+  "primaryImageOfPage": "{{ .Site.Params.imageurl | absURL | default .Site.Params.textEmptyValue }}"
  },
 	{
 		"@context": "https://schema.org",