diff --git a/_includes/seo.html b/_includes/seo.html
index 793ba947..dfe0806a 100644
--- a/_includes/seo.html
+++ b/_includes/seo.html
@@ -1,11 +1,9 @@
-<!-- BEGIN seo.html -->
 {% if page.collection == 'tracks' %}
-<title>Play {{ page.common.title | strip_html }} by {{ page.common.artist | strip_html }}</title>
-<meta name="title" content="Play {{ page.common.title | strip_html }} by {{ page.common.artist | strip_html }}" />
-{% else %}
-<title>{{ page.title | strip_html }} | {{ site.title | strip_html }}</title>
-<meta name="title" content="{{ page.title | strip_html }} | {{ site.title | strip_html }}" />
-{% endif %}
+<!-- BEGIN seo.html -->
+
+<title>Play {{ page.common.title }} by {{ page.common.artist }} | {{ site.title }}</title>
+<meta name="title" content="Play &quot;{{ page.common.title| strip_html }}&quot; by {{ page.common.artist }}" />
+<meta name="description" content="A track by {{ page.common.artist }} named &quot;{{ page.common.title | strip_html }}&quot; published on {{ site.title }}" />
 <meta name="dc.date.modified" scheme="ISO8601" content="{{ page.last_modified_at | date_to_xmlschema }}" />
 <meta name="robots" content="index" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -15,36 +13,147 @@
 <meta name="geo.placename" content="{{ site.geo.town }}" />
 <meta name="geo.position" content="{{ site.geo.lat }};{{ site.geo.long }}" />
 <meta name="ICBM" content="{{ site.geo.lat }}, {{ site.geo.long }}" />
+<meta name="author" content="{{ site.title }}" />
+<meta name="generator" content="Jekyll v4.0.0" />
 
 <!-- Dublin Core basic info -->
 
 <meta name="dcterms.Identifier" content="{{ site.url }}" />
 <meta name="dcterms.Format" content="text/html" />
 <meta name="dcterms.Relation" content="{{ site.title }}" />
-<meta name="dcterms.Publisher" content="{{ site.title }}" />
+<meta name="dcterms.Publisher" content="{{ site.publisher.name }}" />
 <meta name="dcterms.Type" content="text/html" />
 <meta name="dcterms.Coverage" content="{{ site.url }}/" />
 <meta name="dcterms.Rights" content="Copyright &copy;{{ site.time | date: '%Y' }} {{ site.title }}." />
-{% if page.collection == 'tracks' %}
-<meta name="dcterms.Subject" content="Listen and to a track by {{ page.common.artist | strip_html }} from the release {{ page.common.album | strip_html }} and support your remote artist!" />
-<meta name="dcterms.Title" content="{{ page.common.title | strip_html }} - {{ page.common.artist | strip_html }} | {{ site.title | strip_html }}" />
-{% else %}
-<meta name="dcterms.Subject" content="{{ site.description | strip_html }}" />
-<meta name="dcterms.Title" content="{{ page.title }} | {{ site.title }}" />
-{% endif %}
+<meta name="dcterms.Subject" content="A track by {{ page.common.artist }} named &quot;{{ page.common.title| strip_html }}&quot; published on {{ site.title }}" />
+<meta name="dcterms.Title" content="Play &quot;{{ page.common.title| strip_html }}&quot; by {{ page.common.artist }}" />
 <meta name="dcterms.Contributor" content="{{ site.title }}" />
-{% if page.date == null %}<meta name="dcterms.Date" content="{{ site.time | date: '%Y-%m-%d' }}" />{% else %}<meta name="dcterms.Date" content="{{ page.date | date: '%Y-%m-%d' }}" />{% endif %}
-<meta name="dcterms.Description" content="{{ page.description | strip_html }}" />
+<meta name="dcterms.Date" content="{{ site.time | date: '%Y-%m-%d' }}" />
+<meta name="dcterms.Description" content="Listen and to a track by {{ page.common.artist | strip_html }} from the release &quot;{{ page.common.album | strip_html }}&quot; and support your remote artist!" />
 
+<!-- Facebook -->
+
+
+<meta property="og:title" content="{{ page.common.title }}" />
+<meta property="og:locale" content="en" />
+<meta property="og:description" content="Listen and to a track by {{ page.common.artist | strip_html }} from the release &quot;{{ page.common.album | strip_html }}&quot; and support your remote artist!" />
+<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
+<meta property="og:site_name" content="{{ site.title }}" />
+<meta property="og:type" content="music:album:track" />
+<meta property="article:published_time" content="{{ page.last_modified_at | date_to_xmlschema }}" />
+<meta property="og:image" content="https://media.basspistol.com/panix/{{ page.slug }}.jpeg" />
 <!-- Twitter Card -->
 
 <meta name="twitter:card" content="summary" />
-<meta name="twitter:site" content="@{{ site.author.twitter }}" />
-<meta name="twitter:title" content="{{ page.title }} | {{ site.title }}" />
-<meta name="twitter:description" content="{{ site.description | strip_html }}" />
-{% if page.collection == 'tracks' %}
-<meta name="twitter:image" content="{{ site.url }}{{ page.cover }}" />
-{% else %}
-<meta name="twitter:image" content="{{ site.url }}{{ page.image }}" />
-{% endif %}
+<meta name="twitter:title" content="{{ page.common.title }} | {{ site.title }}" />
+<meta name="twitter:description" content="Listen and to a track by {{ page.common.artist | strip_html }} from the release &quot;{{ page.common.album | strip_html }}&quot; and support your remote artist!" />
+<meta name="twitter:image" content="https://media.basspistol.com/panix/{{ page.slug }}.jpeg" />
+
 <!-- END seo.html -->
+{% elsif page.collection == 'albums' %}
+
+<!-- BEGIN seo.html -->
+
+<title>Play &quot;{{ page.name }}&quot; by {{ page.artists }} | {{ site.title }}</title>
+<meta name="title" content="Play &quot;{{ page.name | strip_html }}&quot; by {{ page.artists }}" />
+<meta name="description" content="A release by {{ page.artists }} named &quot;{{ page.name | strip_html }}&quot; published on {{ site.title }}" />
+<meta name="dc.date.modified" scheme="ISO8601" content="{{ page.last_modified_at | date_to_xmlschema }}" />
+<meta name="robots" content="index" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="canonical" href="{{ site.url }}{{ page.url }}" />
+<link rel="alternate" hreflang="x-default" href="{{ site.url }}{{ page.url }}" />
+<meta name="geo.region" content="{{ site.geo.region }}" />
+<meta name="geo.placename" content="{{ site.geo.town }}" />
+<meta name="geo.position" content="{{ site.geo.lat }};{{ site.geo.long }}" />
+<meta name="ICBM" content="{{ site.geo.lat }}, {{ site.geo.long }}" />
+<meta name="author" content="{{ site.title }}" />
+<meta name="generator" content="Jekyll v4.0.0" />
+
+<!-- Dublin Core basic info -->
+
+<meta name="dcterms.Identifier" content="{{ site.url }}" />
+<meta name="dcterms.Format" content="text/html" />
+<meta name="dcterms.Relation" content="{{ site.title }}" />
+<meta name="dcterms.Publisher" content="{{ site.publisher.name }}" />
+<meta name="dcterms.Type" content="text/html" />
+<meta name="dcterms.Coverage" content="{{ site.url }}/" />
+<meta name="dcterms.Rights" content="Copyright &copy;{{ site.time | date: '%Y' }} {{ site.title }}." />
+<meta name="dcterms.Subject" content="A release by {{ page.artists }} named &quot;{{ page.name | strip_html }}&quot; published on {{ site.title }}" />
+<meta name="dcterms.Title" content="Play &quot;{{ page.name | strip_html }}&quot; by {{ page.artists }}" />
+<meta name="dcterms.Contributor" content="{{ site.title }}" />
+<meta name="dcterms.Date" content="{{ site.time | date: '%Y-%m-%d' }}" />
+<meta name="dcterms.Description" content="Listen and to a release by {{ page.artists | strip_html }} named &quot;{{ page.name | strip_html }}&quot; and support your remote artist!" />
+
+<!-- Facebook -->
+
+
+<meta property="og:title" content="{{ page.name }} by {{ page.artists }}" />
+<meta property="og:locale" content="en" />
+<meta property="og:description" content="Listen and to a release by {{ page.artists | strip_html }} named &quot;{{ page.name | strip_html }}&quot; and support your remote artist!" />
+<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
+<meta property="og:site_name" content="{{ site.title }}" />
+<meta property="og:type" content="music:album:track" />
+<meta property="article:published_time" content="{{ page.last_modified_at | date_to_xmlschema }}" />
+<meta property="og:image" content="https://media.basspistol.com/panix/{{ page.slug }}.jpeg" />
+<!-- Twitter Card -->
+
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:title" content="{{ page.name }} | {{ site.title }}" />
+<meta name="twitter:description" content="Listen and to a release by {{ page.artists | strip_html }} named  &quot;{{ page.name | strip_html }}&quot; and support your remote artist!" />
+<meta name="twitter:image" content="https://media.basspistol.com/panix/{{ page.slug }}.jpeg" />
+
+<!-- END seo.html -->
+
+{% else %}
+<!-- BEGIN seo.html -->
+
+<title>{{ page.title }} | {{ site.title }}</title>
+<meta name="title" content="{{ page.title }} | {{ site.title }}" />
+<meta name="description" content="{{ page.description }}" />
+<meta name="dc.date.modified" scheme="ISO8601" content="{{ page.last_modified_at | date_to_xmlschema }}" />
+<meta name="robots" content="index" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="canonical" href="{{ site.url }}{{ page.url }}" />
+<link rel="alternate" hreflang="x-default" href="{{ site.url }}{{ page.url }}" />
+<meta name="geo.region" content="{{ site.geo.region }}" />
+<meta name="geo.placename" content="{{ site.geo.town }}" />
+<meta name="geo.position" content="{{ site.geo.lat }};{{ site.geo.long }}" />
+<meta name="ICBM" content="{{ site.geo.lat }}, {{ site.geo.long }}" />
+<meta name="author" content="{{ site.title }}" />
+<meta name="generator" content="Jekyll v4.0.0" />
+
+<!-- Dublin Core basic info -->
+
+<meta name="dcterms.Identifier" content="{{ site.url }}" />
+<meta name="dcterms.Format" content="text/html" />
+<meta name="dcterms.Relation" content="{{ site.title }}" />
+<meta name="dcterms.Publisher" content="{{ site.publisher.name }}" />
+<meta name="dcterms.Type" content="text/html" />
+<meta name="dcterms.Coverage" content="{{ site.url }}/" />
+<meta name="dcterms.Rights" content="Copyright &copy;{{ site.time | date: '%Y' }} {{ site.title }}." />
+<meta name="dcterms.Subject" content="{{ page.description }}" />
+<meta name="dcterms.Title" content="{{ page.title }}" />
+<meta name="dcterms.Contributor" content="{{ site.title }}" />
+<meta name="dcterms.Date" content="{{ site.time | date: '%Y-%m-%d' }}" />
+<meta name="dcterms.Description" content="{{ page.description }}" />
+
+<!-- Facebook -->
+
+
+<meta property="og:title" content="{{ page.title }} | {{ site.title }}" />
+<meta property="og:locale" content="en" />
+<meta property="og:description" content="{{ page.description }}" />
+<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
+<meta property="og:site_name" content="{{ site.title }}" />
+<meta property="og:type" content="music:album:track" />
+<meta property="article:published_time" content="{{ page.last_modified_at | date_to_xmlschema }}" />
+<meta property="og:image" content="{{ page.image }}" />
+<!-- Twitter Card -->
+
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:title" content="{{ page.name }} | {{ site.title }}" />
+<meta name="twitter:description" content="{{ page.description }}" />
+<meta name="twitter:image" content="{{ page.image }}" />
+
+<!-- END seo.html --
+{% endif %}
\ No newline at end of file
diff --git a/_layouts/album.html b/_layouts/album.html
index 281453a8..f139f31c 100644
--- a/_layouts/album.html
+++ b/_layouts/album.html
@@ -9,7 +9,7 @@ lang: en
 -->
 <html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
 <head>
-{% seo title=false %}
+
 <link type="application/atom+xml" rel="alternate" href="{{ site.url }}/feed.xml" title="{{ site.name }}" />
 {% include seo.html %}
 {% include relBase.html %}
diff --git a/_layouts/default.html b/_layouts/default.html
index c26a025e..50d8d8cd 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,8 +8,7 @@
 -->
 <html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
 <head>
-{% seo title=false %}
-<link type="application/atom+xml" rel="alternate" href="{{ site.url }}/feed.xml" title="{{ site.name }}" />
+
 {% include seo.html %}
 {% include relBase.html %}
 <meta charset="utf-8" />
diff --git a/_layouts/post.html b/_layouts/post.html
index 8527a367..8359f7b7 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -9,7 +9,7 @@
 -->
 <html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
 <head>
-{% seo title=false %}
+
 <link type="application/atom+xml" rel="alternate" href="{{ site.url }}/feed.xml" title="{{ site.name }}" />
 {% include seo.html %}
 {% include relBase.html %}
@@ -299,7 +299,7 @@
 -->
 <html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
 <head>
-{% seo title=false %}
+
 <link type="application/atom+xml" rel="alternate" href="{{ site.url }}/feed.xml" title="{{ site.name }}" />
 {% include seo.html %}
 {% include relBase.html %}
diff --git a/cookies.md b/cookies.md
index b6e62167..e567c206 100644
--- a/cookies.md
+++ b/cookies.md
@@ -5,6 +5,7 @@ description: >-
   Privacy is important, therefor we respect it!
 sitemap: false
 layout: page
+sitemap: false
 ---
 
 <p>To improve our marketing efforts, we at {{ site.publisher.name }} sometimes place small data files called cookies on your device. However this site will work perfectly without them. We do however use anonymised analytics of the site-usage regardless of cookies (see bellow if you want to opt out of this too) This usage-data contain no identifiable information.</p>
diff --git a/feed.xml b/feed.xml
index 67417fca..b787481d 100644
--- a/feed.xml
+++ b/feed.xml
@@ -18,15 +18,13 @@ layout: nil
 		{% for post in site.posts limit:feed_items %}
 			<item>
 				<title>{{ post.title | xml_escape }}</title>
-				{% if post.team_member %}
-        {% assign author_id = post.team_member | prepend: "/team_members/" | append: "/" %}
-        {% assign author = site.team_members | where: "url", author_id | first %}
-					<dc:creator>{{ author.name | xml_escape }}</dc:creator>
-				{% endif %}
+
+					<dc:creator>{{ site.author.name | xml_escape }}</dc:creator>
+
 				{% if post.description %}
 					<description>{{ post.description| xml_escape }}</description>
 				{% else %}
-					<description>{{ post.content | xml_escape }}</description>
+					<description>{{ post.content | truncatewords: 20 | xml_escape }}</description>
 				{% endif %}
 				<pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
 				<link>{{ site.url }}{{ post.url }}</link>
diff --git a/rss.xml b/rss.xml
deleted file mode 100644
index 582df200..00000000
--- a/rss.xml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title : The Basspistol RSS Feed
----
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns:slash="http://purl.org/rss/1.0/modules/slash/" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:rawvoice="http://www.rawvoice.com/rawvoiceRssModule/" xmlns:googleplay="http://www.google.com/schemas/play-podcasts/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" >
-
-  <channel>
-    <title>{{ site.title }}</title>
-    <atom:link href="{{ site.url }}/rss.xml" rel="self" type="application/rss+xml" />
-    <link>{{ site.url }}</link>
-    <description>{{ site.tagline | xml_escape }}</description>
-    <lastBuildDate>{{ page.last_modified_at | date_to_rfc822 }}</lastBuildDate>
-    <language>en-US</language>
-    <sy:updatePeriod>weekly</sy:updatePeriod>
-    <sy:updateFrequency>1</sy:updateFrequency>
-    <generator>https://jekyllrb.com/</generator>
-
-    <image>
-      <url>{{ site.url }}{{ site.banner }}</url>
-      <title>{{ site.title }}</title>
-      <link>{{ site.url }}</link>
-      <width>128</width>
-      <height>128</height>
-    </image> 
-    <itunes:summary><![CDATA[{{ site.tagline }}]]></itunes:summary>
-    <itunes:author>{{ site.title }}</itunes:author>
-    <itunes:explicit>yes</itunes:explicit>
-    <itunes:image href="{{ site.url }}{{ site.banner }}" />
-    <itunes:owner>
-      <itunes:name>{{ site.title }}</itunes:name>
-      <itunes:email>{{ site.email }}</itunes:email>
-    </itunes:owner>
-    <managingEditor>{{ site.email }}</managingEditor>
-    <copyright>Anti-Copyright 2018 {{ site.title }}</copyright>
-    <itunes:subtitle>{{ site.title }}</itunes:subtitle>
-    <itunes:category text="Music">
-    </itunes:category>
-    <rawvoice:rating>TV-14</rawvoice:rating>
-    <rawvoice:frequency>Daily</rawvoice:frequency>
-  {% for post in site.categories.music %}
-      <item>
-        <title>{{ post.title }}</title>
-        <link>{{ site.url }}{{ post.url }}</link>
-        <guid isPermaLink="false">{{ post.uid }}</guid>
-        <description> &lt;img src=&quot;{{ site.audio_url }}{{ post.cover }}&quot; /&gt; &lt;br /&gt;{{ post.content | xml_escape | strip_html }}</description>
-        <category>Podcasts</category>
-        <author>Sakrecoer</author>
-        <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-        <itunes:author>Sakrecoer</itunes:author>
-        <itunes:explicit>Yes</itunes:explicit>
-        <itunes:subtitle>{{ post.description | strip_html | truncate: 252 | xml_escape  }}</itunes:subtitle>
-        <itunes:summary>{{ post.description | xml_escape }}</itunes:summary>
-        <itunes:keywords>{% for keywords in post.keywords %}{{ keywords | strip_html | xml_escape }}{% unless forloop.last %}, {% endunless %}{% endfor %}</itunes:keywords>
-        <itunes:image href="{{ site.url }}{{ site.audio_url }}{{ post.cover }}"/>
-        <enclosure url="{{ site.url }}{{ site.audio_url }}{{ post.mp3 }}?ref=rss" type="audio/mpeg"/>
-      </item>
-  {% endfor %}
-  </channel>
-</rss>
diff --git a/search.json b/search.json
deleted file mode 100644
index 08632682..00000000
--- a/search.json
+++ /dev/null
@@ -1,16 +0,0 @@
----
----
-[
-    {% for post in site.categories.music %}
-    {
-      "title"    : "{{ post.title }}",
-      "href"     : "{{ post.url }}",
-      "date"     : {
-         "day"   : "{{ post.date | date: "%d" }}",
-         "month" : "{{ post.date | date: "%B" }}",
-         "year"  : "{{ post.date | date: "%Y" }}"
-      }
-    }
-    {% unless forloop.last %},{% endunless %}
-    {% endfor %}
-]
diff --git a/sitemap.txt b/sitemap.txt
deleted file mode 100644
index d45fec7a..00000000
--- a/sitemap.txt
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Remember to set url in your _config.yml file!
-title : Sitemap
----
-{% for page in site.pages %}
-{{site.url}}{{ page.url }}{% endfor %}
-{% for post in site.posts %}
-{{site.url}}{{ post.url }}{% endfor %}
\ No newline at end of file