   :bind (("C-c C-g g" . writegood-grade-level)
          ("C-c C-g e" . writegood-reading-ease)))
 
-(use-package org-bullets
- :config
- (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
+(setq package-check-signature nil)
 
-(setq package-check-signature nil)
+(use-package olivetti)
 
 ;; :ensure org-plus-contrib
 (use-package org
-  :mode (("\\.\\(org\\|org_archive\\|txt\\)$" . org-mode))
+  :mode ("\\.org\\'" . org-mode)
   :bind (("C-c l" . org-store-link)
          ("C-c a" . org-agenda)
          ("C-c c" . org-capture))

    ;; All the agenda/capture/refile stuff is heavily influenced by http://doc.norang.ca/org-mode.html
    (setq org-agenda-window-setup (quote current-window))
    (setq org-agenda-files (list (expand-file-name "todo.org" org-directory)
                                 (expand-file-name "refile.org" org-directory)
                                 (expand-file-name "projects/" org-directory)
                                 (expand-file-name "projects/work/" org-directory)
                                 (expand-file-name "projects/personal/" org-directory)
                                 (expand-file-name "personal_schedule.org" org-directory)
                                 (expand-file-name "calendars/" org-directory)))

    ;; org-gcal config
    (setq
     org-gcal-client-id "603475159806-f87h1knp429dkbqei98f8csk68fo2f7n.apps.googleusercontent.com"
     org-gcal-client-secret "AnnpgXKHwUIMyyqrNSsW2liG"
     org-gcal-file-alist '(("giles@vurt.co.uk" .
                            "~/Documents/Dropbox/org/calendars/personal.org")
                           ("jj55h065t2qkbiu351jirv09kk@group.calendar.google.com" .
                            "~/Documents/Dropbox/org/calendars/oliver.org")
                           ("7ahnde9usu8cj8ni2c7idtrq48@group.calendar.google.com" .
                            "~/Documents/Dropbox/org/calendars/house.org")))

    (add-hook 'org-agenda-mode-hook (lambda () (org-gcal-sync) ))
    (add-hook 'org-capture-after-finalize-hook (lambda () (org-gcal-sync) ))
    
    (add-hook 'org-mode-hook 'turn-on-auto-fill)
    
    (setq org-todo-keywords '((sequence "TODO(t)" "NEXT(n)" "STARTED(s)" "|" "DONE(d)")
                              (sequence "WAITING(w@/!)" "DEFERRED(e)" "|" "CANCELLED(c@/!)" "MEETING")))
    (setq org-todo-keyword-faces
          (quote
           (("DONE" . success)
            ("STARTED" . underline)
            ("WAITING" . warning)
            ("TODO" . error)
            ("NEXT" . highlight)
            ("DEFERRED" . default)
            ("CANCELLED" . default)
            ("MEETING" . diary))))

    ;; allow changing from any task todo state to another by selecting appropriate key from the menu
    ;; C-c C-t KEY

  :preface
  ;; hook to run when org-mode is started, to turn on certain modes etc.
  (defun gp/org-mode-hook ()
    ;; disable linum
    (linum-mode -1)

    ;; enable on the fly spell checking
    (flyspell-mode 1)

    ;; center the text area and set a minimal fringe
    (olivetti-mode)
    (olivetti-set-width 120)
    (fringe-mode 2))
  :hook (org-mode . gp/org-mode-hook)
  :init
  (setq org-directory "~/Documents/Dropbox/org")
  (setq org-default-notes-file (expand-file-name "dump.org" org-directory))
  (setq org-startup-with-inline-images t)
  :config
  (progn
    ;; This functionality isn't in a package yet.
    ;; I installed it into ~/.emacs.d/site-lisp with wget https://raw.githubusercontent.com/alphapapa/org-protocol-capture-html/master/org-protocol-capture-html.el
    ;; (require 'org-protocol-capture-html)
    
    ;; configuration

    ;;
    ;; General Config
    ;;
    ;; actually emphasise text (e.g. show as italic instead of /italic/)
    (setq org-hide-emphasis-markers t)

    ;; syntax highlight code blocks
    (setq org-src-fontify-natively t)

    ;; replace list indicators with bullet points
    (font-lock-add-keywords 'org-mode
                            '(("^ +\\([-*]\\) "
                               (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
    
    ;;
    ;; Agenda config
