diff --git a/archive.html b/archive.html
index b88e509..f556b21 100644
--- a/archive.html
+++ b/archive.html
@@ -1,46 +1,8 @@
 {% include 'block_header_open.html' %}
 
-{%- if taxonomy.name -%}
-{%- set title = taxonomy.name ~ ' | ' ~ site.domain -%}
-{%- else -%}
-{%- set title = site.title -%}
-{%- endif -%}
-
-{%- if ( taxonomy.paged > 1 ) -%}
-{%- set turl = site.url ~ taxonomy.url ~ taxonomy.paged ~ '/'  -%}
-{%- else -%}
-{%- set turl = site.url ~ taxonomy.url  -%}
-{%- endif -%}
-
-	<title>{{ title }}</title>
+	<title>{%- if taxonomy.name -%}{{ taxonomy.name ~ ' | ' ~ site.domain }}{%- else -%}{{ site.title }}{%- endif -%}</title>
 	<link rel="alternate" type="application/rss+xml" title="{{ title }} RSS Feed" href="{{ site.url}}{{ taxonomy.url }}feed" />
 
-	<meta property="og:description" content="{{ taxonomy.description|default(title) }}" />
-	<meta property="og:locale" content="{{ site.lang }}" />
-	<meta property="og:site_name" content="{{ site.name }}" />
-	<meta property="og:title" content="{{ title }}" />
-	<meta property="og:type" content="website" />
-	<meta name="og:updated_time" content="{{ posts[0].published|date('c') }}" />
-	<meta property="og:url" content="{{ turl }}" />
-	<meta property="og:image" content="{{ site.url }}/favicon.png"/>
-
-	<meta name="twitter:card" content="summary" />
-	<meta name="twitter:description" content="{{ taxonomy.description|default(title) }}" />
-	{% if site.author.twitter %}<meta name="twitter:site" content="@{{ site.author.twitter }}" />{% endif %}
-	{% if site.author.twitter %}<meta name="twitter:creator" content="@{{ site.author.twitter }}" />{% endif %}
-	<meta name="twitter:title" content="{{ title }}" />
-	<meta name="twitter:image" content="{{ site.url }}/favicon.png">
-
-	<meta name="DC.Format" content="text/html" />
-	<meta name="DC.Title" content="{{ title }}" />
-	<meta name="DC.Creator" content="{{ site.author.name }}" />
-	<meta name="DC.Description" content="{{ taxonomy.description|default(title) }}" />
-	<meta name="DC.Date" content="{{ posts[0].published|date('%Y-%m-%d') }}" />
-	<meta name="DC.Type" content="collection" />
-	<meta name="DC.Language" content="{{ site.lang }}" />
-	<meta name="DC.Source" content="{{ turl }}" />
-	<meta name="DC.Rights" content="Copyright {{ posts[0].published|date('%Y') }}, {{ site.author.name }} <{{ site.author.email }}>. All rights reserved.">
-
 {% include 'block_header_close.html' %}
 
 <section class="content-body h-feed">
diff --git a/atom.html b/atom.html
index a71b2be..0924325 100644
--- a/atom.html
+++ b/atom.html
@@ -1,11 +1,6 @@
-{%- if taxonomy.name -%}
-{%- set title = taxonomy.name ~ ' | ' ~ site.title -%}
-{%- else -%}
-{%- set title = site.title -%}
-{%- endif -%}
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-	<title>{{ title }}</title>
+	<title>{%- if taxonomy.name -%}{{ taxonomy.name ~ ' | ' ~ site.title }}{%- else -%}{{ site.title }}{%- endif -%}</title>
 	<link href="{{ site.url }}{{ taxonomy.url }}feed/" rel="self" />
 	<link href="{{ site.url }}{{ taxonomy.url }}" />
 	<id>{{ site.url }}{{ taxonomy.url }}</id>
diff --git a/block_footer.html b/block_footer.html
index ede7ba5..adb4fe0 100644
--- a/block_footer.html
+++ b/block_footer.html
@@ -36,11 +36,6 @@
 					<svg class="icon"><use xlink:href="#icon-note" /></svg>
 					<a class="u-url u-resume" href="{{ site.author.url }}/cv">CV</a>
 				</dd>
-				<dt>Donation</dt>
-				<dd>
-					<svg class="icon"><use xlink:href="#icon-creditcard" /></svg>
-					<a title="Like the content? You can thank it with a coffee." href="{{ site.author.donateurl }}">Buy me a coffee!</a>
-				</dd>
 			</dl>
 		</nav>
 		<aside class="footer-notes p-note">
diff --git a/block_header_close.html b/block_header_close.html
index 58f2203..fd6719a 100644
--- a/block_header_close.html
+++ b/block_header_close.html
@@ -1,5 +1,5 @@
 	<style media="all">
-		{% include 'style.css' %}
+{% include 'style.css' %}
 	</style>
 </head>
 
diff --git a/block_header_open.html b/block_header_open.html
index cf2a15d..be52642 100644
--- a/block_header_open.html
+++ b/block_header_open.html
@@ -3,10 +3,7 @@
 <head>
 	<meta charset="{{ site.charset }}" />
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1" />
-	<link rel="self" href="{{ site.url }}/" />
-	<link rel="shortcut icon" href="{{ site.url }}/theme/favicon.ico" />
-	<link rel="apple-touch-icon" href="{{ site.url }}/theme/favicon.png" />
-	<link rel="icon" href="{{ site.url }}/theme/favicon.ico" />
+	<link rel="icon" href="{{ site.url }}/favicon.ico" />
 	<link rel="http://webmention.org/" href="{{ site.url }}/webmention" />
 	<link rel="webmention" href="{{ site.url }}/webmention" />
 	<link rel="micropub" href="{{ site.url }}/micropub" />
diff --git a/singular.html b/singular.html
index beb41f2..3fb87e4 100644
--- a/singular.html
+++ b/singular.html
@@ -11,34 +11,13 @@
 	<title>{{ post.slug }} | {{ site.domain }}</title>
 	{% endif %}
 
-	<link rel="canonical" href="{{ site.url }}/{{ post.slug }}/" />
-	<link rel="shortlink" href="{{ site.url }}/{{ post.shortslug }}" />
-
 	<meta name="author" content="{{ post.author.name }}">
 	<meta name="keywords" content="{{ post.tags|join(',') }}">
 	<meta name="description" content="{{ post.summary|e }}">
 
-	<meta property="og:description" content="{{ post.summary|e }}" />
-	<meta property="og:locale" content="{{ post.lang|default(site.lang) }}" />
-	<meta property="og:site_name" content="{{ site.name }}" />
-	<meta property="og:title" content="{{ post.title }}" />
-	<meta property="og:type" content="blog" />
-	{% if post.modified %}<meta name="og:updated_time" content="{{ post.modified|date("c") }}" />{%endif%}
-	<meta property="og:url" content="{{ site.url }}/{{ post.shortslug }}/" />
-
-	<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" >
-	<meta name="DC.Format" content="text/html" />
-	<meta name="DC.Title" content="{{ post.title|e }}">
-	<meta name="DC.Creator" content="{{ post.author.name }}">
-	<meta name="DC.Description" content="{{ post.summary|e }}">
-	<meta name="DC.Date" content="{{ post.published|date("%Y-%m-%d") }}">
-	<meta name="DC.Type" content="{{ dctype }}">
-	<meta name="DC.Identifier" content="{{ site.url }}/{{ post.slug }}/">
-	<meta name="DC.Source" content="{{ site.url }}/{{ post.slug }}/">
-	<meta name="DC.Language" content="{{ post.lang|default(site.lang) }}">
-
+	<link rel="canonical" href="{{ site.url }}/{{ post.slug }}/" />
+	<link rel="shortlink" href="{{ site.url }}/{{ post.shortslug }}" />
 	<link rel="license" href="{{ post.license.url }}" />
-	<meta name="DC.Rights" content="{{ post.license.text }} by {{ post.author.name }}">
 
 {% include 'block_header_close.html' %}
 
@@ -153,14 +132,16 @@
 							<time class="dt-published" datetime="{{ reply.published|date('c') }}">
 								{{ reply.published|date('%Y-%m-%d %H:%M') }}
 							</time>
+							</p>
 							{% if reply.source|length > 0 %}
-							<a href="{{ reply.source }}" class="u-repost-of">{{ reply.source }}</a>
+							<p class="reponse_link">
+								Read response at:<br />
+								<svg class="icon"><use xlink:href="#icon-link"></use></svg>
+								<a href="{{ reply.source }}" class="u-repost-of">{{ reply.source }}</a>
+							</p>
 							{% endif %}
 							</p>
 						</header>
-						<div class="e-content">
-							{{ reply.html }}
-						</div>
 					</li>
 				{% endfor %}
 				</ol>
@@ -205,13 +186,44 @@
 
 	</article>
 
+
+	<aside class="content-info">
+		<p>
+{% if post.category == 'photo' %}
+			Did you like this photo?<br />
+			<a href="{{ post.author.donateurl }}">Thank it with a small donation.</a>
+{% elif post.category == 'article' %}
+			Did you find this article useful?<br />
+			<a href="{{ post.author.donateurl }}">Buy me a coffee, so I can write more like this</a>, or <a href="mailto:{{ post.author.email }}">get in touch</a> if you want my help with something similar.
+{% elif post.category == 'journal' %}
+			Did you like this entry?<br />
+			<a href="{{ post.author.donateurl }}">Encourage me to write more of them.</a>
+{% else %}
+			Did you like what you read?<br />
+			<a href="{{ post.author.donateurl }}">Thank it with a small donation.</a>
+{% endif %}
+		</p>
+	</aside>
+
 	<aside class="content-note">
 		<hr />
 		<p class="license">
-			<a rel="license" href="{{ post.license.url }}" class="hide u-license">{{ post.license.text }}</a>
+{% if post.category == 'article' %}
+			<a rel="license" href="https://creativecommons.org/licenses/by/4.0/" class="hide u-license">CC BY 4.0</a>
 			<svg class="icon"><use xlink:href="#icon-creative-commons" /></svg>
-			{{ post.license.description }}
+			Licensed under <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International</a>. You are free to share or republish, even if modified, if you link back here and indicate the modifications, even for commercial use.
+{% elif post.category == 'journal' %}
+			<a rel="license" href="https://creativecommons.org/licenses/by-nc/4.0/" class="hide u-license">CC BY-NC 4.0</a>
+			<svg class="icon"><use xlink:href="#icon-creative-commons" /></svg>
+			Licensed under <a href="https://creativecommons.org/licenses/by-nc/4.0/">Creative Commons Attribution-NonCommercial 4.0 International</a>. You are free to share or republish, even if modified, if you link back here and indicate the modifications, for non commercial use. For commercial use please contact the author.
+{% else %}
+			<a rel="license" href="https://creativecommons.org/licenses/by-nc-nd/4.0/" class="hide u-license">CC BY-NC-ND 4.0</a>
+			<svg class="icon"><use xlink:href="#icon-creative-commons" /></svg>
+			Licensed under <a href="https://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</a>. You are free to share if you link back here for non commercial use, but you can\'t publish any altered versions of it. For commercial use please contact the author.
+{% endif %}
 		</p>
+
+
 		<p>Want to leave a comment or get in touch? Reply with your own blog using
 			<a href="http://indiewebcamp.com/webmention">Webmentions</a> or send an
 			<a href="mailto:{{ post.author.email }}?subject=RE: {{ post.title }}"
diff --git a/style.css b/style.css
index 6d16f43..a7e5533 100644
--- a/style.css
+++ b/style.css
@@ -51,6 +51,7 @@ a {
 
 a:hover {
     color: #000;
+    text-decoration: underline;
 }
 
 b, strong {
@@ -173,16 +174,78 @@ h3 {
     display: inline;
 }
 
+.content-info {
+    border: 2px dotted #777;
+    padding: 1rem;
+    font-variant: small-caps;
+    text-align: center;
+}
+
+.content-info form {
+    margin-top: 1rem;
+}
+
+.content-info label,
+.content-info input,
+.content-info textarea {
+    display: inline-block;
+    margin: 0 0 1rem 0;
+    vertical-align:bottom;
+    text-align: left;
+}
+
+.content-info label {
+    width: 30%;
+    border-bottom: 2px dotted #777;
+    font-size: 0.9rem;
+}
+
+.content-info textarea {
+    border: 2px dotted #777;
+    padding: 0.3rem;
+    min-height: 4rem;
+}
+
+.content-info input,
+.content-info textarea {
+    width: 60%;
+    border-bottom: 2px dotted #777;
+    color: #333;
+    font-size: 0.8rem;
+}
+
+
+.content-info input:active,
+.content-info input:focus,
+.content-info textarea:active,
+.content-info textarea:focus {
+    color: #111;
+    border-bottom: 2px solid #111;
+}
+
+.content-info textarea:active,
+.content-info textarea:focus {
+    border: 2px solid #111;
+
+}
+
+
+.content-info a,
 .content-note a,
 .e-content a {
     color:#115394;
 }
 
+
+.content-info a:hover,
 .content-note a:hover,
 .e-content a:hover {
     color:#004283;
+    text-decoration: underline;
 }
 
+
+
 .icon {
     transform: rotate(0.01deg);
     width: 19px;
@@ -323,6 +386,7 @@ pre code {
 .content-footer a:hover {
     color: #fefefe;
     border: none;
+    text-decoration: none;
 }
 
 .content-footer {
@@ -505,6 +569,7 @@ input[type=submit]:hover {
 .more a:hover,
 .pagination a:hover {
     border-bottom-color: #000;
+    text-decoration:none;
 }
 
 .more {
@@ -571,15 +636,14 @@ time {
     display: block;
 }
 
-.comments ol time,
-.comments ol .u-repost-of {
+.comments ol time {
     font-size: 0.8rem;
     margin: 0;
 }
 
-.comments ol .u-repost-of:before {
-    content: '\2022';
-    margin: 0 0.3rem;
+.comments ol .response_link {
+    font-size: 0.9rem;
+    margin: 0;
 }
 
 .comments dt,