diff --git a/layouts/404.html b/layouts/404.html
deleted file mode 100644
index eacfec0..0000000
--- a/layouts/404.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{{ partial "header.html" . }}
-
-<header><h1>404: Page not found</h1></header>
-
-{{ .Content }}
-
-{{ partial "footer.html" . }}
diff --git a/layouts/blog.html b/layouts/blog.html
deleted file mode 100644
index 26dccc7..0000000
--- a/layouts/blog.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ define "main" }}
-{{ .Content }}
-
-{{range.Site.RegularPages}}
-<li><a href="{{.Permalink}}">{{.Title}}</a></li>
-{{end}}
-
-{{ partial "tagcloud.html" . }}
-
-{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 008a42e..df4f9b2 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -13,7 +13,7 @@
         {{- end -}}
 </main>
 <footer>
-	<a href="{{ .Site.BaseURL }}">{{ .Site.BaseURL }}</a></br>
+	<a href="{{ .Site.BaseURL }}">{{ .Site.BaseURL }}</a><br>
 	{{ if .Site.Params.showrss }}<a href="/index.xml"><img src="/pix/rss.svg" style="max-height:.9em;display:inline" alt=""> Subscribe via RSS for Updates.</a>{{ end }}
 </footer>
 </body>
diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
index 0d51052..ff7959b 100644
--- a/layouts/shortcodes/img.html
+++ b/layouts/shortcodes/img.html
@@ -1,18 +1,20 @@
-<!-- image -->
-<figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
-    {{ with .Get "link"}}<a href="{{.}}">{{ end }}
-        <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}"{{ end }}{{ with .Get "mouse"}}title="{{.}}"{{end}}/>
-    {{ if .Get "link"}}</a>{{ end }}
-    {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
-    <figcaption>{{ if isset .Params "title" }}
-        <h4>{{ .Get "title" }}</h4>{{ end }}
-        {{ if or (.Get "caption") (.Get "attr")}}<p>
-        {{ .Get "caption" }}
-        {{ with .Get "attrlink"}}<a href="{{.}}">{{ end }}
-            {{ .Get "attr" }}
-        {{ if .Get "attrlink"}}</a>{{ end }}
-        </p>{{ end }}
-    </figcaption>
-    {{ end }}
+<!--
+	class: class of the figure
+	link: url the image directs to
+	alt: alternative text
+	caption: caption
+	mouse: what the image says when moused over ("title" in HTML)
+-->
+<figure {{ with .Get "class" }}class="{{.}}"{{ end -}}>
+	{{- with .Get "link"}}<a href="{{.}}">{{ end -}}
+	<img src="{{ .Get "src" }}"
+	     {{- with .Get "mouse" }} title="{{.}}"{{ end -}}
+	     {{- with .Get "alt" }} alt="{{.}}"{{ end -}}
+	>
+	{{- if .Get "link"}}</a>{{ end -}}
+	{{- with .Get "caption" -}}
+	<figcaption>
+	{{- . -}}
+	</figcaption>
+	{{- end -}}
 </figure>
-<!-- image -->