diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 4996cb0..12cd7ba 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -1,26 +1,26 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-	<channel>
-	<title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
-	<link>{{ .Permalink }}</link>
-	<description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
-	<generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
-	<language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
-	<managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
-	<webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
-	<copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
-	<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
-	{{ with .OutputFormats.Get "RSS" }}
-		{{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
-	{{ end }}
-	{{ range .Site.RegularPages }}
-		<item>
-		<title>{{ .Title }}</title>
-		<link>{{ .Permalink }}</link>
-		<pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
-		{{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
-		<guid>{{ .Permalink }}</guid>
-		<description>{{ .Content | html }}</description>
-		</item>
-	{{ end }}
-	</channel>
+  <channel>
+    <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+    <link>{{ .Permalink }}</link>
+    <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
+    <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
+    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
+    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
+    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
+    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
+    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    {{ with .OutputFormats.Get "RSS" }}
+        {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
+    {{ end }}
+    {{ range .Site.RegularPages }}
+    <item>
+      <title>{{ .Title }}</title>
+      <link>{{ .Permalink }}</link>
+      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+      <guid>{{ .Permalink }}</guid>
+      <description>{{ .Content | html }}</description>
+    </item>
+    {{ end }}
+  </channel>
 </rss>
diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
index 9957c21..1231a94 100644
--- a/layouts/shortcodes/img.html
+++ b/layouts/shortcodes/img.html
@@ -1,31 +1,21 @@
 {{ $img := $.Page.Resources.GetMatch (.Get "src")}}
+{{ $test := $img.Permalink }}
+{{ $name_splitted := split $img.RelPermalink "." }}
+{{ $name_base := index $name_splitted 0 }}
 <figure {{ with .Get "class" }} class="{{ . }}"{{ end }}>
 	{{ with .Get "link" }}
-		<a href="{{ . | absURL }}">
+		<a href="{{ . }}">
 	{{ end }}
-	<img src="{{ $img.RelPermalink }}"
-	{{ with .Get "alt"}} alt="{{ . }}"{{ end }}
-	{{ with .Get "title"}} title="{{ . }}"{{ end }}
-	{{ with .Get "height"}} height="{{ . }}"{{ end }}
-	{{ with .Get "width"}} width="{{ . }}"{{ end }} />
+	<picture>
+		<source srcset="{{$img.RelPermalink}}" type="image/jpg">
+		<img src="{{ $img.RelPermalink }}" alt="{{.Get "alt" }}" />
+	</picture>
 	{{ with .Get "link" }}
 		</a>
 	{{ end }}
-	{{ if .Get "caption" }}
+	{{ with .Get "title" }}
 	<figcaption>
-		<p>{{ .Get "caption" }}
-		{{ if .Get "attr" }}
-			<span class="attribution">
-			{{ with .Get "attrlink" }}
-				<a href="{{ . }}">
-			{{ end }}
-			{{ .Get "attr" }}
-			{{ with .Get "attrlink" }}
-				</a>
-			{{ end }}
-			</span>
-		{{ end }}
-		</p>
+		<p>{{ . }}</p>
 	</figcaption>
 	{{ end }}
 </figure>
diff --git a/layouts/shortcodes/quote.html b/layouts/shortcodes/quote.html
index d87b737..c23c499 100644
--- a/layouts/shortcodes/quote.html
+++ b/layouts/shortcodes/quote.html
@@ -9,7 +9,7 @@
 	<footer>
 		<cite>
 			{{ with .Get "url" }}
-			<a href="{{ . }}" {{ with $.Get "title"}}title="{{ . }}"{{ end }}>
+			<a href={{ . }} {{ with $.Get "title"}}title="{{ . }}"{{ end }}>
 			{{ end }}
 			{{ .Get "author" | markdownify }}
 			{{ with .Get "url" }}</a>{{end}}</cite>
diff --git a/static/css/style.css b/static/css/style.css
index c4d3a44..002b988 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -526,7 +526,7 @@ a:focus {
 .article-body figure.border figcaption {
 	background-color: var(--background-color-light);
 }
-.article-body figure>a {
+.article-body figure a {
 	display: block;
 	min-height: 100%;
 }
@@ -540,9 +540,6 @@ a:focus {
 	margin-left: 1rem;
 	margin-right: 1rem;
 }
-.article-body figure figcaption .attribution {
-	float: right;
-}
 @media only screen and (max-width: 320px) {
 	.article-body .footnotes ol {
 		padding-left: 2em;