diff --git a/emacs/.emacs.d/init/oni-org-init.el b/emacs/.emacs.d/init/oni-org-init.el
index 67559ff..85ced77 100644
--- a/emacs/.emacs.d/init/oni-org-init.el
+++ b/emacs/.emacs.d/init/oni-org-init.el
@@ -27,12 +27,35 @@
 (require 'org)
 (require 'org-bullets)
 (require 'org-capture)
+(require 'org-habit)
 
 (setq org-src-fontify-natively t)
 (setq org-return-follows-link t)
 (setq org-fontify-whole-heading-line t)
 (setq org-hide-emphasis-markers t)
 (setq org-return-follows-link t)
+(setq org-use-fast-todo-selection tt)
+
+(setq org-agenda-files
+      '("~/documents/gtd/todo.org"
+        "~/documents/gtd/projects.org"
+        "~/documents/gtd/appointments.org"))
+
+(setq org-refile-targets
+      '(("~/documents/gtd/todo.org" :maxlevel . 1)
+        ("~/documents/gtd/projects.org" :level . 2)
+        ("~/documents/gtd/someday.org" :maxlevel . 2)
+        ("~/documents/gtd/appointments.org" :maxlevel . 1)))
+
+(setq org-capture-templates
+      '(("t" "TODO [inbox]" entry (file "~/documents/gtd/inbox.org")
+         "* TODO %i%?")
+        ("a" "Appointment" entry (file "~/documents/gtd/appointments.org")
+         "* %i%?\n  %U")))
+
+(setq org-todo-keywords
+      '((sequence "TODO(t)" "BLOCKED(b@)" "PROGRESS(p)"
+                  "|" "DONE(d!)" "CANCELLED(c@)")))
 
 (add-hook 'org-mode-hook 'auto-fill-mode)
 (add-hook 'org-mode-hook 'org-bullets-mode)