diff --git a/init.d/basics/appearance.el b/init.d/basics/appearance.el
index 9b28f91..afe4ac3 100644
--- a/init.d/basics/appearance.el
+++ b/init.d/basics/appearance.el
@@ -80,7 +80,9 @@
                   (my/volatile-highlights-reset-color))
                 (my/set-default-fonts)
                 (when (display-graphic-p)
-                  (setq my/run-fix-theme nil))))
+                  (setq my/run-fix-theme nil))
+                (when (fboundp #'my/hl-paren-set-faces)
+                  (my/hl-paren-set-faces))))
             (load-theme 'doom-outrun-electric t)
             (my/fix-theme)
 
@@ -136,7 +138,7 @@
 
 ;; Visualize and transform whitespace.
 (use-package whitespace
-  :after (company)
+  :after (company doom-themes)
   :functions (my/on-off-whitespace-before-company)
   :diminish whitespace-mode
   :custom (whitespace-line-column nil)  ; Set to fill-column.
@@ -208,11 +210,15 @@
   :demand t
   :diminish (highlight-parentheses-mode)
   :custom ((highlight-parentheses-colors nil)
-           (highlight-parentheses-background-colors nil)
-           (highlight-parentheses-attributes
-            `((:weight bold :background ,(face-foreground 'whitespace-space))
-              (:weight ultrabold))))
-  :config (global-highlight-parentheses-mode)
+           (highlight-parentheses-background-colors nil))
+  :config (progn(global-highlight-parentheses-mode)
+                (defun my/hl-paren-set-faces ()
+                  "Faces have to be set after the first frame is created."
+                  (customize-set-variable
+                   'highlight-parentheses-attributes
+                   `((:weight bold :background
+                              ,(face-foreground 'whitespace-space))
+                     (:weight ultrabold)))))
   :hook (minibuffer-setup . highlight-parentheses-minibuffer-setup))
 
 (provide 'basics/appearance)