General formatting & minor refactors

core/core-editor.el

@@ -297,7 +297,9 @@ savehist file."
 (def-package! ws-butler
   :after-call (after-find-file) 
   :config
-  (nconc ws-butler-global-exempt-modes '(special-mode comint-mode term-mode eshell-mode))
+  (setq ws-butler-global-exempt-modes
+        (append ws-butler-global-exempt-modes
+                '(special-mode comint-mode term-mode eshell-mode)))
   (ws-butler-global-mode))
 
 (provide 'core-editor)

core/core-os.el

@@ -8,8 +8,7 @@
 
 ;; stop copying each visual state move to the clipboard:
 ;; https://bitbucket.org/lyro/evil/issue/336/osx-visual-state-copies-the-region-on
-;; Most of this code grokked from:
-;; http://stackoverflow.com/questions/15873346/elisp-rename-macro
+;; grokked from: http://stackoverflow.com/questions/15873346/elisp-rename-macro
 (advice-add #'evil-visual-update-x-selection :override #'ignore)
 
 (defmacro set-env! (&rest _vars)

core/core-ui.el

@@ -372,7 +372,8 @@ frame's window-system, the theme will be reloaded.")
 ;; frames, however. There's always `doom/reload-theme' if you need it!
 (defun doom|reload-theme-in-frame-maybe (frame)
   "Reloads the theme in new daemon or tty frames."
-  (when (and (framep frame)
+  (when (and doom-theme
+             (framep frame)
              (not (eq doom-last-window-system (framep-on-display frame))))
     (with-selected-frame frame
       (load-theme doom-theme t))