diff --git a/emacs.org b/emacs.org
index 2cdc426..ed4773b 100644
--- a/emacs.org
+++ b/emacs.org
@@ -612,54 +612,70 @@ Highlight matching ()'s []'s etc...
 
 *** org-mode
 
-- foo
-- bar
-
 Org-mode keybindings and settings, pretty sparse really.
 
 #+BEGIN_SRC emacs-lisp
   (use-package org
-               :ensure org-plus-contrib
-               :bind (("C-c a" . org-agenda)
-                      ("C-c b" . org-iswitchb)
-                      ("C-c c" . org-capture)
-                      ("C-c l" . org-store-link)
-                      ("C-c p" . org-latex-export-to-pdf))
-               :init (use-package org-bullets
-                       :config
-                       (progn
-                         (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))))
-               :config
-               (progn
-                 (custom-set-variables
-                  '(org-log-done t)
-                  '(org-hide-leading-stars t)
-                  '(org-hide-emphasis-markers t)
-                  )
-                  (font-lock-add-keywords 'org-mode
-                    '(("^ +\\([-*]\\) "
-                    (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
-                  (let* ((variable-tuple (cond ((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro"))
-                    ((x-list-fonts "Lucida Grande")   '(:font "Lucida Grande"))
-                    ((x-list-fonts "Verdana")         '(:font "Verdana"))
-                    ((x-family-fonts "Sans Serif")    '(:family "Sans Serif"))
-                    (nil (warn "Cannot find a Sans Serif Font.  Install Source Sans Pro."))))
-                    (base-font-color     (face-foreground 'default nil 'default))
-                    (headline           `(:inherit default :weight bold :foreground ,base-font-color)))
-
-                  (custom-theme-set-faces 'user
-                    `(org-level-8 ((t (,@headline ,@variable-tuple))))
-                    `(org-level-7 ((t (,@headline ,@variable-tuple))))
-                    `(org-level-6 ((t (,@headline ,@variable-tuple))))
-                    `(org-level-5 ((t (,@headline ,@variable-tuple))))
-                    `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
-                    `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
-                    `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5))))
-                    `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75))))
-                    `(org-document-title ((t (,@headline ,@variable-tuple :height 1.5 :underline nil))))))
-                 (org-reload)
-                 )
-               )
+    :ensure org-plus-contrib
+    :bind (("C-c a" . org-agenda)
+           ("C-c b" . org-iswitchb)
+           ("C-c c" . org-capture)
+           ("C-c l" . org-store-link)
+           ("C-c p" . org-latex-export-to-pdf))
+   :config
+   (progn
+     (custom-set-variables
+      '(org-log-done t)
+      '(org-hide-leading-stars t)
+      '(org-hide-emphasis-markers t)
+      '(org-confirm-babel-evaluate nil)
+      )
+     (org-babel-do-load-languages
+      'org-babel-load-languages
+      '(
+        (emacs-lisp . t)
+        (sh . t)
+        (haskell . t)
+        (ditaa . t)
+        (perl . t)
+        (python . t)
+        (C . t)
+        )
+      )
+     (add-hook 'after-init-hook (lambda () (org-reload)))
+     )
+   )
+  (use-package org-bullets
+    :ensure t
+    :init
+    (custom-set-variables '(org-bullets-bullet-list '("・" "◦" "•" "◉")))
+    :config
+    (progn
+      (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+      (let* ((variable-tuple (cond ((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro"))
+                                   ((x-list-fonts "Lucida Grande")   '(:font "Lucida Grande"))
+                                   ((x-list-fonts "Verdana")         '(:font "Verdana"))
+                                   ((x-family-fonts "Sans Serif")    '(:family "Sans Serif"))
+                                   (nil (warn "Cannot find a Sans Serif Font."))))
+             (base-font-color     (face-foreground 'default nil 'default))
+             (headline           `(:inherit default :weight bold :foreground ,base-font-color)))
+        (custom-theme-set-faces 'user
+                                `(org-level-8 ((t (,@headline ,@variable-tuple))))
+                                `(org-level-7 ((t (,@headline ,@variable-tuple))))
+                                `(org-level-6 ((t (,@headline ,@variable-tuple))))
+                                `(org-level-5 ((t (,@headline ,@variable-tuple))))
+                                `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
+                                `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
+                                `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5))))
+                                `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75))))
+                                `(org-document-title ((t (,@headline ,@variable-tuple :height 1.5 :underline nil))))))
+      (font-lock-add-keywords 'org-mode
+                              '(("^ +\\([-*]\\) "
+                                 (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
+      )
+    )
+
+
 #+END_SRC
 
 *** flycheck