diff --git a/404.html b/404.html
index ab27a57..d391096 100644
--- a/404.html
+++ b/404.html
@@ -2,13 +2,14 @@
 layout: default
 title: 404 - Page not found!
 permalink: /404.html
+sitemap: false
 ---
 <article class="post">
   <header class="post-header wrapper">
-    <h2 class="post-title">404 - Page not found!</h2>
+    <h2 class="post-title">404</h2>
+    <h3>Irgendwas ist schiefgelaufen.</h3>
   </header>
   <section class="post-content wrapper">
-    <p>Looks like you've followed a broken link or entered a URL that doesn't exist on this site.</p>
-    <p><a href="/">Back to my Site</a></p>
+    <p>Hier k&ouml;nnte jetzt ein kreativer Text stehen, tut es aber nicht.</p>
   </section>
 </article>
diff --git a/500.html b/500.html
index 64b1cf8..4ff564f 100644
--- a/500.html
+++ b/500.html
@@ -2,13 +2,14 @@
 layout: default
 title: 500 - Internal Server Error
 permalink: /500.html
+sitemap: false
 ---
 
 <article class="post">
   <header class="post-header wrapper">
-    <h2 class="post-title">500 - Internal Server Error</h2>
+    <h2 class="post-title">500</h2>
+    <h3>Internal Server Error</h2>
   </header>
   <section class="post-content wrapper">
-    <p><a href="/">Back to my Site</a></p>
   </section>
 </article>
diff --git a/README.md b/README.md
index ee275c1..89e028f 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,30 @@
 # www.nicojensen.de
-Repo zu meiner Webseite basierend auf [Jekyll](https://jekyllrb.com/).
+Repo zu meiner Webseite 
+Diese Webseite basiert auf [Jekyll](https://jekyllrb.com/).
 
+## Changelog
+### 2021-06-15
+* Add: New Post: Update!
+* Add: Changelog to README.md.
+* Add: Social Media Links at Footer.
+* Add: data.settings to manage settings.
+* Fix: Linklog link did not work at blog overview.
+* Fix: Pagination View - older was displayed on the left when no newer was there.
+* Change: Header and Footer Navigation links work now with data yml files.
+* Change: New Sort and some Content modification at Contact Page.
+* Change: set sitemap false on 404 & 500 page.
+* Change: new text on 404 & 500 page.
+* Change: robots.txt now allow searchengines with settings.
+* Change: some new meta tags
+* Change: link style
+* Change: remove Header Navigation
 ## bundle
-
 ### install
 bundle install
-
 ### update
 bundle update
-
 ## page
-
 ## to compile
 bundle exec jekyll serve
-
 ## to Develop
 JEKYLL_ENV=production bundle exec jekyll build
\ No newline at end of file
diff --git a/_data/footer-links.yml b/_data/footer-links.yml
new file mode 100644
index 0000000..7eeb533
--- /dev/null
+++ b/_data/footer-links.yml
@@ -0,0 +1,15 @@
+contact:
+  title: 'Kontakt'
+  href: '/kontakt'
+colophon:
+  title: 'Colophon'
+  href: '/colophon'
+imprint:
+  title: 'Impressum'
+  href: '/impressum'
+privacy:
+  title: 'Datenschutz'
+  href: '/datenschutzerklaerung'
+rss:
+  title: 'RSS'
+  href: '/rss.xml'
\ No newline at end of file
diff --git a/_data/header-links_deaktivate.yml b/_data/header-links_deaktivate.yml
new file mode 100644
index 0000000..6f39e27
--- /dev/null
+++ b/_data/header-links_deaktivate.yml
@@ -0,0 +1,6 @@
+about:
+  title: '&Uumlber mich'
+  href: '/nico'
+pictures:
+  title: 'Fotos'
+  href: '/fotos'
\ No newline at end of file
diff --git a/_data/settings/allow-searchengine.yml b/_data/settings/allow-searchengine.yml
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/_data/settings/allow-searchengine.yml
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/_data/social-media.yml b/_data/social-media.yml
new file mode 100644
index 0000000..bc8b48a
--- /dev/null
+++ b/_data/social-media.yml
@@ -0,0 +1,15 @@
+twitter:
+  id: '_nyansen'
+  href: 'https://www.twitter.com/'
+  link: 'Twitter'
+  title: 'Mein Twitter Account'
+github:
+  id: 'nyansen'
+  href: 'https://github.com/'
+  link: 'GitHub'
+  title: 'Mein GitHub Account'
+instagram:
+  id: 'nyansen'
+  href: 'https://instagram.com/'
+  link: 'Instagram'
+  title: 'Mein Instagram Account'
\ No newline at end of file
diff --git a/_includes/blog.html b/_includes/blog.html
index 343e9cb..a132f74 100644
--- a/_includes/blog.html
+++ b/_includes/blog.html
@@ -1,8 +1,8 @@
 {% for post in paginator.posts %}
     <article class="post">
         <header class="post-header wrapper">
-            <h2 class="post-title"><a href="{{ post.url }}" rel="bookmark">{{ post.title }}</a></h2>
-            <p class="public-date">vom <time class="post-date" datetime="{{ post.date | date: "%Y-%m-%d"}}">
+            <h2 class="post-title"><a href="{{post.url}}" rel="bookmark">{{post.title}}</a></h2>
+            <p class="public-date">vom <time class="post-date" datetime="{{post.date | date: "%Y-%m-%d"}}">
                     {% assign m = post.date | date: "%-m" %}
                     {{ post.date | date: "%d" }}
                     {% case m %}
@@ -19,14 +19,13 @@
                         {% when '11' %}November
                         {% when '12' %}Dezember
                     {% endcase %}
-                    {{ post.date | date: "%Y" }}
-                </time>
+                    {{ post.date | date: "%Y" }}</time>
                 {% if post.external-url %}
-                    &nbsp;|&nbsp;<a href="{{ page.external-url }}">Org. Post</a>
+                    &nbsp;|&nbsp;<a href="{{post.external-url}}">Org. Post</a>
                 {% endif %}</p>
         </header>
         <div class="post-content wrapper">
-            {{ post.content }}
+            {{post.content}}
         </div>
     </article>
 {% endfor %}
diff --git a/_includes/footer.html b/_includes/footer.html
index 1e499a6..f6aeab2 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,11 +1,31 @@
 <footer class="site-footer clearfix">
-    <div class="wrapper">
-        <p>
-            <a href="/kontakt">Kontakt</a>&nbsp;|&nbsp;
-            <a href="/colophon">Colophon</a>&nbsp;|&nbsp;
-            <a href="/impressum">Impressum</a>&nbsp;|&nbsp;
-            <a href="/datenschutzerklaerung">Datenschutz</a>&nbsp;|&nbsp;
-            <a href="/feed.xml">RSS</a></p>
-        <p>Handmade with <span class="entypo red">♥</span> in Hamburg<br>&copy; {{ 'now' | date: "%Y" }} Nico Jensen</p>
-    </div>
+  <div class="wrapper">
+    {% if site.data.footer-links %}
+      <div id="footerlinks">
+        {% assign footerlinks = site.data.footer-links %}
+        {% for footerlink in footerlinks %}
+          {% assign fkey = footerlink | first %}
+          <a href="{{footerlinks[fkey].href}}" title="{{footerlinks[fkey].title}}">{{footerlinks[fkey].title}}</a>
+          {% if fkey != 'rss' %}
+            &nbsp;|&nbsp;
+          {% endif %}
+        {% endfor %}
+      </div>
+    {% endif %}
+    {% if site.data.social-media %}
+      <div id="social-media">
+        {% assign sm = site.data.social-media %}
+        {% for entry in sm %}
+          {% assign key = entry | first %}
+          {% if sm[key].id %}
+            <a href="{{sm[key].href}}{{sm[key].id}}" title="{{sm[key].title}}" rel="nofollow">{{sm[key].link}}</a>
+            {% if key != 'instagram' %}
+              &nbsp;|&nbsp;
+            {% endif %}   
+          {% endif %}
+        {% endfor %}
+      </div>
+    {% endif %} 
+    <p>Handmade with <span class="entypo red">♥</span> in Hamburg<br>&copy; {{'now' | date: "%Y"}} Nico Jensen</p>
+  </div>
 </footer>
\ No newline at end of file
diff --git a/_includes/head.html b/_includes/head.html
index f8aeeef..92e4c17 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -28,17 +28,18 @@
 
   <link rel="stylesheet" href="{{ "/assets/css/styles.css" | prepend: site.baseurl }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  
-  <link rel="author" href="humans.txt" />
 
   <meta property="og:title" content="{{ title }}">
   {% if description %}<meta property="og:description" content="{{ description }}">{% endif %}
   <meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  <meta property="og:type" content="website">
-  <meta name="twitter:card" content="summary_large_image">
+  <meta property="og:type" content="webseite">
 
-  <meta name="og:site_name" content="Nico Jensen">
+  <meta name="twitter:card" content="summary">
   <meta name="twitter:site" content="@_nyansen">
+  <meta name="twitter:domain" content="nicojensen.de">
+  <meta name="twitter:creator" content="@_mnyansen">
+  <meta name="twitter:title" content="{{title}}">
+  <meta name="twitter:card" content="summary_large_image">
 
   <link rel="home" type="application/rss+xml" href="/feed.xml" />
   <link rel="shortcut icon" type="image/png" href="/assets/images/logo.png"/>
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 38eec4a..819ad84 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -1,6 +1,15 @@
-<nav>
-  <div class="wrapper">
-    <a href="/nico">Über mich</a> | <a href="https://social.elbmatsch.de/@nyansen">Mastodon</a> | <a href="https://twitter.com/_nyansen" rel="nofollow">Twitter</a> | <a href="https://instagram.com/nyansen/" rel="nofollow">Instagram</a>
-    <div id="navView" class="blank"></div>
-  </div>
-</nav>
+{% if site.data.header-links %}
+  <nav>
+    <div class="wrapper">
+      {% assign headerlinks = site.data.header-links %}
+      {% for headerlink in headerlinks %}
+        {% assign hkey = headerlink | first %}
+        <a href="{{headerlinks[hkey].href}}" title="{{headerlinks[hkey].title}}">{{headerlinks[hkey].title}}</a>
+        {% if hkey != 'pictures' %}
+          &nbsp;|&nbsp;
+        {% endif %}
+      {% endfor %}
+      <div id="navView" class="blank"></div>
+    </div>
+  </nav>
+{% endif %}
\ No newline at end of file
diff --git a/_includes/pagination.html b/_includes/pagination.html
index 71216a5..4d09d33 100644
--- a/_includes/pagination.html
+++ b/_includes/pagination.html
@@ -1,11 +1,13 @@
 <!-- Pagination links -->
 <div class="pagination wrapper">
     <div class="pagination-inner">
+        {% if paginator.next_page %}
+            <a href="{{ paginator.next_page_path }}" class="next">&Auml;lter</a>
+        {% else %}
+            <span class="previous">&nbsp;</span>
+        {% endif %}
         {% if paginator.previous_page %}
             <a href="{{ paginator.previous_page_path }}" class="previous">Neuer</a>
         {% endif %}
-        {% if paginator.next_page %}
-            <a href="{{ paginator.next_page_path }}" class="next">&Auml;lter</a>
-        {% endif %}
     </div>
 </div>
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index 3781741..27be49c 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -36,5 +36,4 @@ layout: default
     <div class="post-content wrapper">
         {{ content }}
     </div>
-</article>
-{% include post_pagination.html %}
\ No newline at end of file
+</article>
\ No newline at end of file
diff --git a/_posts/2021-06-15-update.md b/_posts/2021-06-15-update.md
new file mode 100644
index 0000000..a845bd4
--- /dev/null
+++ b/_posts/2021-06-15-update.md
@@ -0,0 +1,11 @@
+---
+title: Update!
+layout: post
+---
+Moin!
+
+Habe hier schon lange nix mehr gemacht oder geschrieben. Daher habe ich mein Urlaub mal genutzt und habe die Seite was modifiziert. Unter anderem habe ich ein paar Bugs im Design gefixt, die Navigation &uuml;berarbeitet und die Kontaktseite &uuml;berarbeitet.
+
+Nicht, dass ich glaube, dass das hier jemand liest oder merkt &#128540;
+
+Ich &uuml;berlege auch gerade, ob ich nicht wieder ein Flickr Account mache. Ich wollte hier zwar was eigenes machen, aber irgendwie habe ich dazu nicht so die Motivation zudem war ich da eigentlich immer recht zufrieden und weiß gar nicht mehr, warum ich da weg bin.
\ No newline at end of file
diff --git a/_sass/main.scss b/_sass/main.scss
index 0865260..1930e91 100644
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -13,11 +13,13 @@ a {
   color: #4A4A4A;
   text-decoration: none;
   background: linear-gradient(to bottom,transparent 0,transparent 85%,#FFC0CB 60%,#FFC0CB 100%);
+  transition: all 0.15s linear;
 }
 
 a:hover {
-  color: #fff;
-  background-color: #FFC0CB;
+  //color: #fff;
+  //background-color: #FFC0CB;
+  background: none;
 }
 
 header.header {
@@ -112,12 +114,12 @@ article.post header.post-header p.public-date {
   font-size: 0.8em;
 }
 
-footer.site-footer div, article .post-header, .pagination {
+footer.site-footer div.wrapper, article .post-header, .pagination {
   padding-top: 3.6rem;
   border-top: #EBF2F6 1px solid;
 }
 
-footer.site-footer div:before, article.post header.post-header:before, .pagination:before {
+footer.site-footer div.wrapper:before, article.post header.post-header:before, .pagination:before {
   display: block;
   content: "";
   width: 7px;
@@ -139,3 +141,9 @@ footer.site-footer {
   line-height: 1.75em;
   text-align: center;
 }
+
+#contact ul {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+}
\ No newline at end of file
diff --git a/fotos.html b/fotos.html
new file mode 100644
index 0000000..ebea5bb
--- /dev/null
+++ b/fotos.html
@@ -0,0 +1,14 @@
+---
+layout: default
+title: Fotos
+sitemap: false
+---
+<article class="post">
+    <header class="post-header wrapper">
+        <h2 class="post-title">Fotos</h2>
+    </header>
+    <div class="post-content wrapper">
+        <p>Moin,</p>
+        <p>hier kommt bald Inhalt oder ein verweis auf eine richtige Seite.</p>
+    </div>
+</article>
diff --git a/kontakt.html b/kontakt.html
index de563a1..f6bc350 100644
--- a/kontakt.html
+++ b/kontakt.html
@@ -2,7 +2,7 @@
 layout: default
 title: Kontakt
 ---
-<article class="post">
+<article class="post" id="contact">
     <header class="post-header wrapper">
         <h2 class="post-title">Kontakt</h2>
     </header>
@@ -12,13 +12,13 @@ title: Kontakt
             <p>moin@nicojensen.de<br>
             PGP-Key: 04EE0F98<br>
             Fingerprint: 0FEC E173 375E 3DD2 5386 B023 923C 288E 04EE 0F98</p>
-            
-            <p>
-                <del><a href="https://de.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol" title="Wikipedia Artikel zu Jabber." rel="nofollow">Jabber</a>: nyansen@jabber.elbmatsch.de</del><br>
-                <a href="https://en.wikipedia.org/wiki/Matrix_(protocol)" title="Wikipedia Artikel zu Jabber." rel="nofollow">Matrix</a>: nyansen@matrix.elbmatsch.de<br>
-                Twitter: <a href="https://www.twitter.com/_nyansen" title="Mein Twitter Account." rel="nofollow">@_nyansen</a><br>
-                <a href="https://de.wikipedia.org/wiki/Mastodon_(Software)" title="Wikipedia Artikel zu Mastodon" rel="nofollow">Mastodon</a>: <a href="https://social.elbmatsch.de/@nyansen">@nyansen@social.elbmatsch.de</a>
-            </p>
+            <ul>
+                <li><a href="https://wikipedia.org/wiki/Twitter" title="Wikipedia Artikel zu Twitter" rel="nofollow">Twitter</a>: <a href="https://www.twitter.com/_nyansen" title="Mein Twitter Account." rel="nofollow">@_nyansen</a></li>
+                <li><a href="https://wikipedia.org/wiki/Discord_(Software)" title="Wikipedia Artikel zu Discord" rel="nofollow">Discord</a>: <a href="https://discord.gg/YEjeHMZHeu" title="Discord Einladungslink" rel="nofollow">nyancord</a></li>
+                <li><del><a href="https://wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol" title="Wikipedia Artikel zu Jabber." rel="nofollow">Jabber</a>: nyansen@jabber.elbmatsch.de</del></li>
+                <li><del><a href="https://wikipedia.org/wiki/Matrix_(protocol)" title="Wikipedia Artikel zu Jabber." rel="nofollow">Matrix</a>: nyansen@matrix.elbmatsch.de<br></del></li>
+                <li><del><a href="https://wikipedia.org/wiki/Mastodon_(Software)" title="Wikipedia Artikel zu Mastodon" rel="nofollow">Mastodon</a>: <a href="https://social.elbmatsch.de/@nyansen">@nyansen@social.elbmatsch.de</a></del></li>
+            </ul>
         </blockquote>
     </div>
 </article>
\ No newline at end of file
diff --git a/robots.txt b/robots.txt
index 332affd..4cd1fda 100644
--- a/robots.txt
+++ b/robots.txt
@@ -1,3 +1,11 @@
+---
+layout: null
+---
+User-agent: *
+{% if site.data.settings.allow-searchengine %}Disallow: 
+{% else %}Disallow: /
+{% endif %}
+
 User-agent: Uptimebot
 Disallow: /