diff --git a/_includes/footer.html b/_includes/footer.html
index 5918b95..41d847c 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,46 +1,27 @@
 <footer class="site-footer clearfix">
   <div class="wrapper">
     {% if site.data.footer-links %}
-    <div id="footerlinks">
-      {% assign footerlinks = site.data.footer-links %} &nbsp;|&nbsp; {% for
-      footerlink in footerlinks %} {% assign fkey = footerlink | first %}
-      <a href="{{footerlinks[fkey].href}}" title="{{footerlinks[fkey].title}}"
-        >{{footerlinks[fkey].title}}</a
-      >&nbsp;|&nbsp; {% endfor %}
-    </div>
-    {% endif %} {% if site.data.social-media %}
-    <div id="social-media">
-      {% assign sm = site.data.social-media %} &nbsp;|&nbsp; {% for entry in sm
-      %} {% assign key = entry | first %} {% if sm[key].id %}
-      <a
-        href="{{sm[key].href}}{{sm[key].id}}"
-        title="{{sm[key].title}}"
-        target="_blank"
-        rel="noopener {{sm[key].rel}}"
-        >{{sm[key].link}}</a
-      >&nbsp;|&nbsp; {% endif %} {% endfor %}
-    </div>
-    {% endif %} {% if site.data.social-media-old %}
-    <div id="social-media-2">
-      {% assign sm = site.data.social-media-old %} &nbsp;|&nbsp; {% for entry in
-      sm %} {% assign key = entry | first %} {% if sm[key].id %}
-      <a
-        href="{{sm[key].href}}{{sm[key].id}}"
-        title="{{sm[key].title}}"
-        target="_blank"
-        rel="noopener noreferrer"
-        >{{sm[key].link}}</a
-      >&nbsp;|&nbsp; {% endif %} {% endfor %}
-    </div>
+      <div id="footerlinks">
+        {% assign footerlinks = site.data.footer-links %}&nbsp;|&nbsp;
+        {% for footerlink in footerlinks %} 
+          {% assign fkey = footerlink | first %}
+          <a href="{{footerlinks[fkey].href}}" title="{{footerlinks[fkey].title}}">{{footerlinks[fkey].title}}</a>&nbsp;|&nbsp;
+        {% endfor %}
+      </div>
+    {% endif %} 
+    {% if site.data.social-media %}
+      <div id="social-media">
+        {% assign sm = site.data.social-media %}&nbsp;|&nbsp;
+        {% for entry in sm%}
+          {% assign key = entry | first %}
+          {% if sm[key].footer %}          
+            {% if sm[key].id %}
+              <a href="{{sm[key].href}}{{sm[key].id}}" title="{{sm[key].title}}" target="_blank" rel="noopener {{sm[key].rel}}">{{sm[key].link}}</a>&nbsp;|&nbsp;
+            {% endif %}
+          {% endif %}
+        {% endfor %}
+      </div>
     {% endif %}
-    <p>
-      Handmade with <span class="entypo red">♥</span> in
-      <a
-        href="https://www.stadt-stade.info/"
-        target="_blank"
-        rel="noopener noreferrer"
-        >Hansestadt Stade</a
-      ><br />&copy; {{'now' | date: "%Y"}} Nico Jensen
-    </p>
+    <p>Handmade with <span class="entypo red">♥</span> in <a href="https://www.stadt-stade.info/" target="_blank" rel="noopener noreferrer">Hansestadt Stade</a><br />&copy; {{'now' | date: "%Y"}} Nico Jensen</p>
   </div>
 </footer>