diff --git a/layouts/_default/_markup/render-blockquote.html b/layouts/_default/_markup/render-blockquote.html
new file mode 100644
index 0000000..50d9652
--- /dev/null
+++ b/layouts/_default/_markup/render-blockquote.html
@@ -0,0 +1,9 @@
+{{ if and (eq .Type "alert") (eq .AlertType "todo") -}}
+<div style="background-color: tomato; color: white; padding: 10px;">
+    <em>TODO: </em>{{- .Text | plainify -}}
+</div>
+{{- else -}}
+<blockquote {{- with .Attributes.id }} id="{{ . }}"{{ end }}>
+{{ .Text -}}
+</blockquote>
+{{- end }}
diff --git a/layouts/shortcodes/todo.html b/layouts/shortcodes/todo.html
deleted file mode 100644
index e93f0fa..0000000
--- a/layouts/shortcodes/todo.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div style="background-color: tomato; color: white; padding: 10px;">
-    <em>TODO: </em>{{- .Inner -}}
-</div>