@@ -549,15 +549,15 @@ :config (progn             (setq calendar-week-start-day 1)
             (calendar-set-date-style 'iso)))
 
-(use-package org-mode
+(use-package org
   :bind (("C-c C-a" . org-agenda-list)
          ("C-c a" . org-agenda)
          ("C-c l" . org-store-list)
          ("C-c r" . org-remember)
          ("C-c b" . org-iswitchb))
   :config (progn
-            (setq org-directory "~/org")
-            (setq org-agenda-files `(,org-directory)
+            (setq org-directory "~/org"
+                  org-agenda-files `(,org-directory)
 
                   org-default-notes-file (concat org-directory "/notes")
 
@@ -588,8 +588,12 @@ org-export-have-math t 
                   org-blank-before-new-entry '((heading . t)
                                                (plain-list-item . auto))
-                  org-fontify-done-headline t)
+                  org-fontify-done-headline t
 
+                  org-replace-disputed-keys t
+                  org-todo-keywords '((sequence "TODO" "STARTED" "|" "DONE")
+                                      (sequence "TOLEARN" "LEARNING" "LEARNED" "|" "MASTERED")
+                                      (sequence "|" "CANCELLED")))
             (defadvice org-clock-in (after wicked activate)
               "Mark STARTED when clocked in"
               (save-excursion
@@ -597,11 +601,7 @@ (catch 'exit                   (org-back-to-heading t)
                   (if (looking-at org-outline-regexp) (goto-char (1- (match-end 0))))
                   (if (looking-at (concat " +" org-todo-regexp "\\( +\\|[ \t]*$\\)"))
-                      (org-todo "STARTED"))))))
-  :init (setq org-replace-disputed-keys t
-              org-todo-keywords '((sequence "TODO" "STARTED" "|" "DONE")
-                                  (sequence "TOLEARN" "LEARNING" "LEARNED" "|" "MASTERED")
-                                  (sequence "|" "CANCELLED"))))
+                      (org-todo "STARTED")))))))
 
 ;;;; Programming