diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 7ae0be3..e845a26 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -99,6 +99,7 @@
                           home-emacs-vterm-service-type
                           home-emacs-vterm-configuration
                           home-emacs-org-modern-service-type
+                          home-emacs-org-modern-configuration
                           home-wakatime-service-type
                           home-wakatime-configuration))
   #:use-module ((oni home services environment)
@@ -154,7 +155,8 @@
                 #:select (emacs-inkplate
                           emacs-outli
                           emacs-syncthing-status
-                          emacs-nginx-mode))
+                          emacs-nginx-mode
+                          emacs-next-org-modern))
   #:use-module ((oni packages emacs-config)
                 #:select (emacs-oni-org-roam
                           emacs-oni-elfeed
@@ -448,7 +450,9 @@
    (service home-emacs-vterm-service-type
             (home-emacs-vterm-configuration
              (buffer-name-string "*vterm* %s")))
-   (service home-emacs-org-modern-service-type)
+   (service home-emacs-org-modern-service-type
+            (home-emacs-org-modern-configuration
+             (package emacs-next-org-modern)))
    (service home-wakatime-service-type
             (home-wakatime-configuration
              (api-url "https://waka.ryuslash.org/api")
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index 2d8dd23..da36e2f 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -7,6 +7,8 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system emacs)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((gnu packages emacs)
+                #:select (emacs-next))
   #:use-module (gnu packages emacs-xyz)
   #:use-module ((gnu packages mail)
                 #:select (notmuch))
@@ -711,3 +713,27 @@ new-theme for a while. I couldn't think of a name so I named it after him.")
       (synopsis "A Tree-sitter based major mode for editing PHP codes")
       (description "A Tree-sitter based major mode for editing PHP codes.")
       (license license:gpl3))))
+
+(define-public emacs-next-org-modern
+  (package
+   (name "emacs-org-modern")
+   (version "1.6-1")
+   (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/minad/org-modern")
+             (commit version)))
+       (sha256
+        (base32 "0a7viid1lrn02w1n4yjivjyssbd1qq850giqwnp3mrjf9adwzh2a"))
+       (file-name (git-file-name name version))))
+   (build-system emacs-build-system)
+   (arguments (list #:emacs emacs-next))
+   (propagated-inputs (list emacs-compat))
+   (home-page "https://github.com/minad/org-modern")
+   (synopsis "Modern Org style")
+   (description
+"Org Modern implements a modern style for your Org buffers using font locking
+and text properties.  The package styles headlines, keywords, tables and
+source blocks.")
+   (license license:gpl3+)))