diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index e4c25bbd2..5e9424476 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -159,11 +159,19 @@ ready to be pasted in a bug report on github."
                             'symlinked-emacsdir)
                         (if (file-symlink-p doom-private-dir)
                             'symlinked-doomdir)
+                        (if (and (stringp custom-file) (file-exists-p custom-file))
+                            'custom-file)
                         (if (doom-files-in `(,@doom-modules-dirs
                                              ,doom-core-dir
                                              ,doom-private-dir)
                                            :type 'files :match "\\.elc$")
                             'byte-compiled-config)))))
+        (custom
+         ,@(when (and (stringp custom-file)
+                      (file-exists-p custom-file))
+             (cl-loop for (type var _) in (get 'user 'theme-settings)
+                      if (eq type 'theme-value)
+                      collect var)))
         (modules
          ,@(or (cl-loop with cat = nil
                         for key being the hash-keys of doom-modules