          (message-header-name ((t (:foreground ,cyan))))
          (message-header-other ((t (:foreground ,red))))
          (message-header-newsgroups
-          ((t (:foreground ,yellow :bold t :italic t))))
+          ((t (:foreground ,yellow :weight ,bold :slant ,italic))))
          (message-header-subject ((t (:foreground ,base00))))
-         (message-header-cc ((t (:foreground ,green :bold t))))
-         (message-header-to ((t (:foreground ,base1 :bold t)))))))))
+         (message-header-cc ((t (:foreground ,green :weight ,bold))))
+         (message-header-to ((t (:foreground ,base1 :weight ,bold)))))))))
 
 ;;;###autoload
 (defun color-theme-solarized-dark ()

  (interactive "Slight or dark? ")
  (flet ((find-color (name)
           (let ((index (if (or (<= (display-color-cells) 256)
                                color-theme-solarized-degrade)
                            2
                          1)))
             (nth index (assoc name color-theme-solarized-colors)))))
    (let ((base03  (find-color 'base03))
          (base02  (find-color 'base02))
          (base01  (find-color 'base01))
          (base00  (find-color 'base00))
          (base0   (find-color 'base0))
          (base1   (find-color 'base1))
          (base2   (find-color 'base2))
          (base3   (find-color 'base3))
          (yellow  (find-color 'yellow))
          (orange  (find-color 'orange))
          (red     (find-color 'red))
          (magenta (find-color 'magenta))
          (violet  (find-color 'violet))
          (blue    (find-color 'blue))
          (cyan    (find-color 'cyan))
          (green   (find-color 'green)))
      (when (eq 'light mode)
        (rotatef base03 base3)
        (rotatef base02 base2)

(eval-when-compile
  (require 'color-theme))

(defcustom solarized-degrade nil
  "For test purposes only; forces Solarized to use the 256 degraded color mode
to test the approximate color values for accuracy."
  :type 'boolean
  :group 'solarized)

(defcustom solarized-bold t
  "Stops Solarized from displaying bold when nil."
  :type 'boolean
  :group 'solarized)

(defcustom solarized-underline t
  "Stops Solarized from displaying underlines when nil."
  :type 'boolean
  :group 'solarized)

(defcustom solarized-italic t
  "Stops Solarized from displaying italics when nil."
  :type 'boolean
  :group 'solarized)

(defvar solarized-colors
  ;; name    ideal     256
  '((base03  "#002b36" "#1c1c1c")
    (base02  "#073642" "#262626")
