diff --git a/.emacs.d/include/orgconfig.el b/.emacs.d/include/orgconfig.el
index 76394e2..316cd8f 100644
--- a/.emacs.d/include/orgconfig.el
+++ b/.emacs.d/include/orgconfig.el
@@ -12,6 +12,7 @@
 (setq org-adapt-indentation nil)
 (setq org-confirm-babel-evaluate nil)
 (setq org-export-use-babel nil)
+(setq org-agenda-include-diary t)
 
 ;; Enable Racket in Org-mode Babel
 (org-babel-do-load-languages
@@ -56,6 +57,9 @@
             (add-hook 'auto-save-hook 'org-save-all-org-buffers nil t)
             (add-hook 'org-mode-hook 'auto-fill-mode)
             (auto-save-mode)))
+(add-hook 'org-mode-hook #'org-modern-mode)
+(add-hook 'org-mode-hook #'org-modern-indent-mode 90)
+(add-hook 'org-agenda-finalize-hook #'org-modern-agenda)
 
 (provide 'orgconfig)
 ;;; orgconfig.el ends here
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 2abe224..ea05e60 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -43,8 +43,15 @@
 
 ;; Org
 (straight-use-package 'org)
-(straight-use-package '(ob-racket :type git :host github
-				  :repo "DEADB17/ob-racket"))
+(straight-use-package 'org-modern)
+(straight-use-package '(org-modern-indent
+                        :type git
+                        :host github
+                        :repo "jdtsmith/org-modern-indent"))
+(straight-use-package '(ob-racket
+                        :type git
+                        :host github
+                        :repo "DEADB17/ob-racket"))
 
 ;; Productivity
 (straight-use-package 'elfeed)