                                               'default)
                                           :background nil t)))
 
+  (define-minor-mode +org-pretty-mode
+    "TODO"
+    :init-value nil
+    :lighter " *"
+    :group 'evil-org
+    (setq org-hide-emphasis-markers +org-pretty-mode)
+    (org-toggle-pretty-entities)
+    ;; In case the above un-align tables
+    (org-table-map-tables 'org-table-align t))
+
   ;; Use ivy/helm if either is available
   (when (or (featurep! :completion ivy)
             (featurep! :completion helm))
     (setq-default org-completion-use-ido nil
                   org-outline-path-complete-in-steps nil))
 
-  (let ((ext-regexp (regexp-opt '("GIF" "JPG" "JPEG" "SVG" "TIF" "TIFF" "BMP" "XPM"
-                                  "gif" "jpg" "jpeg" "svg" "tif" "tiff" "bmp" "xpm"))))
-    (setq iimage-mode-image-regex-alist
-          `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?\\([-+./_0-9a-zA-Z]+\\."
-                      ext-regexp "\\)\\(\\]\\]\\|>\\|'\\)?") . 2)
-            (,(concat "<\\(http://.+\\." ext-regexp "\\)>") . 1))))
-
-
-
-  ;;; Custom fontification
-  (defun +org--tag-face (n)
+  ;; Custom fontification
+  (defsubst +org--tag-face (n)
     (let ((kwd (match-string n)))
       (or (and (equal kwd "#") 'org-tag)
           (and (equal kwd "@") 'org-special-keyword))))


;; Ensure ELPA org is prioritized above built-in org.
(when-let (path (locate-library "org" nil doom--package-load-path))
  (push (file-name-directory path) load-path))

(load! +agenda)
(load! +attach)

          :v  "<"   (λ! (org-metaleft)  (evil-visual-restore))
          :v  ">"   (λ! (org-metaright) (evil-visual-restore))
          :n  "-"   #'org-cycle-list-bullet
          :m  "<tab>" #'org-cycle)))


(defun +org|hacks ()
  "Getting org to behave."
  ;; Don't open separate windows
  (cl-pushnew '(file . find-file) org-link-frame-setup)

  ;; Let OS decide what to do with files when opened
  (setq org-file-apps
