diff --git a/emacs/.emacs b/emacs/.emacs
index 0141e6f..6162bfc 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -160,10 +160,10 @@
   (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-keywords '((sequence "TODO" "WORKING" "BLOCKED" "REVIEW" "|" "ABANDONED" "DONE")))
   (setq org-todo-keyword-faces
         '(("TODO" . "firebrick2")
-          ("DOING" . "turquoise1")
+          ("WORKING" . "yellow")
           ("BLOCKED" . "orange red")
           ("REVIEW" . "dodger blue")
           ("ABANDONED" . "slate blue")
@@ -175,10 +175,13 @@
                   org-level-4
                   org-level-5))
     (set-face-attribute face nil :weight 'semi-bold :height 1.0))
-  ;; (dolist (kv
-  ;;          '(("t" . "TODO")
-  ;;            ("r" . "REVIEW")))
-  ;;   (define-key org-mode-map (kbd (concat "C-c t " (car kv))) (lambda () `(org-todo ,(cdr kv)))))
+  (dolist (kv '(("t" . "TODO")
+                ("w" . "WORKING")
+                ("b" . "BLOCKED")
+                ("r" . "REVIEW")
+                ("a" . "ABANDONED")
+                ("d" . "DONE")))
+    (define-key org-mode-map (kbd (concat "C-c t " (car kv))) `(lambda () (interactive) (org-todo ,(cdr kv)))))
   (add-hook 'org-mode-hook
             (lambda ()
               (linum-mode 0)