diff --git a/.emacs.d/include/orgconfig.el b/.emacs.d/include/orgconfig.el
index 9c66450..c784db0 100644
--- a/.emacs.d/include/orgconfig.el
+++ b/.emacs.d/include/orgconfig.el
@@ -7,7 +7,6 @@
 (require 'org-roam)
 (require 'org-capture)
 (require 'org-id)
-(require 'org-modern)
 ;; Templates for org-mode
 (require 'org-tempo)
 (require 's)
@@ -41,7 +40,6 @@
 (setq org-export-use-babel nil)
 (setq org-agenda-include-diary t)
 (setq org-src-preserve-indentation t)
-(setq org-modern-star '("#" "##" "###" "####" "#####" "######"))
 (setq org-roam-directory "~/org/docs/")
 (setq org-roam-extract-new-file-path "${slug}.org")
 (setq org-roam-node-display-template
@@ -132,7 +130,6 @@
             (auto-save-mode)))
 (add-hook 'org-mode-hook #'variable-pitch-mode)
 (add-hook 'org-agenda-mode-hook #'org-recur-mode)
-(add-hook 'org-mode-hook #'org-modern-indent-mode 90)
 (add-hook 'org-agenda-finalize-hook #'org-modern-agenda)
 (add-hook 'org-mode-hook #'(lambda () (setq line-spacing 0.1)))
 
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 1ab35c8..4238653 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -101,13 +101,17 @@
   :after (org))
 (use-package org-modern :straight t
   :after (org)
-  :hook (org-mode org-modern-mode))
+  :hook (org-mode . org-modern-mode)
+  :custom
+  (org-modern-star '("#" "##" "###" "####" "#####" "######")))
 (use-package org-modern-indent
   :straight
   '(org-modern-indent
     :type git
     :host github
-    :repo "jdtsmith/org-modern-indent"))
+    :repo "jdtsmith/org-modern-indent")
+  :after (org-modern)
+  :hook (org-mode . org-modern-indent-mode))
 (use-package ob-racket
   :straight
   '(ob-racket