diff --git a/settings/completion-settings.el b/settings/completion-settings.el
index 4019ae4c..f49bf5fd 100644
--- a/settings/completion-settings.el
+++ b/settings/completion-settings.el
@@ -179,8 +179,9 @@ Possible PACKAGE values are `company'."
   )
 
 (use-package yasnippet   ;; https://elpa.gnu.org/packages/yasnippet.html
-  :defer 1
   :delight (yas-minor-mode "Ys")  ;; \u24CE y
+  :hook ((prog-mode . yas-minor-mode)
+         (org-mode . yas-minor-mode))
   ;; see also variable yas-snippet-dirs, the yasnippet-snippets
   ;; collection dir is added via require 'yasnippet-snipets
   :config
@@ -188,8 +189,7 @@ Possible PACKAGE values are `company'."
   ;; global
   ;;(yas-global-mode 1)
   ;; on a per-buffer basis
-  (yas-reload-all)
-  (add-hook 'prog-mode-hook #'yas-minor-mode))
+  (yas-reload-all))
 
 ;; use popup menu for yas-choose-value
 (use-package popup
diff --git a/snippets/org-mode/article b/snippets/org-mode/article
new file mode 100644
index 00000000..4efc3f7a
--- /dev/null
+++ b/snippets/org-mode/article
@@ -0,0 +1,99 @@
+# -*- mode: snippet -*-
+# name: Article
+# group: templates
+# key: ?article
+# --
+#+TITLE: ${1:Title}
+#+SUBTITLE: ${2:Subtitle}
+#+DATE: ${3:13. April 2022}
+#+AUTHOR: ${4:Daniel Weschke}
+#+EMAIL: ${5:daniel.weschke@gmail.com}
+#+KEYWORDS:
+#+LANGUAGE:
+
+* BOP                                                                :ignore:
+#+LATEX: \pagenumbering{roman}\setcounter{page}{1}\thispagestyle{empty}
+
+* Coverpage                                                          :ignore:
+# Some beginning notes.
+
+* TOC and other lists                                                :ignore:
+:PROPERTIES:
+:VISIBILITY: folded
+:CLEARPAGE: t
+:END:
+# Table of Contents
+#+LATEX: \clearpage\pdfbookmark[1]{Contents}{toc}
+#+TOC: headlines
+#+LATEX: \thispagestyle{plain}
+
+# List of Figures  (# `#+TOC: figures' is not working)
+#+LATEX: \phantomsection\addcontentsline{toc}{section}{List of Figures}\listoffigures
+
+# List of Tables
+#+LATEX: \phantomsection\addcontentsline{toc}{section}{List of Tables}
+#+TOC: tables
+#+LATEX: \thispagestyle{plain}
+
+# List of Listings
+#+LATEX: \phantomsection\addcontentsline{toc}{section}{List of Listings}
+#+TOC: listings
+#+LATEX: \thispagestyle{plain}
+
+* List of Symbols
+:PROPERTIES:
+:CUSTOM_ID: list-of-symbols
+:UNNUMBERED: t
+:END:
+#+ATTR_LATEX: :center nil 
+| \(A\)           | mm^{2} | Area                               |
+| \(L\)           | mm  | Length                             |
+| \(f\)           | Hz  | Eigen frequency                    |
+| \(J\)           |     | {{{textsc(Jacobi)}}}an determinant |
+| \(m\ti{ges}\)   | kg  | Total mass                         |
+| \(m_{ik}\ho{eff}\) | kg  | Effective mass                     |
+
+* Glossary and Acronyms                                              :ignore:
+:PROPERTIES:
+:UNNUMBERED: t
+:END:
+#+name: glossary
+| label | name  | description   |
+|-------+-------+---------------|
+| tree  | Tree  | A woody plant |
+| shrub | Shrub | A woody bush  |
+
+#+name: acronyms
+| key  | abbreviation | full form                      |
+|------+--------------+--------------------------------|
+| mimo |              | multiple-input multiple output |
+| qos  | QoS          | quality-of-service             |
+| bb   | BB           | branch and bound               |
+
+[[printglossaries:]]
+# \printglossary[type=\acronymtype]
+# \printglossary
+
+* EOP                                                                :ignore:
+#+LATEX: \newpage\pagenumbering{arabic}\setcounter{page}{1}
+
+* 1st Header
+$0
+
+* References                                                         :ignore:
+# #+LATEX_HEADER_EXTRA: \addbibresource{references.bib}
+[[printbibliography:]]
+
+* Appendix
+:PROPERTIES:
+:UNNUMBERED: t
+:APPENDIX: t
+:END:
+# ! UNNUMBERED: t !
+# ! APPENDIX: t !
+
+** 1st appendix
+:PROPERTIES:
+:UNNUMBERED: nil
+:END:
+# ! UNNUMBERED: nil !