diff --git a/emacs/feature/feature-completion.el b/emacs/feature/feature-completion.el
index 7a42936..7f422e1 100644
--- a/emacs/feature/feature-completion.el
+++ b/emacs/feature/feature-completion.el
@@ -8,6 +8,7 @@
 
 (require 'module-orderless)
 (require 'module-snippets)
+(require 'module-marginalia)
 
 (provide 'feature-completion)
 
diff --git a/emacs/module/module-marginalia.el b/emacs/module/module-marginalia.el
new file mode 100644
index 0000000..7f69d2f
--- /dev/null
+++ b/emacs/module/module-marginalia.el
@@ -0,0 +1,14 @@
+;;; module-marginalia.el --- marginalia support
+;;
+;;; Commentary:
+;;;
+;; This file provides support for marginalia in org-mode.
+
+;;; Code:
+
+(require 'module-pkg)
+(pkg/require 'marginalia)
+(define-key minibuffer-local-map (kbd "M-A") 'marginalia-cycle)
+
+(marginalia-mode)
+;;; module-marginalia.el ends here
diff --git a/emacs/module/module-org-drill.el b/emacs/module/module-org-drill.el
index b4cb3d1..621cefe 100644
--- a/emacs/module/module-org-drill.el
+++ b/emacs/module/module-org-drill.el
@@ -15,10 +15,16 @@
 
 (add-to-list
  'org-capture-templates
- '("v" "Deutsch Verb" entry
+ '("v" "Deutsch Vocabulary" entry
 	 (file+headline "~/doc/deutsch.org" "Vocabulary")
 	 "* %^{Word type|Noun|Verb|Adjective|Adverb|Preposition|Conjunction|Interjection|Pronoun} :drill:\n:PROPERTIES:\n:DRILL_CARD_TYPE: twosided\n:END:\n** Deutsch\n%^{German word}\n** English\n%^{English translation}"))
-(provide 'module-org-drill)
+
+(add-to-list
+ 'org-capture-templates
+ '("V" "Bairisch Vocabulary" entry
+	 (file+headline "~/doc/bairisch.org" "Vocabulary")
+	 "* %^{Word type|Noun|Verb|Adjective|Adverb|Preposition|Conjunction|Interjection|Pronoun} :drill:\n:PROPERTIES:\n:DRILL_CARD_TYPE: twosided\n:END:\n** Deutsch\n%^{German word}\n** English\n%^{English translation}"))
+
 
 (add-to-list
  'org-capture-templates
@@ -28,16 +34,34 @@
 
 (add-to-list
  'org-capture-templates
- '("d" "Noun Declension" entry
+ '("P" "Bairisch Phrase" entry
+	 (file+headline "~/doc/bairisch.org" "Phrases")
+	 "* %^{Phrase Type|Phrase|Greeting|Idiom|Saying} :drill:\n:PROPERTIES:\n:DRILL_CARD_TYPE: twosided\n:END:\n** Deutsch\n%^{German phrase}\n** English\n%^{English translation}"))
+
+(add-to-list
+ 'org-capture-templates
+ '("d" "Deutsch Noun Declension" entry
 	 (file+headline "~/doc/deutsch.org" "Noun Declension")
 	 "* %^{German word} :drill:\n:PROPERTIES:\n:DRILL_CARD_TYPE: show2cloze\n:END:\n|---\n|Kasus|Singular|Plural|\n|---\n|Nominativ|[%^{nomsing}]|[%^{nompl}]|\n|Genitiv|[%^{gensing}]|[%^{genpl}]|\n|Dativ|[%^{datsing}]|[%^{datpl}]|\n|Akkusativ|[%^{akksing}]|[%^{akkpl}]|\n|---"))
 
 (add-to-list
  'org-capture-templates
- '("c" "Verb Conjugation" entry
+ '("d" "Bairisch Noun Declension" entry
+	 (file+headline "~/doc/bairisch.org" "Noun Declension")
+	 "* %^{German word} :drill:\n:PROPERTIES:\n:DRILL_CARD_TYPE: show2cloze\n:END:\n|---\n|Kasus|Singular|Plural|\n|---\n|Nominativ|[%^{nomsing}]|[%^{nompl}]|\n|Genitiv|[%^{gensing}]|[%^{genpl}]|\n|Dativ|[%^{datsing}]|[%^{datpl}]|\n|Akkusativ|[%^{akksing}]|[%^{akkpl}]|\n|---"))
+
+(add-to-list
+ 'org-capture-templates
+ '("c" "Deutsch Verb Conjugation" entry
 	 (file+headline "~/doc/deutsch.org" "Verb Conjugation")
 	 "* %^{German word} :drill:\n:PROPERTIES:\n:DRILL_CARD_TYPE: show2cloze\n:END:\n|---\n|ich|[%^{ich}]|wir|[%^{wir}]|\n|du|[%^{du}]|ihr|[%^{ihr}]\n|er/sie/es|[%^{er/sie/es}]|sie/Sie|[%^{sie/Sie}]|\n|--\n\nPerfekt: [%^{verb|haben|sein}] + [%^{perfekt}]."))
 
+(add-to-list
+ 'org-capture-templates
+ '("c" "Bairisch Verb Conjugation" entry
+	 (file+headline "~/doc/bairisch.org" "Verb Conjugation")
+	 "* %^{German word} :drill:\n:PROPERTIES:\n:DRILL_CARD_TYPE: show2cloze\n:END:\n|---\n|ich|[%^{ich}]|wir|[%^{wir}]|\n|du|[%^{du}]|ihr|[%^{ihr}]\n|er/sie/es|[%^{er/sie/es}]|sie/Sie|[%^{sie/Sie}]|\n|--\n\nPerfekt: [%^{verb|haben|sein}] + [%^{perfekt}]."))
+
 (provide 'module-org-drill)
 
 ;;; module-org.el ends here.