            (and (featurep 'face-remap)
                 (/= text-scale-mode-amount 0)
                 (format " (%+d)" text-scale-mode-amount)))
-   'face (if active 'doom-modeline-major-mode)))
+   'face (if (active) 'doom-modeline-major-mode)))
 
 (defun *vc ()
   "Displays the current branch, colored based on its state."
   (when vc-mode
-    (let ((state   (vc-state buffer-file-name))
+    (let ((backend (vc-backend buffer-file-name))
+          (state   (vc-state buffer-file-name))
           (face    'mode-line-inactive)
+          (active  (active))
           (all-the-icons-scale-factor 1.0)
           (all-the-icons-default-adjust -0.1))
       (concat (propertize " " 'face 'variable-pitch)


(defun doom-modeline (&optional id)
  `(:eval
    (let* ((active (eq (selected-window) powerline-selected-window))
           (lhs (list ,(if window-system '(if active &bar-active &bar-inactive))
                      ,(unless (eq id 'scratch)
                         '(let ((side (concat (*macro-recording)
                                              (*anzu)
                                              (*evil-substitute)
                                              (*iedit))))
                            (if (= (length side) 0)
                                " %I "
                              side)))
                      " "
                      ,(if (eq id 'scratch)
                           '(*buffer-project)
                         (if (eq id 'media)
                             '(*media-info)
                           '(*buffer-info)))
                      ,(unless (eq id 'media)
                         '(list "  %l:%c %p  "
                                (*selection-info)
                                (*flycheck)))))
           (rhs (list ,(unless (eq id 'media)
                         '(list (*buffer-encoding)
                                (*vc)))
                      (*major-mode)))

  (let ((all-the-icons-scale-factor 1.2)
        (modified-p (buffer-modified-p))
        faces)
    (if (active)   (push 'doom-modeline-buffer-path faces))
    (if modified-p (push 'doom-modeline-buffer-modified faces))
    (concat (if buffer-read-only
                (concat (all-the-icons-octicon
