diff --git a/.spacemacs b/.spacemacs
index aeb25a121fe7ebf0bfa948268dfd3396daecee61..bc36ad75512970725216044f3ee9929807bb9bb6 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -540,7 +540,7 @@ before packages are loaded."
 
 ;; Setup TODO keywords and workflow
 (setq org-todo-keywords
-      '((sequence "TODO(t!)" "NEXT(n@)" "IDLE(i@/!)" "ACTIVE(a@/!)" "|" "DONE(d!)" "CANCELED(c@)")))
+      '((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")
 (setq hl-todo-keyword-faces
@@ -562,6 +562,11 @@ before packages are loaded."
     ("FIXME" . "#dc752f")
     ("XXX+" . "#dc752f")
     ("\\?\\?\\?+" . "#dc752f")))
+(setq org-agenda-prefix-format
+   '((agenda . " %i %-12:c%?-12t% s")
+     (todo . " %i %-12:c %b")
+     (tags . " %i %-12:c")
+     (search . " %i %-12:c")))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Do not write anything past this comment. This is where Emacs will
@@ -579,6 +584,26 @@ This function is called at the very end of Spacemacs initialization."
  '(ansi-color-names-vector
    ["#0a0814" "#f2241f" "#67b11d" "#b1951d" "#4f97d7" "#a31db1" "#28def0" "#b2b2b2"])
  '(evil-want-Y-yank-to-eol nil)
+ '(hl-todo-keyword-faces
+   '(("TODO" . "#dc752f")
+     ("NEXT" . "#dc752f")
+     ("IDLE" . "#d6d6ff")
+     ("ACTIVE" . "#0000ff")
+     ("CANCELED" . "#baa6a6")
+     ("THEM" . "#2d9574")
+     ("PROG" . "#4f97d7")
+     ("OKAY" . "#4f97d7")
+     ("DONT" . "#f2241f")
+     ("FAIL" . "#f2241f")
+     ("DONE" . "#86dc2f")
+     ("NOTE" . "#b1951d")
+     ("KLUDGE" . "#b1951d")
+     ("HACK" . "#b1951d")
+     ("TEMP" . "#b1951d")
+     ("FIXME" . "#dc752f")
+     ("XXX+" . "#dc752f")
+     ("\\?\\?\\?+" . "#dc752f")))
+ '(org-agenda-window-setup 'current-window)
  '(package-selected-packages
    '(tern toml-mode ron-mode racer flycheck-rust cargo rust-mode phpunit phpcbf php-extras php-auto-yasnippets helm-gtags ggtags geben drupal-mode posframe counsel-gtags company-phpactor phpactor composer php-runtime company-php ac-php-core xcscope php-mode nginx-mode tide typescript-mode import-js grizzl web-mode web-beautify tagedit slim-mode scss-mode sass-mode pug-mode prettier-js impatient-mode simple-httpd helm-css-scss haml-mode emmet-mode counsel-css company-web web-completion-data add-node-modules-path scala-mode sbt-mode noflet fixmee string-utils back-button button-lock ucs-utils smartrep nav-flash persistent-soft list-utils wgrep smex ivy-xref ivy-hydra flyspell-correct-ivy ivy-yasnippet ivy-purpose counsel-projectile counsel swiper ivy prettify-utils mvn meghanada maven-test-mode lsp-java groovy-mode groovy-imports pcache gradle-mode lsp-ui lsp-treemacs lsp-python-ms helm-lsp dap-mode bui tree-mode company-lsp lsp-mode yasnippet-snippets yapfify yaml-mode ws-butler writeroom-mode winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package unfill treemacs-projectile treemacs-magit treemacs-evil toc-org symon symbol-overlay string-inflection spaceline-all-the-icons smeargle restclient-helm restart-emacs rainbow-delimiters pytest pyenv-mode py-isort popwin pippel pipenv pip-requirements persp-mode pcre2el password-generator paradox overseer orgit org-projectile org-present org-pomodoro org-mime org-journal org-download org-cliplink org-bullets org-brain open-junk-file ob-restclient ob-http nameless mwim move-text mmm-mode markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum live-py-mode link-hint indent-guide importmagic hybrid-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-org helm-mode-manager helm-make helm-ls-git helm-gitignore helm-git-grep helm-flx helm-descbinds helm-company helm-c-yasnippet helm-ag google-translate golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ gh-md fuzzy font-lock+ flyspell-correct-helm flycheck-pos-tip flycheck-package flycheck-elsa flx-ido fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eval-sexp-fu elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker diminish devdocs define-word cython-mode company-statistics company-restclient company-anaconda column-enforce-mode clean-aindent-mode centered-cursor-mode browse-at-remote blacken auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile aggressive-indent ace-link ace-jump-helm-line ac-ispell))
  '(paradox-github-token t)