diff --git a/setup-emacs.org b/setup-emacs.org
index 9f21609..c7adfd6 100644
--- a/setup-emacs.org
+++ b/setup-emacs.org
@@ -371,21 +371,29 @@ All archives should be stored in a single  ~.archive~ file per directory.
 ** Beautify org-mode
 *** Icons for headline indentation
 #+BEGIN_SRC emacs-lisp
-     (use-package org-bullets
-       :init (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
+  (use-package org-bullets
+    :init (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
+
+  (setq org-bullets-bullet-list '("◉" "○" "◆" "✿" "✚" "▶"))
 #+END_SRC
 
 *** Replace checkmark with unicode icons
 #+BEGIN_SRC emacs-lisp
-      (use-package pretty-mode
-        :init (global-pretty-mode t))
+  (use-package pretty-mode
+    :init (global-pretty-mode t))
 
-      (add-hook 'org-mode-hook (lambda ()
-         "Beautify Org Checkbox Symbol"
-         (push '("[ ]" . "☐") prettify-symbols-alist)
-         (push '("[X]" . "☑" ) prettify-symbols-alist)
-         (push '("[-]" . "❍" ) prettify-symbols-alist)
-         (prettify-symbols-mode)))
+  (add-hook 'org-mode-hook
+            (lambda ()
+              "Beautify Org Checkbox Symbol"
+              (push '("[ ]" . "☐") prettify-symbols-alist)
+              (push '("[X]" . "☑" ) prettify-symbols-alist)
+              (push '("[-]" . "❍" ) prettify-symbols-alist)
+              (prettify-symbols-mode)))
+#+END_SRC
+
+We also want them in exported HTML files
+#+BEGIN_SRC emacs-lisp
+  (setq org-html-checkbox-type 'html)
 #+END_SRC
 
 *** Strike out done ckeckbox items
@@ -401,6 +409,13 @@ All archives should be stored in a single  ~.archive~ file per directory.
        'append)
 #+END_SRC
 
+*** Replace dash in bullet lists with unicode symbol
+#+BEGIN_SRC emacs-lisp
+  (font-lock-add-keywords 'org-mode
+                          '(("^ *\\([-]\\) "
+                             (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
+#+END_SRC
+
 ** CSS Themes for Exports
 When exporting from org-mode (usually to HTML) we want to specify additional styles.
 #+BEGIN_SRC emacs-lisp