diff --git a/_layouts/default.html b/_layouts/default.html
index 4313323..bd2b3f4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -31,7 +31,7 @@
 </head>
 <body itemscope itemtype="http://schema.org/Blog">
     <meta itemprop="isBasedOnUrl" content="https://github.com/mbirth/wiki" />
-    <meta itemprop="image" content="{{ site.url }}/images/sitelogo.png" />
+    <link itemprop="image" href="{{ site.url }}/images/sitelogo.png" />
     <header>
         <div class="container">
             <div id="headerleft">
@@ -59,19 +59,19 @@
             </section>
         {% endif %}
         <article itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting">
-            <h1 id="pagetitle" itemprop="name">{{ page.title }}</h1>
+            <h1 id="pagetitle" itemprop="name headline">{{ page.title }}</h1>
             <div itemprop="author" itemscope itemtype="http://schema.org/Person">
                 <meta itemprop="name" content="Markus Birth" />
                 <meta itemprop="givenName" content="Markus" />
                 <meta itemprop="familyName" content="Birth" />
                 <meta itemprop="birthDate" content="1980-11-16" />
             </div>
-            <meta itemprop="headline" content="{{ page.title }}" />
             <meta itemprop="articleSection" content="{{ page.categories[0] }}" />
             <meta itemprop="keywords" content="{{ page.tags | join: ',' }}" />
             <meta itemprop="dateCreated" content="{{ page.created | date: '%Y-%m-%d' }}" />
             <meta itemprop="dateModified" content="{{ page.updated | date: '%Y-%m-%d' }}" />
             <meta itemprop="datePublished" content="{{ page.created | date: '%Y-%m-%d' }}" />
+            <meta itemprop="mainEntityOfPage" content="{{ page.url }}" />
             {% if page.language == 'de' %}
                 <meta itemprop="inLanguage" content="de" />
             {% else %}
diff --git a/index.html b/index.html
index 3d67cff..1a69fef 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,6 @@
 title: Welcome to wiki.mbirth.de
 layout: default
 ---
-{% raw %}{::nomarkdown}{% endraw %}
 <script type="application/ld+json">
 {
     "@context": "http://schema.org",
@@ -15,16 +14,16 @@ layout: default
     }
 }
 </script>
-{% raw %}{:/nomarkdown}{% endraw %}
 
 <h3>Latest posts ({{ site.posts | size }} total):</h3>
 
 <ul>
 {% for post in paginator.posts %}
-    <li itemscope itemtype="http://schema.org/BlogPosting"><a itemprop="url" href="{{ post.url }}"><span itemprop="dateModified">{{ post.date | date: "%Y-%m-%d" }}</span> - <span itemprop="name">{{ post.title }}</span></a>
+    <li itemscope itemtype="http://schema.org/BlogPosting"><a itemprop="url" href="{{ post.url }}"><span itemprop="dateModified">{{ post.date | date: "%Y-%m-%d" }}</span> - <span itemprop="name headline">{{ post.title }}</span></a>
         <meta itemprop="datePublished" content="{{ post.created | date: '%Y-%m-%d' }}" />
-        <meta itemprop="headline" content="{{ post.title }}" />
-        <meta itemprop="author" content="mbirth" />
+        <div itemprop="author publisher" itemscope itemtype="http://schema.org/Person">
+          <meta itemprop="name" content="Markus Birth" />
+        </div>
     {% if post.language == 'de' %}
         <img class="emoji" title="&#x3a;de&#x3a;" alt="&#x3a;de&#x3a;" src="https://assets-cdn.github.com/images/icons/emoji/de.png" width="20" height="20" align="absmiddle" />
         <meta itemprop="inLanguage" content="de" />
