diff --git a/modules/ui/doom/autoload/doom.el b/modules/ui/doom/autoload/doom.el
index 1cef9e2e2..8231c97f6 100644
--- a/modules/ui/doom/autoload/doom.el
+++ b/modules/ui/doom/autoload/doom.el
@@ -7,6 +7,7 @@
   (let ((theme (or (car-safe custom-enabled-themes) +doom-theme)))
     (when theme
       (mapc #'disable-theme custom-enabled-themes))
+    (load "doom-themes-common.el" nil t)
     (load-theme theme t)
     (+doom|refresh-bright-buffers)))
 
diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index 5e6501e2e..464996632 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -57,8 +57,8 @@
 
   ;; Dark frames by default
   (when (display-graphic-p)
-    (push (cons 'background-color (face-background 'default)) default-frame-alist)
-    (push (cons 'foreground-color (face-foreground 'default)) default-frame-alist))
+    (push (cons 'background-color (face-background 'default)) initial-frame-alist)
+    (push (cons 'foreground-color (face-foreground 'default)) initial-frame-alist))
 
   (defun +doom|buffer-mode-on ()
     "Enable `doom-buffer-mode' in buffers that are real (see