diff --git a/assets/scss/vendor/tufte.scss b/assets/scss/vendor/tufte.scss
index 45c9a43..8aebf71 100644
--- a/assets/scss/vendor/tufte.scss
+++ b/assets/scss/vendor/tufte.scss
@@ -151,7 +151,7 @@ p {
 
 /* Chapter Epigraphs */
 div.epigraph {
-    margin: 5em 0;
+    margin: 3em 0;
 }
 
 div.epigraph > blockquote {
@@ -185,7 +185,7 @@ blockquote p {
 blockquote footer {
     width: 50%;
     font-size: 1.1rem;
-    text-align: right;
+    text-align: right !important;
 }
 
 ol,
diff --git a/layouts/shortcodes/blockquote.html b/layouts/shortcodes/blockquote.html
index 8217018..22ad5fd 100644
--- a/layouts/shortcodes/blockquote.html
+++ b/layouts/shortcodes/blockquote.html
@@ -1,6 +1,8 @@
 <blockquote cite="{{ .Get "cite" }}">
-  <p>
-    {{ .Inner | markdownify }}
-  </p>
-  <footer>{{ .Get "footer" }}{{ with .Get "cite" }}, <cite>{{ . }}</cite>{{ end }}</footer>
+{{ .Inner | $.Page.RenderString (dict "display" "block") }}
+<footer>
+{{- with .Get "author" -}}{{ . }}{{- end -}}
+{{- with .Get "cite" -}}, <cite>{{ . | markdownify }}</cite>{{- end -}}
+{{- with .Get "detail" -}}, {{ . | markdownify }}{{- end -}}
+</footer>
 </blockquote>
diff --git a/layouts/shortcodes/epigraph.html b/layouts/shortcodes/epigraph.html
index d8fa762..74fd3ee 100644
--- a/layouts/shortcodes/epigraph.html
+++ b/layouts/shortcodes/epigraph.html
@@ -1,15 +1,12 @@
 <div class="epigraph">
 <blockquote>
-{{ $t := .Get "type" }}
-{{ if eq $t "compact"  }}{{ .Inner | markdownify }}{{ else }}<p>{{ .Inner | markdownify }}</p>{{ end }}
+{{ .Inner | $.Page.RenderString (dict "display" "block") }}
 {{ if .IsNamedParams }}
-<footer>
-{{ with .Get "pre" }}{{ . }}{{ end }}
-{{ with .Get "link" }}<a href={{ . }}>{{ end }}
-{{ with .Get "cite" }}<cite>{{ . }}</cite>{{ end }}
-</a>
-{{ with .Get "post" }}{{ . }}{{ end }}
-</footer>
+    <footer>
+    {{- with .Get "author" -}}{{ . }}{{- end -}}
+    {{- with .Get "cite" -}}, <cite>{{ . | markdownify }}</cite>{{- end -}}
+    {{- with .Get "detail" -}}, {{ . | markdownify }}{{- end -}}
+    </footer>
 {{ end }}
 </blockquote>
 </div>