diff --git a/lisp/init-org.el b/lisp/init-org.el
index 7ffca67..d1e56a6 100644
--- a/lisp/init-org.el
+++ b/lisp/init-org.el
@@ -112,20 +112,18 @@
 
 ;; org-download
 (use-package org-download
+  :after org
+  :demand t
+  :hook
+  (org-mode . org-display-inline-images)
   :config
-  (when *is-mac*
-    (setq org-download-image-dir "./images")
-    (unless (file-exists-p "./images")
-      (make-directory "./images" t))
-    (setq org-download-link-format "[[file:%s]]\n")
-    (setq org-download-timestamp "%Y%m%d_%H%M%S_")
-    (setq org-download-dragndrop t)
-    (setq org-image-actual-width nil)
-    (setq org-download-image-html-width 600)
-    (add-hook 'org-mode-hook 'org-display-inline-images))
-  (with-eval-after-load 'org
-    (require 'org-download)
-    (setq org-return-follows-link t)))
+  (setq-default org-download-image-dir "./images/"
+		org-download-heading-lvl nil)
+  (setq org-download-dragndrop t
+	org-download-method 'directory
+	org-image-actual-width nil
+	org-download-image-html-width 600
+	org-return-follows-link t))
 
 ;; org-ql
 (use-package org-ql)