diff --git a/lisp/spacemacs-theme/spacemacs-theme-autoloads.el b/lisp/spacemacs-theme/spacemacs-theme-autoloads.el
new file mode 100644
index 00000000..fb8cce45
--- /dev/null
+++ b/lisp/spacemacs-theme/spacemacs-theme-autoloads.el
@@ -0,0 +1,39 @@
+;;; spacemacs-theme-autoloads.el --- automatically extracted autoloads (do not edit)   -*- lexical-binding: t -*-
+;; Generated by the `loaddefs-generate' function.
+
+;; This file is part of GNU Emacs.
+
+;;; Code:
+
+(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path)))
+
+
+
+;;; Generated autoloads from spacemacs-dark-theme.el
+
+(register-definition-prefixes "spacemacs-dark-theme" '("spacemacs-dark"))
+
+
+;;; Generated autoloads from spacemacs-light-theme.el
+
+(register-definition-prefixes "spacemacs-light-theme" '("spacemacs-light"))
+
+
+;;; Generated autoloads from spacemacs-theme.el
+
+(when load-file-name (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
+(register-definition-prefixes "spacemacs-theme" '("create-spacemacs-theme" "spacemacs-theme-"))
+
+;;; End of scraped data
+
+(provide 'spacemacs-theme-autoloads)
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; no-native-compile: t
+;; coding: utf-8-emacs-unix
+;; End:
+
+;;; spacemacs-theme-autoloads.el ends here
diff --git a/lisp/srefactor/srefactor-autoloads.el b/lisp/srefactor/srefactor-autoloads.el
new file mode 100644
index 00000000..dbf1e174
--- /dev/null
+++ b/lisp/srefactor/srefactor-autoloads.el
@@ -0,0 +1,43 @@
+;;; srefactor-autoloads.el --- automatically extracted autoloads (do not edit)   -*- lexical-binding: t -*-
+;; Generated by the `loaddefs-generate' function.
+
+;; This file is part of GNU Emacs.
+
+;;; Code:
+
+(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path)))
+
+
+
+;;; Generated autoloads from srefactor.el
+
+(autoload 'srefactor-refactor-at-point "srefactor" "\
+Offer contextual menu with actions based on current tag in scope.
+
+Each menu item added returns a token for what type of refactoring
+to perform." t)
+(register-definition-prefixes "srefactor" '("srefactor-"))
+
+
+;;; Generated autoloads from srefactor-lisp.el
+
+(register-definition-prefixes "srefactor-lisp" '("comment-" "cur-buf" "first-token" "format-type" "ignore-num" "lexemes" "next-token" "orig-format-type" "recursive-p" "second-token" "srefactor-" "tok"))
+
+
+;;; Generated autoloads from srefactor-ui.el
+
+(register-definition-prefixes "srefactor-ui" '("srefactor-ui-"))
+
+;;; End of scraped data
+
+(provide 'srefactor-autoloads)
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; no-native-compile: t
+;; coding: utf-8-emacs-unix
+;; End:
+
+;;; srefactor-autoloads.el ends here
diff --git a/lisp/update-autoloads.el b/lisp/update-autoloads.el
index fbcab153..800a447d 100644
--- a/lisp/update-autoloads.el
+++ b/lisp/update-autoloads.el
@@ -41,6 +41,7 @@
 
 ;;;###autoload
 (defun update-autoloads-sub-packages (&optional file)
+  (require 'package)
   (package-generate-autoloads "all-the-icons" (concat config-dir "lisp/all-the-icons"))
   (package-generate-autoloads "dashboard" (concat config-dir "lisp/dashboard"))
   (package-generate-autoloads "ivy" (concat config-dir "lisp/ivy"))
@@ -48,6 +49,8 @@
   (package-generate-autoloads "my" (concat config-dir "lisp/my"))
   ;; (package-generate-autoloads "org" (concat config-dir "lisp/org"))  ;; already org-loaddefs.el
   (package-generate-autoloads "org-contrib" (concat config-dir "lisp/org-contrib"))
+  (package-generate-autoloads "spacemacs-theme" (concat config-dir "lisp/spacemacs-theme"))
+  (package-generate-autoloads "srefactor" (concat config-dir "lisp/srefactor"))
   (package-generate-autoloads "swiper" (concat config-dir "lisp/swiper"))
 )
 
diff --git a/settings/cedet-settings.el b/settings/cedet-settings.el
index 96b5d243..f74a9564 100644
--- a/settings/cedet-settings.el
+++ b/settings/cedet-settings.el
@@ -52,10 +52,15 @@
   (setq srecode-map-save-file (concat user-cache-directory "cedet/srecode-map.el")))
 
 (use-package srefactor         ;; https://melpa.org/#/srefactor
-  :defer t)
+  :defer t
+  :init (require 'srefactor-autoloads))
 
 (use-package srefactor-lisp
-  :after (srefactor))
+  :commands
+  (srefactor-lisp-format-buffer
+   srefactor-lisp-format-defun
+   srefactor-lisp-one-line
+   srefactor-lisp-format-sexp))
 
 ;; https://github.com/company-mode/company-mode/issues/525#issuecomment-348635719
 ;; http://ergoemacs.org/emacs/elisp_determine_cursor_inside_string_or_comment.html