diff --git a/themes/maik-blog/assets/scss/_main.scss b/themes/maik-blog/assets/scss/_main.scss
index 5548ed1..cc38715 100644
--- a/themes/maik-blog/assets/scss/_main.scss
+++ b/themes/maik-blog/assets/scss/_main.scss
@@ -182,8 +182,10 @@ figure {
   }
 
   figcaption {
-    font-size: 14px;
-    margin-top: 5px;
+    font-size: 1.125rem;
+    line-height: 1.3;
+    margin: 1.33em 0;
+    font-weight: bold;
     opacity: 0.8;
 
     &.left {
diff --git a/themes/maik-blog/layouts/shortcodes/figure.html b/themes/maik-blog/layouts/shortcodes/figure.html
index 36a7225..8a9c4d5 100644
--- a/themes/maik-blog/layouts/shortcodes/figure.html
+++ b/themes/maik-blog/layouts/shortcodes/figure.html
@@ -14,17 +14,23 @@
     {{- if .Get "link" }}</a>{{ end -}}
   {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr") -}}
   <figcaption>
-    {{ with (.Get "title") -}}
+    {{- if or (.Get "caption") (.Get "attr") -}}
+    {{- with (.Get "title") -}}
     <h4>{{ . }}</h4>
     {{- end -}}
-    {{- if or (.Get "caption") (.Get "attr") -}}<p>
+    <p>
       {{- .Get "caption" | markdownify -}}
       {{- with .Get "attrlink" }}
       <a href="{{ . }}">
         {{- end -}}
         {{- .Get "attr" | markdownify -}}
-        {{- if .Get "attrlink" }}</a>{{ end }}</p>
-    {{- end }}
+        {{- if .Get "attrlink" }}</a>{{ end }}
+    </p>
+    {{- else -}}
+    {{- with (.Get "title") -}}
+    {{ . }}
+    {{- end -}}
+    {{- end -}}
   </figcaption>
   {{- end }}
   </figure>
\ No newline at end of file