diff --git a/init.el b/init.el
index 5df85ba..cc22f70 100644
--- a/init.el
+++ b/init.el
@@ -446,9 +446,11 @@
 
 (use-package org
   :hook
-  (org-mode . org-indent-mode)
   (org-mode . auto-fill-mode)
   :custom
+  (org-startup-indented t)
+  (org-special-ctrl-a/e t)
+  (org-insert-heading-respect-content t)
   (org-list-allow-alphabetical t)
   (org-hide-emphasis-markers t)
   (org-pretty-entities t)
@@ -464,10 +466,14 @@
   (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.1))
   (add-to-list 'org-modules 'org-tempo))
 
-(use-package org-superstar
-  :custom
-  (org-superstar-leading-bullet ?\s)
-  :hook org-mode)
+(use-package org-modern
+  :hook
+  org-mode
+  (org-agenda-finalize . org-modern-agenda))
+
+(use-package org-modern-indent
+  :ensure nil
+  :hook org-modern-mode)
 
 (use-package org-pdftools
   :hook (org-mode . org-pdftools-setup-link))