diff --git a/emacs/.spacemacs b/emacs/.spacemacs
index 232fafa..63b14ed 100644
--- a/emacs/.spacemacs
+++ b/emacs/.spacemacs
@@ -39,18 +39,20 @@ This function should only modify configuration layer settings."
      ;; Uncomment some layer names and press `SPC f e R' (Vim style) or
      ;; `M-m f e R' (Emacs style) to install them.
      ;; ----------------------------------------------------------------
-     ivy
+     (ivy :variables ivy-enable-advanced-buffer-information t)
      (auto-completion :variables
                    auto-completion-return-key-behavior 'complete
                    auto-completion-tab-key-behavior 'cycle)
      emacs-lisp
      git
      markdown
-     (org :variables org-projectile-file "TODOs.org")
+     (org :variables org-projectile-file "TODOs.org"
+          org-want-todo-bindings t)
      (shell :variables
              shell-default-height 30
              shell-default-position 'bottom
-             shell-default-shell 'eshell)
+             shell-default-shell 'eshell
+             shell-enable-smart-eshell t)
      syntax-checking
      (version-control :variables
                        version-control-diff-tool 'diff-hl
@@ -590,9 +592,10 @@ 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")))
  '(package-selected-packages
    (quote
-    (toc-org org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download org-cliplink org-bullets org-brain gnuplot evil-org 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)))
+    (ivy-bibtex 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