                                (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
     (org-bullets-mode 1)
 
-    ;; enable on the fly spell checking
-    (flyspell-mode 1)
-
-    
-
-    (defun gp-org-mode-hook ()
+    (defun gp/org-mode-hook ()
       ;;set variable pitch font for org, but keep fixed width for code etc.
       (variable-pitch-mode t)
       (setq line-spacing 3)

    (mapc 'require org-modules)
    ;; configuration
    (setq org-directory "~/Documents/Dropbox/org")
    
    ;; agenda
    (setq org-agenda-window-setup (quote current-window))
    (setq org-agenda-files (list (expand-file-name "todo.org" org-directory)
                                 (expand-file-name "projects/" org-directory)
                                 (expand-file-name "projects/work/" org-directory)
                                 (expand-file-name "projects/home/" org-directory)))
    
    (add-hook 'org-mode-hook 'turn-on-auto-fill)
    
    (setq org-todo-keyword-faces
          (quote
           (("DONE" . success)
            ("STARTED" . diary)
            ("WAITING" . warning)
            ("TODO" . error))))
    (setq org-todo-keywords '((sequence "TODO(t)" "PLAN(p)" "NEXT-ACTION(n)" "STARTED(s)" "WAITING(w@/!)" "DEFERRED(e)" "APPT" "|" "DONE(d!/!)" "CANCELLED(c@/!)")))

    (setq org-capture-templates
          '(("t" "Todo"
             entry (file+headline "todo.org" "Tasks")
             "* TODO [#B] %?")
            ("j" "Journal Entry"
             entry (file+datetree "journal.org")
             "* %?"
             :empty-lines 1)
            ))

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


      ;; disable linum
      (linum-mode -1)

      ;; enable on the fly spell checking
      (flyspell-mode 1)
      
      (defun gp/adjoin-to-list-or-symbol (element list-or-symbol)
        (let ((list (if (not (listp list-or-symbol))
                        (list list-or-symbol)
                      list-or-symbol)))
