diff --git a/emacs/.emacs.d/init/oni-org-init.el b/emacs/.emacs.d/init/oni-org-init.el
index b207a7e..d1bbdfb 100644
--- a/emacs/.emacs.d/init/oni-org-init.el
+++ b/emacs/.emacs.d/init/oni-org-init.el
@@ -29,12 +29,15 @@
 (require 'org-capture)
 (require 'org-habit)
 
+(setq org-default-notes-file "~/documents/gtd/inbox.org")
 (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 t)
+(setq org-log-into-drawer t)
+(setq org-agenda-todo-ignore-scheduled 'future)
 
 (setq org-agenda-files
       '("~/documents/gtd/todo.org"
@@ -48,7 +51,7 @@
         ("~/documents/gtd/appointments.org" :maxlevel . 1)))
 
 (setq org-capture-templates
-      '(("t" "TODO [inbox]" entry (file "~/documents/gtd/inbox.org")
+      '(("t" "Note" entry (file "~/documents/gtd/inbox.org")
          "* TODO %i%?")
         ("a" "Appointment" entry (file "~/documents/gtd/appointments.org")
          "* %i%?\n  %U")))
@@ -57,6 +60,8 @@
       '((sequence "TODO(t)" "BLOCKED(b@)" "PROGRESS(p)"
                   "|" "DONE(d!)" "CANCELLED(c@)")))
 
+(add-to-list 'org-modules 'org-habit)
+
 (add-hook 'org-mode-hook 'auto-fill-mode)
 (add-hook 'org-mode-hook 'org-bullets-mode)