diff --git a/oni-gui.el b/oni-gui.el
index 5613a1c..7b94230 100644
--- a/oni-gui.el
+++ b/oni-gui.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190124011713
+;; Version: 20190130014447
 ;; Package-Requires: (oni-ui)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -34,5 +34,7 @@
 
 (load-theme 'yoshi :no-confirm)
 
+;;;###autoload(require 'oni-gui)
+
 (provide 'oni-gui)
 ;;; oni-gui.el ends here
diff --git a/oni-python.el b/oni-python.el
index 111772d..4748b42 100644
--- a/oni-python.el
+++ b/oni-python.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190130011623
+;; Version: 20190130014834
 ;; Package-Requires: (company-jedi fill-column-indicator flycheck rainbow-delimiters reformatter)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -55,5 +55,7 @@
 (add-hook 'python-mode-hook 'rainbow-delimiters-mode)
 (add-hook 'python-mode-hook 'python-black-on-save-mode)
 
+;;;###autoload(with-eval-after-load 'python (require 'oni-python))
+
 (provide 'oni-python)
 ;;; oni-python.el ends here
diff --git a/oni-sh.el b/oni-sh.el
index 77c19b3..faa7e16 100644
--- a/oni-sh.el
+++ b/oni-sh.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190124010524
+;; Version: 20190130014540
 ;; Package-Requires: (reformatter flycheck fill-column-indicator)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -40,5 +40,7 @@
 (add-hook 'sh-mode-hook 'flycheck-mode)
 (add-hook 'sh-mode-hook 'shfmt-on-save-mode)
 
+;;;###autoload(with-eval-after-load 'sh-script (require 'oni-sh))
+
 (provide 'oni-sh)
 ;;; oni-sh.el ends here
diff --git a/oni-ui.el b/oni-ui.el
index e884852..64c2e9f 100644
--- a/oni-ui.el
+++ b/oni-ui.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190126000155
+;; Version: 20190130014741
 
 ;; 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
@@ -31,5 +31,7 @@
 
 (setq inhibit-startup-screen t)
 
+;;;###autoload(require 'oni-ui)
+
 (provide 'oni-ui)
 ;;; oni-ui.el ends here