diff --git a/emacs/.spacemacs b/emacs/.spacemacs
index 1278638..c267d6b 100644
--- a/emacs/.spacemacs
+++ b/emacs/.spacemacs
@@ -564,6 +564,11 @@ before packages are loaded."
           '((:exports  . "both")
             (:preamble . "from __future__ import print_function")
             (:results  . "output")))
+    ; Add TODO states in org
+    (setq org-todo-keywords '((sequence "TODO" "NEXT" "INACTIVE" "|" "DONE")))
+    (setq org-todo-keyword-faces
+          '(("INACTIVE" . "violet")
+            ("NEXT" . "turquoise")))
     )
 
 ;; Do not write anything past this comment. This is where Emacs will
@@ -606,10 +611,12 @@ This function is called at the very end of Spacemacs initialization."
  '(jdee-db-requested-breakpoint-face-colors (cons "#f0f0f0" "#50a14f"))
  '(jdee-db-spec-breakpoint-face-colors (cons "#f0f0f0" "#9ca0a4"))
  '(objed-cursor-color "#e45649")
- '(org-agenda-files (quote ("~/Documents/Uni/DDSI/Code/P1/Design.org")))
+ '(org-agenda-files
+   (quote
+    ("~/Notes/Uni.org" "~/Documents/Uni/DDSI/Code/IGDB/Design.org" "~/Projects/Titank/Organization.org" "~/Notes/Projects.org" "~/Notes/Education.org")))
  '(package-selected-packages
    (quote
-    (ivy-bibtex helm-bibtex helm yapfify yaml-mode xterm-color which-key wgrep web-mode use-package tagedit smex smeargle smartparens slim-mode shell-pop scss-mode sass-mode pyvenv pytest pyenv-mode py-isort pug-mode pip-requirements persp-mode pcre2el pandoc-mode ox-pandoc ht orgit org-plus-contrib multi-term markdown-toc markdown-mode magit-gitflow magit-popup magit macrostep live-py-mode ivy-hydra insert-shebang hydra lv hy-mode dash-functional helm-make haml-mode gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md fuzzy flycheck-pos-tip pos-tip flycheck flx fish-mode eyebrowse exec-path-from-shell transient git-commit with-editor evil-escape goto-chg eshell-z eshell-prompt-extras esh-help emmet-mode elisp-slime-nav doom-modeline shrink-path disaster diminish diff-hl cython-mode counsel-projectile projectile pkg-info epl counsel swiper ivy company-web web-completion-data company-statistics company-shell company-emacs-eclim eclim company-c-headers company-auctex company-anaconda company cmake-mode clang-format bind-map bind-key auto-yasnippet yasnippet auto-compile packed async anaconda-mode pythonic f s all-the-icons memoize ace-window avy ac-ispell auto-complete popup doom-themes dash)))
+    (yapfify yaml-mode xterm-color which-key wgrep web-mode use-package tagedit smex smeargle smartparens slim-mode shell-pop scss-mode sass-mode pyvenv pytest pyenv-mode py-isort pug-mode pip-requirements persp-mode pcre2el pandoc-mode ox-pandoc ht orgit org-plus-contrib multi-term markdown-toc markdown-mode magit-gitflow magit-popup magit macrostep live-py-mode ivy-hydra insert-shebang hydra lv hy-mode dash-functional helm-make haml-mode gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md fuzzy flycheck-pos-tip pos-tip flycheck flx fish-mode eyebrowse exec-path-from-shell transient git-commit with-editor evil-escape goto-chg eshell-z eshell-prompt-extras esh-help emmet-mode elisp-slime-nav doom-modeline shrink-path disaster diminish diff-hl cython-mode counsel-projectile projectile pkg-info epl counsel swiper ivy company-web web-completion-data company-statistics company-shell company-emacs-eclim eclim company-c-headers company-auctex company-anaconda company cmake-mode clang-format bind-map bind-key auto-yasnippet yasnippet auto-compile packed async anaconda-mode pythonic f s all-the-icons memoize ace-window avy ac-ispell auto-complete popup doom-themes dash)))
  '(pdf-view-midnight-colors (quote ("#655370" . "#fbf8ef")))
  '(safe-local-variable-values
    (quote