diff --git a/emacs/init.el b/emacs/init.el
index 077b908..79ee489 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -58,7 +58,7 @@
  '(nlinum-format "%d ")
  '(package-selected-packages
    (quote
-    (go-mode helm-projectile helm nlinum coffee-mode yaml-mode web-mode typescript-mode scala-mode php-mode markdown-mode js2-mode haskell-mode evil-surround evil-leader evil autopair)))
+    (evil-org org go-mode helm-projectile helm nlinum coffee-mode yaml-mode web-mode typescript-mode scala-mode php-mode markdown-mode js2-mode haskell-mode evil-surround evil-leader evil autopair)))
  '(require-final-newline t)
  '(scheme-program-name "racket")
  '(show-paren-delay 0)
@@ -177,3 +177,15 @@
           (lambda ()
             (font-lock-add-keywords nil
                                     '(("\\(FIXME\\|TODO\\|BUG\\|QQ\\):" 0 font-lock-warning-face t)))))
+
+(require 'org-install)
+(require 'evil-org)
+(add-hook 'org-mode-hook 'evil-org-mode)
+(evil-org-set-key-theme '(navigation insert textobjects additional))
+(setq org-startup-folded "showeverything")
+(setq org-todo-keyword-faces
+      '(("NEW" . "white")
+        ("QUALIFIED" . "lightblue")
+        ("STARTED" . "orange" )
+        ("BLOCKED" . "red")
+        ("DONE" . "green")))
diff --git a/emacs/themes/jdkaplan-theme.el b/emacs/themes/jdkaplan-theme.el
index 961fb49..99c7ae6 100644
--- a/emacs/themes/jdkaplan-theme.el
+++ b/emacs/themes/jdkaplan-theme.el
@@ -25,6 +25,7 @@
       (paleblue "#66C4FF")
       (bluegray "#8bcef0")
       (purple "#b98fff")
+      (magenta "#ea69d7")
       (tan "#d49804")
       (brown "#a87f00")
       (neutralbrown "#c78f6b")
@@ -62,6 +63,15 @@
    `(web-mode-block-delimiter-face ((t (:foreground ,orange ))))
 
    `(show-paren-match-face ((t (:foreground ,teal :bold t ))))
+
+   `(outline-1 ((t (:foreground ,yellow ))))
+   `(outline-2 ((t (:foreground ,palegreen ))))
+   `(outline-3 ((t (:foreground ,lime ))))
+   `(outline-4 ((t (:foreground ,teal ))))
+   `(outline-5 ((t (:foreground ,paleblue ))))
+   `(outline-6 ((t (:foreground ,purple ))))
+   `(outline-7 ((t (:foreground ,magenta ))))
+   `(outline-8 ((t (:foreground ,orange ))))
    )
   )
 (provide-theme 'jdkaplan)