diff --git a/jsonld_templates/website.jsonld b/jsonld_templates/website.jsonld
new file mode 100644
index 0000000..f797952
--- /dev/null
+++ b/jsonld_templates/website.jsonld
@@ -0,0 +1,70 @@
+[
+    {
+        "@context": "http://schema.org",
+        "@type": "Webpage",
+        "specialty": "{{description}}",
+        "mainContentOfPage": {
+            "@context": "http://schema.org/",
+            "@type": "WebPageElement",
+            "cssSelector": ".page-content"
+        }
+    },
+    {
+        "@context": "http://schema.org",
+        "@type": "WebSite",
+        "additionalType": [
+            "CreativeWork",
+            "Person"
+        ],
+        "url": "{{url}}",
+        "name": "Evan Pratten",
+        "alternateName": "ewpratten",
+        "headline": "{{title}}",
+        "image": "{{avatar}}",
+        "inLanguage": "en-CA",
+        "author": "Evan Pratten",
+        "description": "{{description}}",
+        "disambiguatingDescription": "Personal website of Evan Pratten",
+        "publisher": {
+            "@type": "Organization",
+            "name": "Evan Pratten",
+            "url": "https://va3zza.com",
+            "logo": {
+                "@type": "ImageObject",
+                "url": "{{avatar}}",
+                "width": "460",
+                "height": "460"
+            }
+        },
+        "potentialAction": {
+            "@type": "SearchAction",
+            "target": "{{url}}/search?q={search_term_string}",
+            "query-input": "required name=search_term"
+        },
+        "keywords": [
+            "Evan Pratten",
+            "Software",
+            "Music",
+            "Photography",
+            "Hobby",
+            "Blog"
+        ]
+    },
+    {
+        "@context": "https://schema.org",
+        "@graph": [
+            {
+                "@context": "https://schema.org",
+                "@type": "SiteNavigationElement",
+                "name": "Blog",
+                "url": "{{url}}/blog"
+            },
+            {
+                "@context": "https://schema.org",
+                "@type": "SiteNavigationElement",
+                "name": "Contact",
+                "url": "{{url}}/contact"
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/static/person.jsonld b/static/person.jsonld
index e41b5a9..17ae030 100644
--- a/static/person.jsonld
+++ b/static/person.jsonld
@@ -2,6 +2,7 @@
     "@context": "http://www.schema.org",
     "@type": "person",
     "name": "Evan Pratten",
+    "alternateName": "ewpratten",
     "nationality": "Canadian",
     "jobTitle": "Pipeline Software Developer",
     "description":"Software Developer",
@@ -67,5 +68,5 @@
         "https://twitter.com/ewpratten",
         "https://www.wikidata.org/wiki/Q111170999"
     ],
-    "mainEntity": "https://www.wikidata.org/wiki/Q111170999"
+    "mainEntityOfPage": "True"
 }
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 49bbf58..fae46d5 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -14,20 +14,16 @@
   {% if person_ld %}{{person_ld | safe}}{% endif %}
 </script>
 <script type="application/ld+json">
-  {
-    "@context": "https://schema.org",
-    "@type": "WebSite",
-    "url": "https://va3zza.com/",
-    "about": "{{config.description}}",
-    "potentialAction": [{
-      "@type": "SearchAction",
-      "target": {
-        "@type": "EntryPoint",
-        "urlTemplate": "https://va3zza.com/search?q={search_term_string}"
-      },
-      "query-input": "required name=search_term_string"
-    }]
-  }
+  {# Import our template file #}
+  {% set template = load_data(path="jsonld_templates/website.jsonld") %}
+  {# Now we can fill in any additional data #}
+  {{ template | 
+      replace(from="{{url}}", to=config.base_url) | 
+      replace(from="{{title}}", to=section.title) | 
+      replace(from="{{description}}", to=config.description) | 
+      replace(from="{{avatar}}", to=config.extra.profile_photo) | 
+      safe 
+  }}
 </script>
 {% endblock head %}