diff --git a/oni-clojure.el b/oni-clojure.el
index 3d9e4dd..bda7498 100644
--- a/oni-clojure.el
+++ b/oni-clojure.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0128.190042
+;; Version: 2021.0727.210613
 ;; Package-Requires: (clojure-mode oni-company cider clojure-mode-extra-font-locking oni-paredit rainbow-delimiters oni-data-dir)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -74,8 +74,5 @@
 
 (add-hook 'cider-repl-mode-hook 'paredit-mode)
 
-;;;###autoload(with-eval-after-load 'clojure-mode (require 'oni-clojure))
-;;;###autoload(with-eval-after-load 'cider (require 'oni-clojure))
-
 (provide 'oni-clojure)
 ;;; oni-clojure.el ends here
diff --git a/oni-company.el b/oni-company.el
index cfa8cf0..d6105da 100644
--- a/oni-company.el
+++ b/oni-company.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0214.181156
+;; Version: 2021.0727.205633
 ;; Package-Requires: (company oni-prescient company-posframe diminish company-prescient)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -62,7 +62,5 @@
 (with-eval-after-load 'company (diminish 'company-mode))
 (with-eval-after-load 'company-posframe (diminish 'company-posframe-mode))
 
-;;;###autoload(with-eval-after-load 'company (require 'oni-company))
-
 (provide 'oni-company)
 ;;; oni-company.el ends here
diff --git a/oni-core.el b/oni-core.el
index 9159822..7812706 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0727.203934
+;; Version: 2021.0727.210605
 ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview dashboard)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -249,8 +249,12 @@ _s_: String list"
 (with-eval-after-load 'alert (require 'oni-alert))
 (with-eval-after-load 'bats (require 'oni-bats))
 (with-eval-after-load 'bookmark (require 'oni-bookmark))
+(with-eval-after-load 'browse-url (require 'oni-browse-url))
 (with-eval-after-load 'cc-mode (require 'oni-c))
+(with-eval-after-load 'cider (require 'oni-clojure))
 (with-eval-after-load 'circe (require 'oni-circe))
+(with-eval-after-load 'clojure-mode (require 'oni-clojure))
+(with-eval-after-load 'company (require 'oni-company))
 (with-eval-after-load 'elfeed (require 'oni-elfeed))
 (with-eval-after-load 'embrace (require 'oni-embrace))
 (with-eval-after-load 'flycheck (require 'oni-flycheck))
@@ -259,11 +263,12 @@ _s_: String list"
 (with-eval-after-load 'lui (require 'oni-lui))
 (with-eval-after-load 'org (require 'oni-org))
 (with-eval-after-load 'org-roam (require 'oni-org-roam))
+(with-eval-after-load 'paredit (require 'oni-paredit))
+(with-eval-after-load 'prescient (require 'oni-prescient))
 (with-eval-after-load 'sh (require 'oni-sh))
 (with-eval-after-load 'smartparens (require 'oni-smartparens))
 (with-eval-after-load 'vterm (require 'oni-vterm))
 (with-eval-after-load 'yasnippet (require 'oni-yasnippet))
-(with-eval-after-load 'browse-url (require 'oni-browse-url))
 
 ;; Enable any modes that I want to have turned on right away.
 
diff --git a/oni-paredit.el b/oni-paredit.el
index f25bc3c..3e381b1 100644
--- a/oni-paredit.el
+++ b/oni-paredit.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0408.111251
+;; Version: 2021.0727.210320
 ;; Package-Requires: (paredit diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,5 @@
 
 (with-eval-after-load 'paredit (diminish 'paredit-mode))
 
-;;;###autoload(with-eval-after-load 'paredit (require 'oni-paredit))
-
 (provide 'oni-paredit)
 ;;; oni-paredit.el ends here
diff --git a/oni-prescient.el b/oni-prescient.el
index bf9aea6..16b5832 100644
--- a/oni-prescient.el
+++ b/oni-prescient.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0224.224020
+;; Version: 2021.0727.205126
 ;; Package-Requires: (prescient oni-data-dir)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,5 @@
 
 (prescient-persist-mode)
 
-;;;###autoload(with-eval-after-load 'prescient (require 'oni-prescient))
-
 (provide 'oni-prescient)
 ;;; oni-prescient.el ends here