   "Directory where we can find additionnal themes (personnal).
 Note that there is at least one directory shipped with the official
 color-theme distribution where all contributed themes are located.
-This official selection can't be changed with that variable. 
+This official selection can't be changed with that variable.
 However, you still can decide to turn it on or off and thus,
 not be shown with all themes but yours."
   :type '(repeat string)
   :group 'color-theme)
 
-(defcustom color-theme-libraries (directory-files 
-                                  (concat 
+(defcustom color-theme-libraries (directory-files
+                                  (concat
                                    (file-name-directory (locate-library "color-theme"))
                                    "/themes") t "^color-theme")
   "A list of files, which will be loaded in color-theme-initialize depending
-on `color-theme-load-all-themes' value. 
+on `color-theme-load-all-themes' value.
 This allows a user to prune the default color-themes (which can take a while
 to load)."
   :type '(repeat string)

    (when face
      ;; remove :inherit face from atts -- this assumes only one
      ;; :inherit attribute.
      (setq atts (delq ':inherit (delq face atts)))
      (let ((more-atts (color-theme-spec-resolve-inheritance
			(color-theme-face-attr-construct
			 face (selected-frame))))

;; Use this to define themes
(defmacro define-color-theme (name author description &rest forms)
  (let ((n name))
    `(progn
       (add-to-list 'color-themes
                    (list ',n
                          (upcase-initials
                           (replace-in-string
                            (replace-in-string
                             (symbol-name ',n) "^color-theme-" "") "-" " "))
                          ,author))
       (defun ,n ()
