diff --git a/layouts/shortcodes/fig.html b/layouts/shortcodes/fig.html
index b8e71e3..314bc45 100644
--- a/layouts/shortcodes/fig.html
+++ b/layouts/shortcodes/fig.html
@@ -1,15 +1,22 @@
+{{ $fig := newScratch }}
+{{ if .Get "caption" }}
+    {{ $fig.Set "caption" (.Get "caption") }}
+{{ else if .Get "alt" }}
+    {{ $fig.Set "caption" (.Get "alt") }}
+{{ end }}
 <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 }} />
-    {{ if .Get "link"}}</a>{{ end }}
-    {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
+        <img src="{{ .Get "src" }}" 
+            {{ with $.Scratch.Get "caption" }}alt="{{ . }}"{{ end }}
+            {{ with .Get "align" }}align="{{ . }}"{{ end }}
+            {{ with .Get "width" }}width="{{ . }}"{{ end }}
+        />
+    {{ with .Get "link"}}</a>{{ end }}
+    {{ with ($fig.Get "caption") }}
     <figcaption>
-        {{ with .Get "title" }}
-            <span class="img--caption">{{ . }}</span>
-        {{ end }}
-        {{ with (.Get "caption")}}
-            <span class="img--caption">{{ . }}</span>
-        {{ end }}
+        <span class="img--caption">Figure {{ $.Page.Scratch.Get "fig" }}. {{ . }}</span>
     </figcaption>
     {{ end }}
 </figure>
+{{ .Page.Scratch.Add "fig" 1 }}
+{{ $fig.Delete "caption"}}
\ No newline at end of file