diff --git a/.spacemacs b/.spacemacs
index 5ccca2c956fee52fb3aff755a835e8f2d9a86ca6..98d537d067d927298c4b8fb33ad5033758598f4c 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -537,6 +537,12 @@ before packages are loaded."
 ;(setq org-agenda-files (append (directory-files-recursively "~/org" "^[^.#].*\\.org")))
 ;(setq org-agenda-files (append (directory-files-recursively "~/org/journal" "^[^.#][0-9]*-[0-9]*-[0-9]*$")))
 
+;; Setup TODO keywords and workflow
+(setq org-todo-keywords
+      '((sequence "TODO(t!)" "NEXT(n@)" "IDLE(i@/!)" "ACTIVE(a@/!)" "|" "DONE(d!)" "CANCELED(c@)")))
+(setq org-log-into-drawer "LOGBOOK")
+(setq org-journal-carryover-items "+carry")
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Do not write anything past this comment. This is where Emacs will
@@ -557,6 +563,9 @@ This function is called at the very end of Spacemacs initialization."
  '(hl-todo-keyword-faces
    '(("TODO" . "#dc752f")
      ("NEXT" . "#dc752f")
+     ("IDLE" . "#d6d6ff")
+     ("ACTIVE" . "#0000ff")
+     ("CANCELED" . "#baa6a6")
      ("THEM" . "#2d9574")
      ("PROG" . "#4f97d7")
      ("OKAY" . "#4f97d7")