diff --git a/layouts/shortcodes/quote.html b/layouts/shortcodes/quote.html
new file mode 100644
index 0000000..26486ca
--- /dev/null
+++ b/layouts/shortcodes/quote.html
@@ -0,0 +1,4 @@
+<blockquote>
+	<p>{{ .Inner | markdownify }}</p>
+	{{ with .Get "caption" }}<p class="quotecaption">{{ . | markdownify }}</p>{{ end }}
+</blockquote>
diff --git a/static/css/style.css b/static/css/style.css
index 8bb3682..b466ec5 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -362,9 +362,23 @@ article .post-content {
 
 .page-content blockquote {
 	border: 1px dashed grey;
+	background-color: #2c2f31;
+	max-width: 80%;
+	margin: auto;
+}
+.page-content blockquote p {
 	padding-right: 15px;
 	padding-left: 15px;
-	background-color: #2c2f31;
+}
+
+.page-content blockquote p.quotecaption {
+	text-align: right;
+	font-size: 15px;
+	border-top: 1px dashed grey;
+	margin-top: 0px;
+	margin-bottom: 0px;
+	padding-bottom: 10px;
+	padding-top: 10px;
 }
 
 
@@ -434,12 +448,12 @@ figure img {
 	max-width: 100%;
 }
 
-
 figure.audiofig audio {
 	width: 90%;
 	align: center;
 }
 
+
 .center {
 	text-align: center;
 }