    `(menu ((,class (:foreground ,zenburn-fg :background ,zenburn-bg))))
    `(minibuffer-prompt ((,class (:foreground ,zenburn-yellow))))
    `(mode-line
-     ((,class (:foreground ,zenburn-green+1 :background ,zenburn-bg-1))))
+     ((,class (:foreground ,zenburn-green+1
+                           :background ,zenburn-bg-1
+                           :box (:line-width -1 :style released-button)))))
    `(mode-line-buffer-id ((,class (:foreground ,zenburn-yellow :weight bold))))
    `(mode-line-inactive
-     ((,class (:foreground ,zenburn-green-1  :background ,zenburn-bg-1))))
+<<<<<<< HEAD
+     ((,class (:foreground ,zenburn-green-1
+                           :background ,zenburn-bg-1
+                           :box (:line-width -1 :style released-button)))))
+=======
+     ((,class (:foreground ,zenburn-green-1  :background ,zenburn-bg-05))))
+>>>>>>> b1ccc0ac7975473c30e8555c550733e0b192a0ae
    `(region ((,class (:background ,zenburn-bg-1))))
    `(secondary-selection ((,class (:background ,zenburn-bg+2))))
    `(trailing-whitespace ((,class (:background ,zenburn-red))))

   `(cursor ((,class (:foreground ,zenburn-fg))))
   `(escape-glyph-face ((,class (:foreground ,zenburn-red))))
   `(fringe ((,class (:foreground ,zenburn-fg :background ,zenburn-bg+1))))
   `(header-line ((,class (:foreground ,zenburn-yellow :background ,zenburn-bg-2))))
   `(highlight ((,class (:background ,zenburn-bg-05))))

   ;;; compilation

   `(erc-nick-msg-face ((,class (:inherit erc-default))))
   `(erc-notice-face ((,class (:foreground ,zenburn-green))))
   `(erc-pal-face ((,class (:foreground ,zenburn-orange :weight bold))))
   `(erc-prompt-face ((,class (:foreground ,zenburn-orange :background ,zenburn-bg :weight bold))))
   `(erc-timestamp-face ((,class (:foreground ,zenburn-green+1))))
   `(erc-underline-face ((t (:underline t))))

