       (ac-candidate-face  :inherit(default) :background base02)
       (ac-selection-face  :inherit (ac-candidate-face) :background base01 :foreground base3 :weight bold)
       ;; avy
-      (avy-lead-face   :foreground base02 :background green)
-      (avy-lead-face-0 :foreground base02 :background green)
-      (avy-lead-face-2 :foreground base02 :background green)
+      (avy-lead-face   :foreground base02 :background cyan)
+      (avy-lead-face-0 :foreground base02 :background cyan)
+      (avy-lead-face-2 :foreground base02 :background cyan)
       ;; ace-window
-      (aw-leading-char-face :inherit (default) :foreground green :height 4.0)
+      (aw-leading-char-face :inherit (default) :foreground cyan :height 4.0)
       (aw-background-face   :inherit (default) :foreground base02)
       ;; company-mode
       (company-tooltip                  :inherit (default) :foreground base2 :background base01)
       (company-tooltip-selection        :inherit (company-tooltip) :background base00 :foreground base3 :weight bold)
       (company-tooltip-search           :inherit (isearch))
       (company-tooltip-mouse            :inherit (company-tooltip-selection))
-      (company-tooltip-common           :inherit (company-tooltip) :foreground green :weight bold)
-      (company-tooltip-common-selection :inherit (company-tooltip-selection) :foreground green)
+      (company-tooltip-common           :inherit (company-tooltip) :foreground cyan :weight bold)
+      (company-tooltip-common-selection :inherit (company-tooltip-selection) :foreground cyan)
       (company-tooltip-annotation       :inherit (company-tooltip) :foreground blue)
       (company-scrollbar-fg             :background base0)
       (company-scrollbar-bg             :inherit (company-tooltip))
       (company-preview                  :foreground base2 )
-      (company-preview-common           :foreground green)
+      (company-preview-common           :foreground cyan)
       (company-preview-search           :inherit (isearch))
       (company-echo                     )
-      (company-echo-common              :inherit (company-echo) :foreground green :weight bold)
+      (company-echo-common              :inherit (company-echo) :foreground cyan :weight bold)
       ;; diff-mode
       (diff-header         :background base02 :foreground violet :weight bold)
       (diff-file-header    :weight bold :inherit (diff-header))
       (diff-index          :inherit (diff-file-header))
       (diff-hunk-header    :inherit (diff-header) :foreground red)
-      (diff-removed        :background diff-rm  :foreground base2)
-      (diff-added          :background diff-add :foreground base2)
+      (diff-removed        :foreground diff-rm-fg  :background diff-rm-bg)
+      (diff-added          :foreground diff-add-fg :background diff-add-bg)
       (diff-changed        )
       (diff-function       :foreground red :background base02 :inherit (diff-header))
       (diff-context        :foreground base00)
       (diff-nonexistent    :inherit (diff-file-header))
-      (diff-refine-removed :foreground (lighten 40 diff-rm)  :weight bold)
-      (diff-refine-added   :foreground (lighten 40 diff-add) :weight bold)
+      (diff-refine-removed :foreground diff-rm-hi  :weight bold)
+      (diff-refine-added   :foreground diff-add-hi :weight bold)
       (diff-refine-change  :inherit (diff-refine-added))
       ;; Magit
       (magit-item-highlight :inherit (highlight))
+      (magit-diff-context-highlight :inherit (highlight))
+      (magit-diff-removed :inherit (diff-removed))
+      (magit-diff-added   :inherit (diff-added))
+      (magit-diff-removed-highlight :inherit (magit-diff-removed))
+      (magit-diff-added-highlight :inherit (magit-diff-added))
       ;; Minimap
       (minimap-active-region-background :inherit (highlight))
       ;; Ediff

      (window-divider-first-pixel :inherit (window-divider))
      (window-divider-last-pixel  :inherit (window-divider))
      ;; hlinum
      (linum-highlight-face :inherit (linum) :foreground base2 :weight bold)
      ;; powerline
      (powerline-active1       :foreground base2 :background blue1)
      (powerline-active2       :foreground base2 :background blue1)
      (powerline-inactive1     :foreground base0 :background base02)
      (powerline-inactive2     :foreground base0 :background base02)
      ;; powerline (for my vim-like setup)
      ;; See https://github.com/yuttie/dot-emacs/blob/master/packages.d/init-powerline.el
      (powerline-mode-normal   :foreground base02 :background green  :box nil)
      (powerline-first-normal  :foreground base02 :background base1          )
      (powerline-second-normal :foreground base2  :background base00         )
      (powerline-third-normal  :foreground base1  :background base01         )
      (powerline-buffer-id-normal :inherit (powerline-second-normal))

      (powerline-mode-insert   :foreground blue2 :background base2 :box nil)
      (powerline-first-insert  :foreground blue2 :background blue0         )
      (powerline-second-insert :foreground base2 :background blue1         )
      (powerline-third-insert  :foreground blue0 :background blue2         )
      (powerline-buffer-id-insert :inherit (powerline-second-insert))

      (powerline-mode-visual   :foreground base02             :background yellow :box nil)
      (powerline-mode-replace  :foreground base02             :background red    :box nil)
      (powerline-mode-operator :foreground base02             :background red    :box nil)
      (powerline-mode-emacs    :foreground (lighten 40 emacs) :background emacs  :box nil)

      (powerline-mode-inactive   :foreground base01 :background base0 :box nil)
      (powerline-first-inactive  :foreground base01 :background base0         )
      (powerline-second-inactive :foreground base1  :background base00        )
      (powerline-third-inactive  :foreground base0  :background base01        )
      (powerline-buffer-id-inactive :inherit (powerline-second-inactive))
      ;; Highlight
      (highlight           :background base01 :foreground unspecified)
      (hl-line             :background base03)
      (isearch             :background yellow :foreground base02)
      (query-replace       :inherit (isearch))
      (lazy-highlight      :background nil :inherit (isearch))
      (region              :background base00 :foreground unspecified)
      (secondary-selection :background base02)
      (trailing-whitespace :background red)
      (escape-glyph        :foreground yellow)
      ;; whitespace
      (whitespace-line :background yellow :foreground base02)
      ;; Main
      (font-lock-builtin-face :foreground blue)
      (font-lock-comment-delimiter-face    :inherit (font-lock-comment-face))
      (font-lock-comment-face              :foreground base0)
      (font-lock-constant-face             :foreground violet)
      (font-lock-doc-face                  :slant italic :inherit (shadow))
      (font-lock-function-name-face        :foreground yellow :slant italic)
      (font-lock-keyword-face              :foreground blue)
      (font-lock-negation-char-face        :foreground blue)
      (font-lock-preprocessor-face         :foreground magenta)
      (font-lock-regexp-grouping-backslash :weight bold)
      (font-lock-regexp-grouping-construct :weight bold)
      (font-lock-string-face               :foreground cyan)
      (font-lock-type-face                 :foreground violet)
      (font-lock-variable-name-face        :foreground green)
      (font-lock-warning-face              :background red :foreground (darken 40 red))
      ;; completions
      (completions-common-part      :foreground violet :weight bold)

      (ediff-fine-diff-C                            :background base2       :foreground unspecified)
      ;; git-gutter-plus
      (git-gutter+-modified :foreground magenta)
      (git-gutter+-added    :foreground diff-add-fg)
      (git-gutter+-deleted  :foreground diff-rm-fg)
      ;; Helm
      (helm-source-header    :background unspecified :foreground blue :height 1.414 :weight bold)
      (helm-header           :background violet      :foreground base02 :height 1.414)
      (helm-candidate-number :background unspecified :foreground base1)
      (helm-selection        :background base01      :foreground base3 :weight bold :underline nil)
      (helm-match            :foreground cyan :weight bold)
      ;; highlight-symbol
      (highlight-symbol-face :background unspecified :underline t)
      ;; ElScreen
