diff --git a/config.org b/config.org
index 4cf772b..22480c5 100644
--- a/config.org
+++ b/config.org
@@ -2760,6 +2760,7 @@ Unfortunately, with that power comes a *lot* of configuration work up-front. It
         org-footnote-auto-label 'confirm   ; Allow editing of footnote names
 
         ;; Startup
+        org-startup-indented nil           ; Turn off indentation
         org-startup-with-inline-images t   ; Do more stuff on startup
         org-startup-with-latex-preview t
         +org-startup-with-animated-gifs t
@@ -2767,7 +2768,6 @@ Unfortunately, with that power comes a *lot* of configuration work up-front. It
         ;; Customize appearance
         org-indent-indentation-per-level 0 ; No heading indentation
         org-cycle-separator-lines 1        ; Keep 1-line padding between folded headings
-        org-hide-emphasis-markers t        ; Hide *emphasis*
         org-image-actual-width '(550)      ; Default images to 550px
         org-format-latex-options           ; Make latex preview smaller
         (plist-put org-format-latex-options :scale 0.55)
@@ -2894,8 +2894,7 @@ It's sometimes nice to be able to click a link in an Org file that takes me to o
 
 #+begin_src emacs-lisp
 (after! org
-  (setq org-pretty-entities t
-        org-entities-user
+  (setq org-entities-user
         '(("nbsp" "~" nil " " " " " " " ")
           ("top" "\\top" t "⊤" "" "22A4" "⊤")
           ("bot" "\\bot" t "⊥" "" "22A5" "⊥")
@@ -2909,16 +2908,8 @@ It's sometimes nice to be able to click a link in an Org file that takes me to o
 
 *** Modern
 
-Doom Emacs's =org +pretty= flag by default uses the package =org-superstar= to prettify Org files. This package is decently nice looking, but it has a much nicer and more comprehensive alternative in the form of =org-modern=.
-
-#+begin_src emacs-lisp :tangle packages.el
-(package! org-modern)
-#+end_src
-
 #+begin_src emacs-lisp
-(use-package! org-modern
-  :hook (org-mode . org-modern-mode)
-  :config
+(after! org-modern
   (setq org-modern-star 'replace
         org-modern-replace-stars '("◉" "○" "✸" "✿" "✤" "✜" "◆" "▶")
         org-modern-label-border -2
@@ -2928,13 +2919,6 @@ Doom Emacs's =org +pretty= flag by default uses the package =org-superstar= to p
                           (?+ . "•")
                           (?* . "•"))
         org-modern-todo nil
-        org-modern-todo-faces
-        '(("TODO" :inverse-video t :inherit org-todo)
-          ("PROJ" :inverse-video t :inherit +org-todo-project)
-          ("STRT" :inverse-video t :inherit +org-todo-active)
-          ("WAIT" :inverse-video t :inherit +org-todo-onhold)
-          ("HOLD" :inverse-video t :inherit +org-todo-onhold)
-          ("KILL" :inverse-video t :inherit +org-todo-cancel))
         org-modern-block-fringe nil
         org-modern-block-name
         '(("src" "»" "«")
@@ -2983,9 +2967,13 @@ Doom Emacs's =org +pretty= flag by default uses the package =org-superstar= to p
           ("results" . "› result")
           (t . "› "))
         org-modern-checkbox
-        '((88 . "")
-          (45 . #("" 0 2 (composition ((2)))))
-          (32 . ""))))
+        '((?X . "")
+          (?- . #("" 0 2 (composition ((2)))))
+          (?  . "")))
+  (remove-hook! 'org-modern-mode-hook
+    #'+org-modern-show-hidden-stars-in-indent-mode-h)
+  (remove-hook! 'org-agenda-finalize-hook
+    #'org-modern-agenda))
 #+end_src
 
 The default colors for various elements of =org-modern= don't match with our theme colors, so we need to modify them ourselves. We'll also modify a few aspects of label appearance here.
@@ -3030,24 +3018,13 @@ The default colors for various elements of =org-modern= don't match with our the
 
 *** Appear
 
-Since we've disabled =+pretty=, we need to add the packages we do want from it, namely =org-appear= to automatically prettify emphasis markers and other nice things like that.
-
-#+begin_src emacs-lisp :tangle packages.el
-(package! org-appear)
-#+end_src
-
 #+begin_src emacs-lisp
-(use-package! org-appear
-  :hook (org-mode . org-appear-mode)
-  :config
+(after! org-appear
   (setq org-appear-autoentities t
         org-appear-autokeywords t
         org-appear-autosubmarkers t
         org-appear-autolinks 'just-brackets
         org-appear-inside-latex t))
-
-(after! org
-  (setq org-highlight-latex-and-related '(native script entities)))
 #+end_src
 
 *** Emphasis