diff --git a/themes/zenburn-theme.el b/themes/zenburn-theme.el
index 3a99033..8940218 100644
--- a/themes/zenburn-theme.el
+++ b/themes/zenburn-theme.el
@@ -51,7 +51,6 @@
       ;; colors with +x are lighter, colors with -x are darker
       (zenburn-fg "#dcdccc")
       (zenburn-fg-1 "#656555")
-      (zenburn-bg-2 "#1f1f1f")
       (zenburn-bg-1 "#2b2b2b")
       (zenburn-bg-05 "#383838")
       (zenburn-bg "#3f3f3f")
@@ -99,7 +98,9 @@
    `(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))))
+   `(header-line ((,class (:foreground ,zenburn-yellow
+                                       :background ,zenburn-bg-1
+                                       :box (:line-width -1 :style released-button)))))
    `(highlight ((,class (:background ,zenburn-bg-05))))
 
    ;;; compilation
@@ -130,10 +131,18 @@
    `(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))))
@@ -203,7 +212,7 @@
    `(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 :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))))