diff --git a/layouts/shortcodes/kbd.html b/layouts/shortcodes/kbd.html
new file mode 100644
index 0000000..c3c3739
--- /dev/null
+++ b/layouts/shortcodes/kbd.html
@@ -0,0 +1 @@
+<kbd>{{- .Get 0 -}}</kbd> 
diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html
new file mode 100644
index 0000000..a214873
--- /dev/null
+++ b/layouts/shortcodes/note.html
@@ -0,0 +1,4 @@
+<blockquote {{ with .Get "class" }}class="{{.}}"{{ end }}>
+    <strong>{{ .Get 0 | default "Note" }}</strong><br>
+    {{- .Inner -}}
+</blockquote>
\ No newline at end of file
diff --git a/layouts/shortcodes/warning.html b/layouts/shortcodes/warning.html
new file mode 100644
index 0000000..a2042cf
--- /dev/null
+++ b/layouts/shortcodes/warning.html
@@ -0,0 +1,3 @@
+<blockquote class="warning">
+    {{- .Inner -}}
+</blockquote>
\ No newline at end of file