 (eval-when-compile
   (require 'color-theme))
 
-(defcustom color-theme-solarized-degrade nil
-  "For test purposes only; forces Solarized to use the 256 degraded color mode to test the approximate color values for accuracy."
+(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 'color-theme-solarized)
-
-(defvar color-theme-solarized-colors
+  :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")

         (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 ()

         ;; comint
         (comint-highlight-prompt ((t (:foreground ,blue))))
         ;; compilation
         (compilation-info ((t (:foreground ,green :weight ,bold))))
         (compilation-warning ((t (:foreground ,orange :weight ,bold))))
         ;; customize
         (custom-button
          ((t (:background ,base02
