diff --git a/CHANGELOG.org b/CHANGELOG.org
index 0d0bf8f..d1c3eb3 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -32,6 +32,14 @@ This project adheres to [[http://semver.org][Semantic Versioning]].
    Add the JS2 Mode faces: =js2-error=, =js2-function-call=,
    =js2-object-property=, =js2-warning=.
 
+** ADDED Some company-mode faces
+
+   Add the Company faces: =company-preview=, =company-preview-common=,
+   =company-scrollbar-bg=, =company-scrollbar-fg=, =company-tooltip=,
+   =company-tooltip-annotation=, =company-tooltip-common=,
+   =common-tooltip-search=, =common-tooltip-search-selecion=,
+   =common-tooltip-selection=.
+
 ** CHANGED the color of high-scoring unread mails in gnus
 
 ** CHANGED the color of normal ticked mails in gnus
diff --git a/yoshi-theme.el b/yoshi-theme.el
index f795c3c..96385ae 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -88,6 +88,18 @@
    `(lui-button-face ((t (:foreground unspecified :underline unspecified :inherit button))))
    `(lui-time-stamp-face ((t (:foreground ,fggreen :weight unspecified))))
 
+   ;;; Company
+   `(company-preview ((t (:background unspecified :foreground ,fgdim))))
+   `(company-preview-common ((t (:foreground ,bgcyan :inherit unspecified :weight bold))))
+   `(company-scrollbar-bg ((t (:background ,bgdim))))
+   `(company-scrollbar-fg ((t (:background ,bgbright))))
+   `(company-tooltip ((t (:foreground ,fgdefault :background ,bgdim))))
+   `(company-tooltip-annotation ((t (:foreground ,fgblue))))
+   `(company-tooltip-common ((t (:foreground ,fgcyan))))
+   `(company-tooltip-search ((t (:background ,bgyellow :inherit unspecified))))
+   `(company-tooltip-search-selection ((t (:background ,bgyellow :inherit unspecified))))
+   `(company-tooltip-selection ((t (:background ,bgblue))))
+
    ;;; Compilation
    `(compilation-info ((t (:foreground ,fgblue :inherit unspecified))))