diff --git a/init.el b/init.el
index f0dc36a..d1e663a 100644
--- a/init.el
+++ b/init.el
@@ -573,8 +573,7 @@
            org-indent-indentation-per-level 0
            org-indent-mode-turns-on-hiding-stars nil
            org-list-demote-modify-bullet '(("-" . "+")
-                                           ("+" . "*")
-                                           ("*" . "-"))
+                                           ("+" . "-"))
            org-log-done 'time
            org-log-into-drawer t
            org-num-skip-commented t
@@ -641,11 +640,14 @@
      ;; complains about "Invalid face reference: t" in org-mode buffers, because
      ;; `compose-region' returns t.
      ("^[ \t]*\\([-]\\) "
-      (0 (progn (compose-region (match-beginning 1) (match-end 1) "–") 'fixed-pitch)))
+      (0 ;; (progn (compose-region (match-beginning 1) (match-end 1) "–") 'fixed-pitch)
+         'fixed-pitch t))
      ("^[ \t]*\\([+]\\) "
-      (0 (progn (compose-region (match-beginning 1) (match-end 1) "¬") 'fixed-pitch)))
+      (0 ;; (progn (compose-region (match-beginning 1) (match-end 1) "¬") 'fixed-pitch)
+         'fixed-pitch t))
      ("^[ \t]+\\([*]\\) "
-      (0 (progn (compose-region (match-beginning 1) (match-end 1) "→") 'fixed-pitch)))
+      (0 ;; (progn (compose-region (match-beginning 1) (match-end 1) "→") 'fixed-pitch)
+         'fixed-pitch t))
      ;; Fancy numbered lists (well, monospaced)
      ("^[ \t]*\\(\\(?:[0-9]+\\|[A-Za-z]\\)[.)]\\) " 0 'fixed-pitch t)))
   ;; Make nobreak-space fixed-pitch as well, for better alignment (is this the
@@ -745,6 +747,7 @@
   (:also-load ox-md)
   (:option org-export-coding-system 'utf-8-unix
            org-export-headline-levels 8
+           org-export-with-drawers nil
            org-export-with-section-numbers nil
            org-export-with-smart-quotes t
            org-export-with-sub-superscripts t