diff --git a/espanso/match/emoji.yml b/espanso/match/emoji.yml
index 1df3407..5656e3d 100644
--- a/espanso/match/emoji.yml
+++ b/espanso/match/emoji.yml
@@ -2,57 +2,75 @@ matches:
   - trigger: ":proposal:"
     label: Proposal
     replace: "🐣"
+
   - trigger: ":pitch:"
     label: Pitch
     replace: "💡"
+
   - trigger: ":ding:"
     label: Reminder
     replace: "🛎"
+
   - trigger: ":0:"
     label: Emoji 0
     replace: "0️⃣"
+
   - trigger: ":1:"
     label: Emoji 1
     replace: "1️⃣"
+
   - trigger: ":2:"
     label: Emoji 2
     replace: "2️⃣"
+
   - trigger: ":3:"
     label: Emoji 3
     replace: "3️⃣"
+
   - trigger: ":4:"
     label: Emoji 4
     replace: "4️⃣"
+
   - trigger: ":5:"
     label: Emoji 5
     replace: "5️⃣"
+
   - trigger: ":6:"
     label: Emoji 6
     replace: "6️⃣"
+
   - trigger: ":7:"
     label: Emoji 7
     replace: "7️⃣"
+
   - trigger: ":8:"
     label: Emoji 8
     replace: "8️⃣"
+
   - trigger: ":9:"
     label: Emoji 9
     replace: "9️⃣"
+
   - trigger: ":10:"
     label: Emoji 10
     replace: "🔟"
+
   - trigger: ":pmd:"
     label: Pomodori
     replace: "🍅"
+
   - trigger: ":-"
     label: Minus
     replace: "🚫"
+
   - trigger: ":+"
     label: Plus
     replace: "✅"
+
   - trigger: ":!"
     label: Warning
     replace: "⚠️"
+
   - trigger: ":?"
     label: Question
-    replace: "❓"
\ No newline at end of file
+    replace: "❓"
diff --git a/espanso/match/japanese.yml b/espanso/match/japanese.yml
index 06f16fd..8dde111 100644
--- a/espanso/match/japanese.yml
+++ b/espanso/match/japanese.yml
@@ -2,30 +2,38 @@ matches:
   - trigger: "Dojo"
     label: Dōjō
     replace: "Dōjō"
+
   - trigger: "Bushido"
     label: Bushidō
     replace: "Bushidō"
+
   - trigger: "Daimyo"
     label: Daimyō
     replace: "Daimyō"
+
   - trigger: "Daisho"
     label: Daishō
     replace: "Daishō"
+
   - trigger: "Ryu"
     label: Ryū
     replace: "Ryū"
+
   - trigger: "OO"
     label: Japanisches Längenzeichen Ō
     replace: "Ō"
     word: true
+
   - trigger: "oo"
     label: Japanisches Längenzeichen ō
     replace: "ō"
     word: true
+
   - trigger: "UU"
     label: Japanisches Längenzeichen Ū
     replace: "Ū"
     word: true
+
   - trigger: "uu"
     label: Japanisches Längenzeichen ū
     replace: "ū"
diff --git a/espanso/match/shortcodes.yml b/espanso/match/shortcodes.yml
new file mode 100644
index 0000000..7845e69
--- /dev/null
+++ b/espanso/match/shortcodes.yml
@@ -0,0 +1,46 @@
+matches:
+  - label: "Shortcode: Affiliate"
+    replace: '{% affiliate "Titel", "ASIN" %}'
+
+  - label: "Shortcode: Flag"
+    replace: '{% flag "Label", "URL" %}'
+
+  - label: "Shortcode: Netflix Flag"
+    replace: '{% netflix "ID" %}'
+
+  - label: "Shortcode: Amazon Prime Video Flag"
+    replace: '{% primevideo "ID" %}'
+
+  - label: "Shortcode: More Link"
+    replace: '{% more "Text", "url" %}'
+
+  - label: "Shortcode: Download Link"
+    replace: '{% download "Text", "URL" %}'
+
+  - label: "Shortcode: Color Swatch"
+    replace: '{% color "#HEX", "TITLE", "DESCRIPTION" %}'
+
+  - label: "Shortcode: Color Stack"
+    replace: "{% colorstack %}\n{% color \"#HEX\", \"TITLE\", \"DESCRIPTION\" %}\n{% endcolorstack %}"
+
+  - label: "Shortcode: Book"
+    replace: '{% book "ASIN", "ALT" %}'
+
+  - label: "Shortcode: Bookshelf"
+    replace: "{% bookshelf %}\n{% book \"ASIN\", \"ALT\" %}\n{% endbookshelf %}"
+
+  - label: "Shortcode: Banner"
+    replace: "{% banner \"Summary\" %}\n\n$|$\n\n{% endbanner %}"
+
+  - label: "Shortcode: Quote mit Link"
+    replace: ">\n> **Author**, *[Source]()*"
+
+  - label: "Shortcode: Quote"
+    replace: ">\n> **Author**, *Source*"
+
+  - label: "Shortcode: Pullquote"
+    replace: "<blockquote lang=\"en\" class=\"pullquote\">\n
+              \t<p>$|$</p>\n
+              \t<footer>\n
+              \t\t<b></b>, <cite></cite>\n
+              \t</footer>\n</blockquote>"
diff --git a/espanso/match/typography.yml b/espanso/match/typography.yml
index 8081abe..b68158e 100644
--- a/espanso/match/typography.yml
+++ b/espanso/match/typography.yml
@@ -2,50 +2,66 @@ matches:
   - trigger: "1star"
     label: 1 Star
     replace: "★"
+
   - trigger: "2star"
     label: 2 Star
     replace: "★★"
+
   - trigger: "3star"
     label: 3 Star
     replace: "★★★"
+
   - trigger: "4star"
     label: 4 Star
     replace: "★★★★"
+
   - trigger: "5star"
     label: 5 Star
     replace: "★★★★★"
+
   - trigger: "===>"
     label: Dicker Pfeil nach links (➜)
     replace: "➜"
+
   - trigger: "<===>"
     label: Link-Rechts Pfeil (⬌)
     replace: "⬌"
+
   - trigger: "<---"
     label: Pfeil nach links (←)
     replace: "←"
+
   - trigger: "---^"
     label: Pfeil nach oben (↑)
     replace: "↑"
+
   - trigger: "--->"
     label: Pfeil nach rechts (→)
     replace: "→"
+
   - trigger: "---v"
     label: Pfeil nach unten (↓)
     replace: "↓"
+
   - trigger: ":snip"
     label: Abrisskante
     replace: "✂---✂---✂---✂---✂---✂---✂---✂---✂---✂---✂---✂---✂"
+
   - trigger: ":bull"
     label: Bullet (•)
     replace: "•"
+
   - trigger: ":mid"
     label: Middot (·)
     replace: "·"
+
   - trigger: ":flag"
     label: Flagge (⚑)
     replace: "⚑"
+
   - label: Schleifenquadrat (⌘)
     replace: "⌘"
+
   - trigger: ":x:"
     label: Multiplikationszeichen
     replace: "×"