   (interactive "Slight or dark? ")
   (flet ((find-color (name)
            (let ((index (if (or (<= (display-color-cells) 256)
-                                color-theme-solarized-degrade)
+                                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)))
+             (nth index (assoc name 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))
+          (bold      (if solarized-bold 'bold 'normal))
+          (underline (if solarized-underline t nil))
+          (italic    (if solarized-italic 'italic 'normal)))
       (when (eq 'light mode)
         (rotatef base03 base3)
         (rotatef base02 base2)

         (message-header-name ((t (:foreground ,cyan))))
         (message-header-other ((t (:foreground ,red))))
         (message-header-newsgroups
          ((t (:foreground ,yellow :bold t :italic t))))
         (message-header-subject ((t (:foreground ,base00))))
         (message-header-cc ((t (:foreground ,green :bold t))))
         (message-header-to ((t (:foreground ,base1 :bold t)))))))))

;;;###autoload
(defun color-theme-solarized-dark ()

         (hl-line ((t (:background ,base2))))
         (isearch ((t (:foreground ,yellow :inverse-video t))))
         (lazy-highlight ((t (:background ,base2 :foreground ,base00))))
         (link ((t (:foreground ,violet :underline ,underline))))
         (link-visited ((t (:foreground ,magenta :underline ,underline))))
         (menu ((t (:foreground ,base0 :background ,base02))))
         (minibuffer-prompt ((t (:foreground ,blue))))
         (mode-line
