diff --git a/.emacs.d/lisp/init-helm.el b/.emacs.d/lisp/init-helm.el
index 0322c156..fac1032f 100644
--- a/.emacs.d/lisp/init-helm.el
+++ b/.emacs.d/lisp/init-helm.el
@@ -233,17 +233,6 @@ Requires `call-process-to-string' from `functions'."
 (with-eval-after-load 'man
   (define-key Man-mode-map (kbd "M-s f") 'helm-imenu))
 
-(set-face-attribute 'helm-source-header nil :inherit 'header-line :height 'unspecified :background 'unspecified :foreground 'unspecified)
-(set-face-background 'helm-selection "#4f4f4f")
-(set-face-background 'helm-visible-mark "#2f2f2f")
-(set-face-foreground 'helm-visible-mark nil)
-(set-face-foreground 'helm-match "red")
-(set-face-attribute 'helm-buffer-file nil :background 'unspecified :foreground "white" :weight 'normal)
-(set-face-attribute 'helm-buffer-directory nil :background 'unspecified :foreground "#1e90ff" :weight 'bold)
-(set-face-attribute 'helm-ff-directory nil :background 'unspecified :foreground 'unspecified :weight 'unspecified :inherit 'helm-buffer-directory)
-(set-face-attribute 'helm-ff-file nil :background 'unspecified :foreground 'unspecified :weight 'unspecified :inherit 'helm-buffer-file)
-(set-face-foreground 'helm-grep-finish "#00AA00")
-
 (setq helm-source-names-using-follow '("Occur" "Git-Grep" "AG" "mark-ring" "Org Headings"
                                        "Imenu" "Imenu in all buffers"
                                        "All Eshell prompts" "All comint prompts"))
diff --git a/.emacs.d/lisp/theme-ambrevar.el b/.emacs.d/lisp/theme-ambrevar.el
index d4be87ca..d4a467fd 100644
--- a/.emacs.d/lisp/theme-ambrevar.el
+++ b/.emacs.d/lisp/theme-ambrevar.el
@@ -94,4 +94,17 @@
                       :inherit 'error
                       :strike-through t))
 
+;; Helm
+(with-eval-after-load 'helm
+  (set-face-attribute 'helm-source-header nil :inherit 'header-line :height 'unspecified :background 'unspecified :foreground 'unspecified)
+  (set-face-background 'helm-selection "#4f4f4f")
+  (set-face-background 'helm-visible-mark "#2f2f2f")
+  (set-face-foreground 'helm-visible-mark nil)
+  (set-face-foreground 'helm-match "red")
+  (set-face-attribute 'helm-buffer-file nil :background 'unspecified :foreground "white" :weight 'normal)
+  (set-face-attribute 'helm-buffer-directory nil :background 'unspecified :foreground "#1e90ff" :weight 'bold)
+  (set-face-attribute 'helm-ff-directory nil :background 'unspecified :foreground 'unspecified :weight 'unspecified :inherit 'helm-buffer-directory)
+  (set-face-attribute 'helm-ff-file nil :background 'unspecified :foreground 'unspecified :weight 'unspecified :inherit 'helm-buffer-file)
+  (set-face-foreground 'helm-grep-finish "#00AA00"))
+
 (provide 'theme-ambrevar)