diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 129dc2b..b159e71 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -206,8 +206,15 @@
 (use-package org
   :ensure t
   :config
-  (setq org-directory "~/org")
-  (setq org-agenda-files "~/org/agenda")
+  (setq org-directory "~/org/")
+  (setq org-agenda-files (concat org-directory "agenda"))
+  (setq org-default-notes-file (concat org-directory "notes.org"))
+  (global-set-key (kbd "C-c c") 'org-capture)
+  (setq org-capture-templates
+		'( ("t" "Todo" entry (file+headline org-default-notes-file "Todos")
+			"* TODO %U %?\n  ")
+		   ("f" "Fix me" entry (file+headline "~/org/fixmes.org" "Fixmes")
+			"* TODO %?\n  %a\n  %i") ))
   (global-set-key (kbd "<f12>") 'my/counsel-org-agenda)
   (setq org-todo-keywords '((sequence "TODO" "WORKING" "BLOCKED" "REVIEW" "|" "ABANDONED" "DONE")))
   (setq org-todo-keyword-faces