    org-latex-default-packages-alist (remove '("" "hyperref" nil) org-latex-default-packages-alist)
    org-latex-default-packages-alist (remove '"\\tolerance=1000" org-latex-default-packages-alist))
 
-  ;; syntax highlighting
-  (setq org-src-fontify-natively t)
+  ;; add comment to easy templates
+  ;; Credits: http://acidwords.com/posts/2018-03-02-extending-org-mode-easy-templates.html
+  (add-to-list 'org-structure-template-alist
+	       '("C" "#+BEGIN_COMMENT\n?\n#+END_COMMENT" ""))
+
+  ;; org todo keywords
+  ;; Creadits: https://changelog.complete.org/archives/9877-emacs-3-more-on-org-mode
+  (setq org-todo-keywords '((sequence
+			     "TODO(t!)" "NEXT(n!)" "STARTED(a!)" "WAIT(w@/!)" "OTHERS(o!)"
+			     "|" "DONE(d)" "CANCELLED(c)")))
+
+  (setq
+   ;; syntax highlighting
+   org-src-fontify-natively t
+   ;; Don't break line on M-RET
+   org-M-RET-may-split-line nil
+   ;; Log done time
+   org-log-done 'time
+   ;; only show last star
+   org-hide-leading-stars t
+   ;; show something instead of ...
+   org-ellipsis "⤵")
 
   ;; set default agenda file
-  (setq org-agenda-files (quote ("/home/marcel/cloud/todo.org")))
+  (setq org-agenda-files (list "~/cloud/org/todo.org"
+			       "~/cloud/org/notes.org"
+			       "~/cloud/org/projects.org")
+	org-agenda-text-search-extra-files (list "~/cloud/org/finance.org"
+						 "~/cloud/org/emacs-magic.org"
+						 "~/cloud/org/wiki.org"))
 
   ;; set priority range from A to C with A being the highest
   (setq org-priority-faces '((?A . (:foreground "#F0DFAF" :weight bold))

  ;; don't give awarning colour to tasks with impending deadlines
  ;; if they are scheduled to be done
  (setq org-agenda-skip-deadline-prewarning-if-scheduled (quote pre-scheduled))

  ;; don't show tasks that are scheduled or have deadlines in the normal todo list
  (setq org-agenda-todo-ignore-deadlines (quote all))
  (setq org-agenda-todo-ignore-scheduled (quote all))

  ;; sort tasks in order of when they are due and then by priority
  (setq org-agenda-sorting-strategy


  :bind
  (("C-c l" . org-store-link)
   ("C-c c" . org-capture)
   ("C-c o" . org-iswitchb)
   ("C-c a" . org-agenda))

  :hook (org-mode-hook . flyspell-mode))

;; fill-column-indicator
;; Graphically indicate the fill column
