diff --git a/emacs/.emacs b/emacs/.emacs
index d275f2d..08c71cb 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -69,14 +69,14 @@
  '(shell-pop-window-position "top")
  '(shell-pop-window-size 20)
  '(show-trailing-whitespace t)
- '(tool-bar-mode nil)
- '(org-directory "~/org")
- '(org-agenda-files "~/org/agenda"))
+ '(tool-bar-mode nil))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(ivy-current-match ((t (:foreground "gold"))))
+ '(minibuffer-prompt ((t (:foreground "dark orange" :weight bold))))
  '(neo-dir-link-face ((t (:foreground "#fce94f"))))
  '(neo-expand-btn-face ((t (:foreground "#ffe070"))))
  '(neo-root-dir-face ((t (:foreground "#fff3c6" :weight bold))))
@@ -145,8 +145,18 @@
 ;; Org-mode
 (use-package org
   :ensure t
-  :config (progn
-            (global-set-key (kbd "<f12>") 'org-agenda)))
+  :config
+  (setq org-directory "~/org")
+  (setq org-agenda-files "~/org/agenda")
+  (global-set-key (kbd "<f12>") 'org-agenda)
+  (setq org-todo-keywords '((sequence "TODO" "DOING" "BLOCKED" "REVIEW" "|" "ABANDONED" "DONE")))
+  (setq org-todo-keyword-faces
+        '(("TODO" . "firebrick2")
+          ("DOING" . "turquoise1")
+          ("BLOCKED" . "orange red")
+          ("REVIEW" . "dodger blue")
+          ("ABANDONED" . "slate blue")
+          ("DONE" . "green3"))))
 
 ;; Evil-mode
 (defun my/evil-go-back ()
@@ -175,14 +185,14 @@
   (define-key evil-motion-state-map [mouse-1] 'silence)
   (setq-default evil-cross-lines t))
 
-;; (use-package evil-org
-;;   :ensure t
-;;   :after org
-;;   :config
-;;   (add-hook 'org-mode-hook 'evil-org-mode)
-;;   (add-hook 'evil-org-mode-hook
-;;             (lambda ()
-;;               (evil-org-set-key-theme))))
+(use-package evil-org
+  :ensure t
+  :demand t
+  :config
+  (add-hook 'org-mode-hook 'evil-org-mode)
+  (add-hook 'evil-org-mode-hook
+            (lambda ()
+              (evil-org-set-key-theme '(navigation insert shift todo heading)))))
 
 (use-package projectile
   :ensure t