diff --git a/oni-autohotkey.el b/oni-autohotkey.el
index 37f80bb..ec3027e 100644
--- a/oni-autohotkey.el
+++ b/oni-autohotkey.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.1210.225944
+;; Version: 2021.1123.002846
 ;; Package-Requires: (ahk-mode)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -39,7 +39,5 @@
 (add-hook 'ahk-mode-hook 'electric-indent-local-mode)
 (add-hook 'ahk-mode-hook 'oni-autohotkey--auto-fill-mode)
 
-;;;###autoload(with-eval-after-load 'ahk-mode (require 'oni-autohotkey))
-
 (provide 'oni-autohotkey)
 ;;; oni-autohotkey.el ends here
diff --git a/oni-bat.el b/oni-bat.el
index 1a40a0d..5bf55ec 100644
--- a/oni-bat.el
+++ b/oni-bat.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0502.182847
+;; Version: 2021.1123.002759
 ;; Package-Requires: (bmx-mode)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,5 @@
 
 (bmx-mode-setup-defaults)
 
-;;;###autoload(with-eval-after-load 'bat-mode (require 'oni-bat))
-
 (provide 'oni-bat)
 ;;; oni-bat.el ends here
diff --git a/oni-common-lisp.el b/oni-common-lisp.el
index 014108c..7652920 100644
--- a/oni-common-lisp.el
+++ b/oni-common-lisp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0413.020909
+;; Version: 2021.1123.002421
 ;; Package-Requires: (oni-company oni-flycheck oni-paredit rainbow-delimiters slime slime-company)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -52,7 +52,5 @@
 (add-hook 'lisp-mode-hook 'company-mode)
 (add-hook 'lisp-mode-hook 'oni-common-lisp--auto-fill-mode)
 
-;;;###autoload (with-eval-after-load 'lisp-mode (require 'oni-common-lisp))
-
 (provide 'oni-common-lisp)
 ;;; oni-common-lisp.el ends here
diff --git a/oni-core.el b/oni-core.el
index f69b73b..4f67256 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1116.202845
+;; Version: 2021.1123.003634
 ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview dashboard mixed-pitch)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -249,12 +249,15 @@ _s_: String list"
 ;; installed they get loaded automatically, but don’t require them to be
 ;; installed.
 
+(with-eval-after-load 'ahk-mode (require 'oni-autohotkey))
 (with-eval-after-load 'alert (require 'oni-alert))
+(with-eval-after-load 'bat-mode (require 'oni-bat))
 (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 nil t))
 (with-eval-after-load 'cc-mode (require 'oni-cpp nil t))
+(with-eval-after-load 'cc-mode (require 'oni-java nil t))
 (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))
@@ -266,19 +269,57 @@ _s_: String list"
 (with-eval-after-load 'csharp-mode (require 'oni-csharp))
 (with-eval-after-load 'css-mode (require 'oni-css))
 (with-eval-after-load 'diff-hl (require 'oni-diff-hl))
+(with-eval-after-load 'dired (require 'oni-dired))
+(with-eval-after-load 'ediff (require 'oni-ediff))
 (with-eval-after-load 'elfeed (require 'oni-elfeed))
+(with-eval-after-load 'elisp-mode (require 'oni-elisp))
+(with-eval-after-load 'elm-mode (require 'oni-elm))
 (with-eval-after-load 'embrace (require 'oni-embrace))
+(with-eval-after-load 'eshell (require 'oni-eshell))
+(with-eval-after-load 'fish-mode (require 'oni-fish))
 (with-eval-after-load 'flycheck (require 'oni-flycheck))
+(with-eval-after-load 'git-commit (require 'oni-git-commit))
+(with-eval-after-load 'gnus (require 'oni-gnus))
+(with-eval-after-load 'grep (require 'oni-grep))
+(with-eval-after-load 'groovy-mode (require 'oni-groovy))
+(with-eval-after-load 'haskell-mode (require 'oni-haskell))
+(with-eval-after-load 'highlight-indent-guides (require 'oni-highlight-indent-guides))
 (with-eval-after-load 'hydra (require 'oni-hydra))
+(with-eval-after-load 'ielm (require 'oni-elisp))
+(with-eval-after-load 'ivy (require 'oni-ivy))
+(with-eval-after-load 'jabber (require 'oni-jabber))
+(with-eval-after-load 'js2-mode (require 'oni-js))
+(with-eval-after-load 'json-mode (require 'oni-json))
+(with-eval-after-load 'lisp-mode (require 'oni-common-lisp))
+(with-eval-after-load 'log-edit (require 'oni-log-edit))
 (with-eval-after-load 'lsp (require 'oni-lsp))
+(with-eval-after-load 'lua-mode (require 'oni-lua))
 (with-eval-after-load 'lui (require 'oni-lui))
+(with-eval-after-load 'magit (require 'oni-magit))
+(with-eval-after-load 'make-mode (require 'oni-makefile))
+(with-eval-after-load 'nov (require 'oni-epub))
 (with-eval-after-load 'org (require 'oni-org))
 (with-eval-after-load 'org-roam (require 'oni-org-roam))
+(with-eval-after-load 'package (require 'oni-package))
+(with-eval-after-load 'package-x (require 'oni-package))
 (with-eval-after-load 'paredit (require 'oni-paredit))
+(with-eval-after-load 'php-mode (require 'oni-php))
 (with-eval-after-load 'prescient (require 'oni-prescient))
+(with-eval-after-load 'projectile (require 'oni-projectile))
+(with-eval-after-load 'python (require 'oni-python))
+(with-eval-after-load 'ruby-mode (require 'oni-ruby))
+(with-eval-after-load 'rust-mode (require 'oni-rust))
+(with-eval-after-load 'scheme (require 'oni-scheme))
+(with-eval-after-load 'sgml-mode (require 'oni-html))
 (with-eval-after-load 'sh (require 'oni-sh))
+(with-eval-after-load 'shr (require 'oni-shr))
 (with-eval-after-load 'smartparens (require 'oni-smartparens))
+(with-eval-after-load 'sort (require 'oni-sort))
+(with-eval-after-load 'tramp (require 'oni-tramp))
+(with-eval-after-load 'vc (require 'oni-vc))
 (with-eval-after-load 'vterm (require 'oni-vterm))
+(with-eval-after-load 'web-mode (require 'oni-web))
+(with-eval-after-load 'yaml-mode (require 'oni-yaml))
 
 (with-eval-after-load 'yasnippet
   (require 'oni-yasnippet)
diff --git a/oni-dired.el b/oni-dired.el
index 66bac53..aa4a96c 100644
--- a/oni-dired.el
+++ b/oni-dired.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1010.013833
+;; Version: 2021.1123.003414
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -45,7 +45,5 @@
 (add-to-list 'dired-guess-shell-alist-user
              `(,(rx (or ".jpg" ".jpeg" ".png" ".gif") eos) "feh"))
 
-;;;###autoload(with-eval-after-load 'dired (require 'oni-dired))
-
 (provide 'oni-dired)
 ;;; oni-dired.el ends here
diff --git a/oni-ediff.el b/oni-ediff.el
index 33f7dcf..51ccab0 100644
--- a/oni-ediff.el
+++ b/oni-ediff.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.1130.123447
+;; Version: 2021.1123.002904
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -86,7 +86,5 @@
 (add-hook 'ediff-cleanup-hook #'oni-ediff--turn-off-fullscreen)
 (add-hook 'ediff-cleanup-hook 'winner-undo)
 
-;;;###autoload(with-eval-after-load 'ediff (require 'oni-ediff))
-
 (provide 'oni-ediff)
 ;;; oni-ediff.el ends here
diff --git a/oni-elisp/oni-elisp.el b/oni-elisp/oni-elisp.el
index 9dc71ff..4e3dca9 100644
--- a/oni-elisp/oni-elisp.el
+++ b/oni-elisp/oni-elisp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221045
+;; Version: 2021.1123.003353
 ;; Package-Requires: (oni-company oni-flycheck oni-paredit oni-yasnippet oni-hydra rainbow-delimiters nameless erefactor flycheck-relint handle elisp-format)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -136,8 +136,5 @@ _eb_: Buffer
         :repls 'ielm
         :formatters 'elisp-format-buffer)
 
-;;;###autoload(with-eval-after-load 'elisp-mode (require 'oni-elisp))
-;;;###autoload(with-eval-after-load 'ielm (require 'oni-elisp))
-
 (provide 'oni-elisp)
 ;;; oni-elisp.el ends here
diff --git a/oni-elm.el b/oni-elm.el
index e022eb6..67bb65a 100644
--- a/oni-elm.el
+++ b/oni-elm.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0209.175337
+;; Version: 2021.1123.003612
 ;; Package-Requires: (elm-mode oni-lsp rainbow-delimiters)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,5 @@
 (add-hook 'elm-mode-hook 'lsp)
 (add-hook 'elm-mode-hook 'rainbow-delimiters-mode)
 
-;;;###autoload(with-eval-after-load 'elm-mode (require 'oni-elm))
-
 (provide 'oni-elm)
 ;;; oni-elm.el ends here
diff --git a/oni-epub.el b/oni-epub.el
index e8213c2..b547a40 100644
--- a/oni-epub.el
+++ b/oni-epub.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0407.231536
+;; Version: 2021.1123.002745
 ;; Package-Requires: (nov)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,5 @@
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))
 
-;;;###autoload(with-eval-after-load 'nov (require 'oni-epub))
-
 (provide 'oni-epub)
 ;;; oni-epub.el ends here
diff --git a/oni-eshell.el b/oni-eshell.el
index b49a375..bfbd3cd 100644
--- a/oni-eshell.el
+++ b/oni-eshell.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0227.172750
+;; Version: 2021.1123.002814
 ;; Package-Requires: (eshell-fringe-status esh-autosuggest xterm-color eshell-syntax-highlighting)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -126,7 +126,5 @@
                (slot . 0)
                (window-height . 0.33)))
 
-;;;###autoload(with-eval-after-load 'eshell (require 'oni-eshell))
-
 (provide 'oni-eshell)
 ;;; oni-eshell.el ends here
diff --git a/oni-fish.el b/oni-fish.el
index c211198..2bd77f6 100644
--- a/oni-fish.el
+++ b/oni-fish.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0408.000443
+;; Version: 2021.1123.003540
 ;; Package-Requires: (fish-mode reformatter)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,5 @@
 
 (add-hook 'fish-mode-hook 'oni-fish-fish-indent-on-save-mode)
 
-;;;###autoload(with-eval-after-load 'fish-mode (require 'oni-fish))
-
 (provide 'oni-fish)
 ;;; oni-fish.el ends here
diff --git a/oni-git-commit.el b/oni-git-commit.el
index 4652b16..b8b2068 100644
--- a/oni-git-commit.el
+++ b/oni-git-commit.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.1226.141017
+;; Version: 2021.1123.003204
 ;; Package-Requires: (git-commit)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,5 @@
 (add-hook 'git-commit-mode-hook 'electric-quote-local-mode)
 (add-hook 'git-commit-mode-hook 'refill-mode)
 
-;;;###autoload(with-eval-after-load 'git-commit (require 'oni-git-commit))
-
 (provide 'oni-git-commit)
 ;;; oni-git-commit.el ends here
diff --git a/oni-gnus.el b/oni-gnus.el
index 158a821..aa7e9a5 100644
--- a/oni-gnus.el
+++ b/oni-gnus.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0505.205651
+;; Version: 2021.1123.002704
 ;; Package-Requires: (oni-data-dir)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -88,7 +88,5 @@ Do this N times."
                (eval (setq message-sendmail-extra-arguments
                            '("-a" "gmail")))))
 
-;;;###autoload(with-eval-after-load 'gnus (require 'oni-gnus))
-
 (provide 'oni-gnus)
 ;;; oni-gnus.el ends here
diff --git a/oni-grep.el b/oni-grep.el
index c5527a9..25545ed 100644
--- a/oni-grep.el
+++ b/oni-grep.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0305.222639
+;; Version: 2021.1123.003553
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -47,7 +47,5 @@
 
 (add-to-list 'grep-find-ignored-directories ".cask")
 
-;;;###autoload(with-eval-after-load 'grep (require 'oni-grep))
-
 (provide 'oni-grep)
 ;;; oni-grep.el ends here
diff --git a/oni-groovy.el b/oni-groovy.el
index 0cc1d53..5684d95 100644
--- a/oni-groovy.el
+++ b/oni-groovy.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.1110.150802
+;; Version: 2021.1123.002828
 ;; Package-Requires: (groovy-mode oni-embrace groovy-imports rainbow-delimiters jenkinsfile-mode)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -50,7 +50,5 @@
 (with-eval-after-load 'grep
   (add-to-list 'grep-files-aliases '("groovy" . "*.groovy *.pipeline Jenkinsfile")))
 
-;;;###autoload(with-eval-after-load 'groovy-mode (require 'oni-groovy))
-
 (provide 'oni-groovy)
 ;;; oni-groovy.el ends here
diff --git a/oni-gui.el b/oni-gui.el
index 3e87140..fc9d1b6 100644
--- a/oni-gui.el
+++ b/oni-gui.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1028.202333
+;; Version: 2021.1123.003312
 ;; Package-Requires: (oni-ui oni-hydra yoshi-theme diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 ;;; Code:
 
 (require 'hydra)
+(require 'oni-ui)
 
 (add-to-list 'default-frame-alist '(font . "Fantasque Sans Mono-15"))
 (add-to-list 'default-frame-alist '(internal-border-width . 15))
@@ -126,7 +127,5 @@ _bi_: Auto Insert  ^^          ^^
 
 (load-theme 'yoshi :no-confirm)
 
-;;;###autoload(require 'oni-gui)
-
 (provide 'oni-gui)
 ;;; oni-gui.el ends here
diff --git a/oni-haskell.el b/oni-haskell.el
index 94538f0..1692ed0 100644
--- a/oni-haskell.el
+++ b/oni-haskell.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0429.230436
+;; Version: 2021.1123.002510
 ;; Package-Requires: (haskell-mode rainbow-delimiters)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -32,8 +32,5 @@
 (add-hook 'inferior-haskell-mode-hook 'electric-pair-local-mode)
 (add-hook 'inferior-haskell-mode-hook 'rainbow-delimiters-mode)
 
-
-;;;###autoload(with-eval-after-load 'haskell-mode (require 'oni-haskell))
-
 (provide 'oni-haskell)
 ;;; oni-haskell.el ends here
diff --git a/oni-highlight-indent-guides.el b/oni-highlight-indent-guides.el
index ad6ba07..4bbc982 100644
--- a/oni-highlight-indent-guides.el
+++ b/oni-highlight-indent-guides.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.0904.210610
+;; Version: 2021.1123.003038
 ;; Package-Requires: (highlight-indent-guides)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,5 @@
 
 (setq highlight-indent-guides-method 'character)
 
-;;;###autoload(with-eval-after-load 'highlight-indent-guides (require 'oni-highlight-indent-guides))
-
 (provide 'oni-highlight-indent-guides)
 ;;; oni-highlight-indent-guides.el ends here
diff --git a/oni-html/oni-html.el b/oni-html/oni-html.el
index 48d3d82..77e1dd7 100644
--- a/oni-html/oni-html.el
+++ b/oni-html/oni-html.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.1210.225526
+;; Version: 2021.1123.003501
 ;; Package-Requires: (oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,5 @@
   (with-eval-after-load 'yasnippet
     (oni-html-snippets-initialize)))
 
-;;;###autoload(with-eval-after-load 'sgml-mode (require 'oni-html))
-
 (provide 'oni-html)
 ;;; oni-html.el ends here
diff --git a/oni-ivy.el b/oni-ivy.el
index 0022e96..bfedcc2 100644
--- a/oni-ivy.el
+++ b/oni-ivy.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0712.215209
+;; Version: 2021.1123.003513
 ;; Package-Requires: (ivy oni-prescient oni-hydra ivy-hydra diminish ivy-posframe ivy-prescient)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -65,7 +65,5 @@
 (with-eval-after-load 'ivy-posframe (diminish 'ivy-posframe-mode))
 (with-eval-after-load 'ivy (diminish 'ivy-mode))
 
-;;;###autoload(with-eval-after-load 'ivy (require 'oni-ivy))
-
 (provide 'oni-ivy)
 ;;; oni-ivy.el ends here
diff --git a/oni-jabber.el b/oni-jabber.el
index ff12a75..6881e8b 100644
--- a/oni-jabber.el
+++ b/oni-jabber.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.0904.210634
+;; Version: 2021.1123.002326
 ;; Package-Requires: (jabber oni-data-dir)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -94,7 +94,5 @@ Insert PROPOSED-ALERT in the buffer if it is non-nil."
 (with-eval-after-load 'jabber-alert
   (remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo))
 
-;;;###autoload(with-eval-after-load 'jabber (require 'oni-jabber))
-
 (provide 'oni-jabber)
 ;;; oni-jabber.el ends here
diff --git a/oni-java.el b/oni-java.el
index 1f16e87..1848d1b 100644
--- a/oni-java.el
+++ b/oni-java.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221131
+;; Version: 2021.1123.003434
 ;; Package-Requires: (oni-data-dir oni-lsp oni-hydra lsp-java rainbow-delimiters)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -91,7 +91,5 @@
                (indent-for-tab-command) _ "\n"
                "}"))
 
-;;;###autoload(with-eval-after-load 'cc-mode (require 'oni-java))
-
 (provide 'oni-java)
 ;;; oni-java.el ends here
diff --git a/oni-js.el b/oni-js.el
index 3532c89..d1a8191 100644
--- a/oni-js.el
+++ b/oni-js.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221147
+;; Version: 2021.1123.003619
 ;; Package-Requires: (oni-company js2-mode js2-refactor oni-flycheck tern fic-mode rjsx-mode)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -69,8 +69,6 @@
 
 (js2r-add-keybindings-with-prefix "C-c r")
 
-;;;###autoload(with-eval-after-load 'js2-mode (require 'oni-js))
-
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
 
diff --git a/oni-json.el b/oni-json.el
index b8527bb..fed17ac 100644
--- a/oni-json.el
+++ b/oni-json.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0326.153836
+;; Version: 2021.1123.003523
 ;; Package-Requires: (json-mode)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,5 @@
 (add-hook 'json-mode-hook 'electric-pair-local-mode)
 (add-hook 'json-mode-hook 'electric-indent-local-mode)
 
-;;;###autoload(with-eval-after-load 'json-mode (require 'oni-json))
-
 (provide 'oni-json)
 ;;; oni-json.el ends here
diff --git a/oni-log-edit.el b/oni-log-edit.el
index 3a20303..afc3793 100644
--- a/oni-log-edit.el
+++ b/oni-log-edit.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0723.011100
+;; Version: 2021.1123.003632
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -27,7 +27,5 @@
 
 (add-hook 'log-edit-mode-hook 'visual-line-mode)
 
-;;;###autoload(with-eval-after-load 'log-edit (require 'oni-log-edit))
-
 (provide 'oni-log-edit)
 ;;; oni-log-edit.el ends here
diff --git a/oni-lua.el b/oni-lua.el
index 3e2e763..406b8f5 100644
--- a/oni-lua.el
+++ b/oni-lua.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <chelys@rincewind>
 ;; Keywords: local
-;; Version: 2021.0622.221212
+;; Version: 2021.1123.003626
 ;; Package-Requires: (lua-mode rainbow-delimiters)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,5 @@
 (add-hook 'lua-mode-hook 'display-fill-column-indicator-mode)
 (add-hook 'lua-mode-hook 'rainbow-delimiters-mode)
 
-;;;###autoload(with-eval-after-load 'lua-mode (require 'oni-lua))
-
 (provide 'oni-lua)
 ;;; oni-lua.el ends here
diff --git a/oni-magit.el b/oni-magit.el
index 5330520..8001404 100644
--- a/oni-magit.el
+++ b/oni-magit.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0214.182312
+;; Version: 2021.1123.003600
 ;; Package-Requires: (magit magit-popup oni-hydra)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -62,7 +62,5 @@ _i_: Init
 ;;;###autoload
 (global-set-key (kbd "C-c v") 'oni-hydra-magit/body)
 
-;;;###autoload(with-eval-after-load 'magit (require 'oni-magit))
-
 (provide 'oni-magit)
 ;;; oni-magit.el ends here
diff --git a/oni-makefile.el b/oni-makefile.el
index eeb7275..18030d8 100644
--- a/oni-makefile.el
+++ b/oni-makefile.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221229
+;; Version: 2021.1123.002931
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -42,7 +42,5 @@
 (add-hook 'makefile-mode-hook 'electric-pair-local-mode)
 (add-hook 'makefile-mode-hook 'oni-makefile--auto-fill-mode)
 
-;;;###autoload(with-eval-after-load 'make-mode (require 'oni-makefile))
-
 (provide 'oni-makefile)
 ;;; oni-makefile.el ends here
diff --git a/oni-package.el b/oni-package.el
index 77e4cef..921f7f7 100644
--- a/oni-package.el
+++ b/oni-package.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0823.102817
+;; Version: 2021.1123.002545
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -114,8 +114,5 @@ DESCRIPTION is the text of the news item."
 
 (add-hook 'package-menu-mode-hook 'hl-line-mode)
 
-;;;###autoload (with-eval-after-load 'package (require 'oni-package))
-;;;###autoload (with-eval-after-load 'package-x (require 'oni-package))
-
 (provide 'oni-package)
 ;;; oni-package.el ends here
diff --git a/oni-php/oni-php.el b/oni-php/oni-php.el
index f509e3d..82b1051 100644
--- a/oni-php/oni-php.el
+++ b/oni-php/oni-php.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221244
+;; Version: 2021.1123.003007
 ;; Package-Requires: (php-mode oni-yasnippet oni-flycheck oni-company oni-hydra ggtags fic-mode company-php)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -123,10 +123,15 @@ nil for some reason."
   (with-eval-after-load 'yasnippet
     (oni-php-snippets-initialize)))
 
-;;;###autoload(with-eval-after-load 'php-mode (require 'oni-php))
-;;;###autoload(add-to-list 'auto-mode-alist '("\\.inc\\'" . php-mode))
-;;;###autoload(add-to-list 'auto-mode-alist '("\\.module\\'" . php-mode))
-;;;###autoload(with-eval-after-load 'grep (add-to-list 'grep-files-aliases '("php" . "*.php *.inc *.module")))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.inc\\'" . php-mode))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.module\\'" . php-mode))
+
+;;;###autoload
+(with-eval-after-load 'grep
+  (add-to-list 'grep-files-aliases '("php" . "*.php *.inc *.module")))
 
 (provide 'oni-php)
 ;;; oni-php.el ends here
diff --git a/oni-projectile.el b/oni-projectile.el
index 4f4e6e4..ec10217 100644
--- a/oni-projectile.el
+++ b/oni-projectile.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0306.095413
+;; Version: 2021.1123.003113
 ;; Package-Requires: (projectile ivy oni-data-dir)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -53,8 +53,6 @@
   (setq projectile-generic-command "\"C:\\msys64\\usr\\bin\\find.exe\" . -type d \"(\" -path \"*/node_modules\" -o -path \"*/upload-test\" -o -path \"*/dlls\" -o -path \"*/apps/*/img\" -o -path \"*/apps/*/video\" -o -path \"*/apps/*/font\" -o -path \"*/apps/*/content\" -o -path \"*/apps/*/favicons\" -o -path \"*/apps/*/pages.*\" -o -path \"*/.intl\" \")\" -prune -o -type f -print0")
   (setq projectile-indexing-method 'alien))
 
-;;;###autoload(with-eval-after-load 'projectile (require 'oni-projectile))
-
 ;;;###autoload
 (projectile-mode)
 
diff --git a/oni-python/oni-python.el b/oni-python/oni-python.el
index 22e26ef..6e6f89b 100644
--- a/oni-python/oni-python.el
+++ b/oni-python/oni-python.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221258
+;; Version: 2021.1123.003606
 ;; Package-Requires: (oni-yasnippet oni-company oni-flycheck oni-hydra oni-lsp rainbow-delimiters reformatter traad)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -103,7 +103,5 @@ for indentation."
   (with-eval-after-load 'yasnippet
     (oni-python-snippets-initialize)))
 
-;;;###autoload(with-eval-after-load 'python (require 'oni-python))
-
 (provide 'oni-python)
 ;;; oni-python.el ends here
diff --git a/oni-ruby/oni-ruby.el b/oni-ruby/oni-ruby.el
index 7ad5065..f174247 100644
--- a/oni-ruby/oni-ruby.el
+++ b/oni-ruby/oni-ruby.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221314
+;; Version: 2021.1123.003056
 ;; Package-Requires: (ruby-mode oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -60,7 +60,5 @@
   (with-eval-after-load 'yasnippet
     (oni-ruby-snippets-initialize)))
 
-;;;###autoload(with-eval-after-load 'ruby-mode (require 'oni-ruby))
-
 (provide 'oni-ruby)
 ;;; oni-ruby.el ends here
diff --git a/oni-rust.el b/oni-rust.el
index 5474d85..de466e1 100644
--- a/oni-rust.el
+++ b/oni-rust.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.1210.231207
+;; Version: 2021.1123.002527
 ;; Package-Requires: (rust-mode oni-flycheck rainbow-delimiters)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,5 @@
 (add-hook 'rust-mode-hook 'rainbow-delimiters-mode)
 (add-hook 'rust-mode-hook 'oni-rust--auto-fill-mode)
 
-;;;###autoload(with-eval-after-load 'rust-mode (require 'oni-rust))
-
 (provide 'oni-rust)
 ;;; oni-rust.el ends here
diff --git a/oni-scheme.el b/oni-scheme.el
index 69fd8b4..dfc5aa6 100644
--- a/oni-scheme.el
+++ b/oni-scheme.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221328
+;; Version: 2021.1123.003531
 ;; Package-Requires: (oni-company oni-paredit rainbow-delimiters geiser geiser-guile)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -51,7 +51,5 @@
 ;;;###autoload
 (add-to-list 'interpreter-mode-alist '("scsh" . scheme-mode))
 
-;;;###autoload(with-eval-after-load 'scheme (require 'oni-scheme))
-
 (provide 'oni-scheme)
 ;;; oni-scheme.el ends here
diff --git a/oni-shr.el b/oni-shr.el
index 56f006a..df93430 100644
--- a/oni-shr.el
+++ b/oni-shr.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0430.183119
+;; Version: 2021.1123.003019
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -65,7 +65,5 @@ are the arguments passed in to it."
 	        :filter-args #'oni-shr--colorize-remove-last-arg)
 (add-function :around (symbol-function 'shr-tag-pre) #'oni-shr--recolorize)
 
-;;;###autoload(with-eval-after-load 'shr (require 'oni-shr))
-
 (provide 'oni-shr)
 ;;; oni-shr.el ends here
diff --git a/oni-sort.el b/oni-sort.el
index 604d75d..85ccdfd 100644
--- a/oni-sort.el
+++ b/oni-sort.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.0904.210825
+;; Version: 2021.1123.002604
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -30,7 +30,5 @@
 (when (eql system-type 'windows-nt)
   (setq sort-fold-case t))
 
-;;;###autoload(with-eval-after-load 'sort (require 'oni-sort))
-
 (provide 'oni-sort)
 ;;; oni-sort.el ends here
diff --git a/oni-termux.el b/oni-termux.el
index fad42ad..0faac23 100644
--- a/oni-termux.el
+++ b/oni-termux.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0724.190100
-;; Package-Requires: (oni-alert alert-termux)
+;; Version: 2021.1123.003341
+;; Package-Requires: (oni-alert oni-tui alert-termux)
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
 (require 'alert)
 ;;(require 'alert-termux)
 (require 'json)
+(require 'oni-tui)
 
 (defun oni-termux--battery-status ()
   "Get battery status information using `termux-battery status'.
@@ -78,7 +79,5 @@ library, so use this function in ‘after-init-hook’ instead."
 
 (display-battery-mode)
 
-;;;###autoload(require 'oni-termux)
-
 (provide 'oni-termux)
 ;;; oni-termux.el ends here
diff --git a/oni-tramp.el b/oni-tramp.el
index e19a40c..00fd40f 100644
--- a/oni-tramp.el
+++ b/oni-tramp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.0904.210828
+;; Version: 2021.1123.002641
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -30,7 +30,5 @@
 (setq tramp-persistency-file-name
       (concat user-emacs-directory "data/tramp"))
 
-;;;###autoload(with-eval-after-load 'tramp (require 'oni-tramp))
-
 (provide 'oni-tramp)
 ;;; oni-tramp.el ends here
diff --git a/oni-tui.el b/oni-tui.el
index a328444..820fdb3 100644
--- a/oni-tui.el
+++ b/oni-tui.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.0904.210831
+;; Version: 2021.1123.003326
 ;; Package-Requires: (oni-ui)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,9 @@
 
 ;;; Code:
 
-(load-theme 'wombat :no-confirm)
+(require 'oni-ui)
 
-;;;###autoload(require 'oni-tui)
+(load-theme 'wombat :no-confirm)
 
 (provide 'oni-tui)
 ;;; oni-tui.el ends here
diff --git a/oni-ui.el b/oni-ui.el
index adc0e5a..a6350a3 100644
--- a/oni-ui.el
+++ b/oni-ui.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0827.110905
+;; Version: 2021.1123.003239
 ;; Package-Requires: (beacon diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,5 @@
 
 (setq inhibit-startup-screen t)
 
-;;;###autoload(require 'oni-ui)
-
 (provide 'oni-ui)
 ;;; oni-ui.el ends here
diff --git a/oni-vc.el b/oni-vc.el
index fddf067..538861d 100644
--- a/oni-vc.el
+++ b/oni-vc.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.0904.210844
+;; Version: 2021.1123.002400
 ;; Package-Requires: (vc-p4)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,5 @@
 (when (eql system-type 'windows-nt)
   (require 'vc-p4))
 
-;;;###autoload(with-eval-after-load 'vc (require 'oni-vc))
-
 (provide 'oni-vc)
 ;;; oni-vc.el ends here
diff --git a/oni-web.el b/oni-web.el
index 2dc78df..3cb666e 100644
--- a/oni-web.el
+++ b/oni-web.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.1210.231451
+;; Version: 2021.1123.002232
 ;; Package-Requires: (web-mode oni-flycheck)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -51,8 +51,6 @@
 (add-hook 'web-mode-hook #'oni-web--whitespace-mode)
 (add-hook 'web-mode-hook 'oni-web--auto-fill-mode)
 
-;;;###autoload(with-eval-after-load 'web-mode (require 'oni-web))
-
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.blade\\.php\\'" . web-mode))
 
diff --git a/oni-yaml.el b/oni-yaml.el
index 23a97e8..35585c8 100644
--- a/oni-yaml.el
+++ b/oni-yaml.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.221406
+;; Version: 2021.1123.002719
 ;; Package-Requires: (yaml-mode oni-flycheck oni-highlight-indent-guides flycheck-yamllint indent-tools yaml-imenu)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -46,7 +46,5 @@
 
 (flycheck-yamllint-setup)
 
-;;;###autoload(with-eval-after-load 'yaml-mode (require 'oni-yaml))
-
 (provide 'oni-yaml)
 ;;; oni-yaml.el ends here