* etc/themes/leuven-theme.el: Update theme.

2 files changed, 139 insertions, 135 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 61e235e0ec4..5e5f93b4825 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-02  Fabrice Niessen  <fni@missioncriticalit.com>
+
+        * themes/leuven-theme.el: Update theme.
+
 2013-04-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use UTF-8 for most files with non-ASCII characters (Bug#13936).
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index 7945526b0e4..6941f6e5840 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -1,7 +1,7 @@
 ;;; leuven-theme.el --- Emacs custom theme
 
 ;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
-;; Time-stamp: <2012-12-05 Wed 10:47>
+;; Time-stamp: <2013-03-14 Thu 17:04>
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 
@@ -39,7 +39,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
       (diff-none '(:foreground "gray33"))
       (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
       (directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
-      (highlight-line '(:inverse-video t))
+      (highlight-line '(:background "#C6DBAD"))
       (link '(:underline t :foreground "#006DAF"))
       (mail-header-name '(:weight bold :foreground "black"))
       (marked-line '(:weight bold :foreground "white" :background "red"))
@@ -57,30 +57,31 @@ Semantic, and Ansi-Color faces are included -- and much more...")
       (string '(:foreground "#008000"))
       (subject '(:weight bold :foreground "#CF5D60"))
       (symlink '(:foreground "deep sky blue"))
+      (volatile-highlight '(:background "#FFFF00"))
       (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA")))
 
   (custom-theme-set-faces
    'leuven
-   `(default ((,class (:background "#ffffff" :foreground "#333333"))))
+   `(default ((,class (:background "#FFFFFF" :foreground "#333333"))))
    `(bold ((,class (:weight bold :foreground "black"))))
    `(bold-italic ((,class (:weight bold :slant italic :foreground "black"))))
    `(italic ((,class (:slant italic :foreground "#1A1A1A"))))
    `(underline ((,class (:underline t))))
-   `(cursor ((,class (:background "#15ff00"))))
+   `(cursor ((,class (:background "#15FF00"))))
    ;; Highlighting faces
    `(fringe ((,class (:foreground "#808080" :background "#DDEEFF"))))
-   `(highlight ((,class (:background "#FFFF00"))))
-   `(region ((t ,region)))
-   `(secondary-selection ((t ,match))) ;; used by Org-mode for highlighting matched entries and keywords
+   `(highlight ((,class ,volatile-highlight)))
+   `(region ((,class ,region)))
+   `(secondary-selection ((,class ,match))) ;; used by Org-mode for highlighting matched entries and keywords
    `(isearch ((,class (:weight bold :foreground "#00AA00" :background "#99FF99"))))
    `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999"))))
    `(lazy-highlight ((,class (:weight bold :foreground "#990099" :background "#FF66FF"))))
-   `(trailing-whitespace ((t (:background "#F6EBFE"))))
-   `(whitespace-line ((t (:foreground "#CC0000" :background "#FFFF88"))))
-   `(whitespace-tab  ((t (:foreground "lightgray" :background "beige"))))
-   `(whitespace-indentation ((t (:foreground "firebrick" :background "yellow"))))
-   `(whitespace-trailing ((t (:weight bold :foreground "yellow" :background "red1"))))
-   `(whitespace-hspace ((t (:background "#CCE8F6"))))
+   `(trailing-whitespace ((,class (:background "#F6EBFE"))))
+   `(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
+   `(whitespace-tab ((,class (:foreground "lightgray" :background "beige"))))
+   `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow"))))
+   `(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1"))))
+   `(whitespace-hspace ((,class (:background "#CCE8F6"))))
    ;; Mode line faces
    `(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8"))))
    `(mode-line-inactive ((,class (:box (:line-width 1 :color "#4E4E4C") :foreground "#F0F0EF" :background "#9B9C97"))))
@@ -107,7 +108,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(font-lock-reference-face ((,class (:foreground "dark cyan"))))
    `(font-lock-regexp-grouping-backslash ((,class (:bold t :weight bold))))
    `(font-lock-regexp-grouping-construct ((,class (:bold t :weight bold))))
-   `(font-lock-string-face ((t ,string)))
+   `(font-lock-string-face ((,class ,string)))
    `(font-lock-type-face ((,class (:foreground "#1B781F"))))
    `(font-lock-variable-name-face ((,class (:foreground "#2E91AF"))))
    `(font-lock-warning-face ((,class (:weight bold :foreground "red"))))
@@ -135,18 +136,18 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(gnus-group-mail-2 ((,class (:weight bold :foreground "#FF0066"))))
    `(gnus-group-mail-3-empty ((,class (:foreground "#808080"))))
    `(gnus-group-mail-3 ((,class (:weight bold :foreground "black"))))
-   `(gnus-group-mail-low-empty ((t ,cancel)))
-   `(gnus-group-mail-low ((t ,cancel)))
+   `(gnus-group-mail-low-empty ((,class ,cancel)))
+   `(gnus-group-mail-low ((,class ,cancel)))
    `(gnus-header-content ((,class (:family "Sans Serif" :foreground "#786FB4"))))
    `(gnus-header-from ((,class (:family "Sans Serif" :foreground "blue"))))
-   `(gnus-header-subject ((t ,subject)))
-   `(gnus-header-name ((t ,mail-header-name)))
+   `(gnus-header-subject ((,class ,subject)))
+   `(gnus-header-name ((,class ,mail-header-name)))
    `(gnus-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
    ;; Message faces
-   `(message-header-name ((t ,mail-header-name)))
+   `(message-header-name ((,class ,mail-header-name)))
    `(message-header-cc ((,class (:family "Sans Serif" :foreground "blue"))))
    `(message-header-other ((,class (:family "Sans Serif" :foreground "#3399CC"))))
-   `(message-header-subject ((t ,subject)))
+   `(message-header-subject ((,class ,subject)))
    `(message-header-to ((,class (:family "Sans Serif" :foreground "blue"))))
    `(message-cited-text ((,class (:foreground "#5050B0"))))
    `(message-separator ((,class (:family "Sans Serif" :weight bold :foreground "red"))))
@@ -154,20 +155,20 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(message-header-xheader ((,class (:foreground "red"))))
    `(message-mml ((,class (:foreground "forest green"))))
    ;; Diff
-   `(diff-added ((t ,diff-added)))
+   `(diff-added ((,class ,diff-added)))
    `(diff-changed ((,class (:foreground "blue" :background "#DDDDFF"))))
-   `(diff-context ((t ,diff-none)))
+   `(diff-context ((,class ,diff-none)))
    `(diff-file-header ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
-   `(diff-file1-hunk-header  ((,class (:foreground "dark magenta" :background "#EAF2F5"))))
-   `(diff-file2-hunk-header  ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
+   `(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5"))))
+   `(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
    `(diff-header ((,class (:foreground "#999999" :background "#EAF2F5"))))
-   `(diff-hunk-header ((t ,diff-hunk-header)))
-   `(diff-index ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4" :background "#EAF2F5"))))
+   `(diff-hunk-header ((,class ,diff-hunk-header)))
+   `(diff-index ((,class (:foreground "#4183C4" :background "#EAF2F5")))) ;; my foreground is NOT applied!?
    `(diff-indicator-added ((,class (:background "#AAFFAA"))))
    `(diff-indicator-changed ((,class (:background "#AAAAFF"))))
    `(diff-indicator-removed ((,class (:background "#FFAAAA"))))
    `(diff-refine-change ((,class (:background "#DDDDFF"))))
-   `(diff-removed ((t ,diff-removed)))
+   `(diff-removed ((,class ,diff-removed)))
    ;; SMerge
    `(smerge-refined-change ((,class (:background "#AAAAFF"))))
    ;; Ediff
@@ -181,45 +182,44 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(ediff-odd-diff-A ((,class (:foreground "black" :background "light grey"))))
    `(ediff-odd-diff-B ((,class (:foreground "black" :background "light grey"))))
    ;; Flyspell
-   `(flyspell-duplicate ((,class (:underline "#008000"))))
-   `(flyspell-incorrect ((,class (:underline "red"))))
+   `(flyspell-duplicate ((,class (:underline "#008000" :inherit nil))))
+   `(flyspell-incorrect ((,class (:underline "red" :inherit nil))))
    ;; ;; Semantic faces
-   ;; `(semantic-decoration-on-includes ((,class (:underline  ,cham-4))))
+   ;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4))))
    ;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2))))
    ;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2))))
    ;; `(semantic-decoration-on-unknown-includes ((,class (:background ,choc-3))))
-   ;; `(semantic-decoration-on-unparsed-includes ((,class (:underline  ,orange-3))))
-   ;; `(semantic-tag-boundary-face ((,class (:overline   ,blue-1))))
-   ;; `(semantic-unmatched-syntax-face ((,class (:underline  ,red-1))))
-
-   `(Info-title-1-face ((t ,ol1)))
-   `(Info-title-2-face ((t ,ol2)))
-   `(Info-title-3-face ((t ,ol3)))
-   `(Info-title-4-face ((t ,ol4)))
+   ;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3))))
+   ;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1))))
+   ;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1))))
+   `(Info-title-1-face ((,class ,ol1)))
+   `(Info-title-2-face ((,class ,ol2)))
+   `(Info-title-3-face ((,class ,ol3)))
+   `(Info-title-4-face ((,class ,ol4)))
    `(bbdb-company ((,class (:slant italic :foreground "steel blue"))))
    `(bbdb-field-name ((,class (:weight bold :foreground "steel blue"))))
    `(bbdb-field-value ((,class (:foreground "steel blue"))))
    `(bbdb-name ((,class (:underline t :foreground "#FF6633"))))
    `(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray"))))
-   `(calendar-today ((,class (:weight bold :background "#CCCCFF"))))
-   `(cfw:face-annotation ((,class (:foreground "RosyBrown" :inherit cfw:face-day-title))))
-   `(cfw:face-day-title ((,class (:background "#F8F9FF"))))
+   `(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
+   `(cfw:face-annotation ((,class (:foreground "green" :background "red"))))
+   `(cfw:face-day-title ((,class (:foreground "#C9C9C9"))))
    `(cfw:face-default-content ((,class (:foreground "#2952A3"))))
-   `(cfw:face-default-day ((,class (:weight bold :inherit cfw:face-day-title))))
-   `(cfw:face-disable ((,class (:foreground "DarkGray" :inherit cfw:face-day-title))))
-   `(cfw:face-grid ((,class (:foreground "SlateBlue"))))
-   `(cfw:face-header ((,class (:foreground "blue" :background "#D4E5FF" :weight bold))))
-   `(cfw:face-holiday ((,class (:background "#FFD5E5"))))
+   `(cfw:face-default-day ((,class (:weight bold))))
+   `(cfw:face-disable ((,class (:foreground "DarkGray"))))
+   `(cfw:face-grid ((,class (:foreground "#DDDDDD"))))
+   `(cfw:face-header ((,class (:foreground "#1662AF" :background "white" :weight bold))))
+   `(cfw:face-holiday ((,class (:foreground "#777777" :background "#E4EBFE"))))
    `(cfw:face-periods ((,class (:background "#668CD9" :foreground "white" :slant italic))))
-   `(cfw:face-saturday ((,class (:foreground "SlateGray4" :background "gray90" :weight bold))))
-   `(cfw:face-select ((,class (:background "#C3C9F8"))))
-   `(cfw:face-sunday ((,class (:foreground "red2" :background "#FFD5E5" :weight bold))))
-   `(cfw:face-title ((,class (:foreground "DarkGrey" :weight bold :height 2.0 :inherit variable-pitch))))
-   `(cfw:face-today ((,class (:background "#FFF7D7"))))
-   `(cfw:face-today-title ((,class (:background "#FAD163"))))
-   `(cfw:face-toolbar ((,class (:foreground "gray90" :background "gray90"))))
-   `(cfw:face-toolbar-button-off ((,class (:foreground "LightSkyBlue4" :background "white"))))
-   `(cfw:face-toolbar-button-on ((,class (:foreground "LightPink3" :background "gray94"))))
+   `(cfw:face-saturday ((,class (:foreground "#4E4E4E" :background "white" :weight bold))))
+   `(cfw:face-select ((,class (:foreground "#4A95EB" :background "#EDF1FA"))))
+   `(cfw:face-sunday ((,class (:foreground "#4E4E4E" :background "white" :weight bold))))
+   `(cfw:face-title ((,class (:foreground "#676767" :weight bold :height 2.0 :inherit variable-pitch))))
+   `(cfw:face-today ((,class (:foreground "#4F4A3D" :background "#FFFABE"))))
+   `(cfw:face-today-title ((,class (:foreground "#4A95EB" :background "#FFFABE"))))
+   `(cfw:face-toolbar ((,class (:background "white"))))
+   `(cfw:face-toolbar-button-off ((,class (:foreground "#CFCFCF" :background "white"))))
+   `(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6"))))
    `(change-log-date-face ((,class (:foreground "purple"))))
    `(change-log-file ((,class (:weight bold :foreground "#4183C4"))))
    `(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ;; other nick names
@@ -228,7 +228,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(circe-originator-face ((,class (:foreground "blue"))))
    `(circe-prompt-face ((,class (:foreground "red"))))
    `(circe-server-face ((,class (:foreground "#99CAE5"))))
-   `(comint-highlight-input ((t ,code-block)))
+   `(comint-highlight-input ((,class ,code-block)))
    `(comint-highlight-prompt ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
    `(compare-windows ((,class (:background "#FFFF00"))))
    `(compilation-error ((,class (:weight bold :foreground "red"))))
@@ -263,7 +263,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(dircolors-face-asm ((,class (:foreground "black"))))
    `(dircolors-face-backup ((,class (:foreground "black"))))
    `(dircolors-face-compress ((,class (:foreground "red"))))
-   `(dircolors-face-dir ((t ,directory)))
+   `(dircolors-face-dir ((,class ,directory)))
    `(dircolors-face-doc ((,class (:foreground "black"))))
    `(dircolors-face-dos ((,class (:foreground "green3"))))
    `(dircolors-face-emacs ((,class (:foreground "black"))))
@@ -281,32 +281,32 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(dircolors-face-tar ((,class (:foreground "red"))))
    `(dircolors-face-text ((,class (:foreground "black"))))
    `(dircolors-face-yacc ((,class (:foreground "black"))))
-   `(dired-directory ((t ,directory)))
-   `(dired-header ((t ,directory)))
+   `(dired-directory ((,class ,directory)))
+   `(dired-header ((,class ,directory)))
    `(dired-ignored ((,class (:strike-through t :foreground "red"))))
-   `(dired-mark ((t ,marked-line)))
-   `(dired-marked ((t ,marked-line)))
-   `(dired-symlink ((t ,symlink)))
+   `(dired-mark ((,class ,marked-line)))
+   `(dired-marked ((,class ,marked-line)))
+   `(dired-symlink ((,class ,symlink)))
    `(diredp-compressed-file-suffix ((,class (:foreground "red"))))
    `(diredp-date-time ((,class (:foreground "purple"))))
-   `(diredp-dir-heading ((t ,directory)))
-   `(diredp-dir-priv ((t ,directory)))
+   `(diredp-dir-heading ((,class ,directory)))
+   `(diredp-dir-priv ((,class ,directory)))
    `(diredp-exec-priv ((,class (:background "#03C03C"))))
    `(diredp-executable-tag ((,class (:foreground "green3" :background "white"))))
    `(diredp-file-name ((,class (:foreground "black"))))
    `(diredp-file-suffix ((,class (:foreground "#008000"))))
-   `(diredp-flag-mark-line ((t ,marked-line)))
+   `(diredp-flag-mark-line ((,class ,marked-line)))
    `(diredp-ignored-file-name ((,class (:strike-through t :foreground "red"))))
    `(diredp-read-priv ((,class (:background "#0A99FF"))))
    `(diredp-write-priv ((,class (:foreground "white" :background "#FF4040"))))
-   `(file-name-shadow ((t ,shadow)))
+   `(file-name-shadow ((,class ,shadow)))
    `(font-latex-bold-face ((,class (:weight bold :foreground "medium sea green"))))
    `(font-latex-math-face ((,class (:foreground "blue"))))
    `(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "cornflower blue"))))
-   `(font-latex-sectioning-2-face ((t ,ol1)))
-   `(font-latex-sectioning-3-face ((t ,ol2)))
-   `(font-latex-sectioning-4-face ((t ,ol3)))
-   `(font-latex-sectioning-5-face ((t ,ol4)))
+   `(font-latex-sectioning-2-face ((,class ,ol1)))
+   `(font-latex-sectioning-3-face ((,class ,ol2)))
+   `(font-latex-sectioning-4-face ((,class ,ol3)))
+   `(font-latex-sectioning-5-face ((,class ,ol4)))
    `(font-latex-sedate-face ((,class (:foreground "#FF5803"))))
    `(font-latex-string-face ((,class (:bold t :foreground "#0066FF"))))
    `(font-latex-verbatim-face ((,class (:foreground "tan1"))))
@@ -327,7 +327,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(gnus-picon-xbm ((,class (:foreground "yellow" :background "white"))))
    `(gnus-signature ((,class (:foreground "#7F7F7F"))))
    `(gnus-splash ((,class (:foreground "#FF8C00"))))
-   `(gnus-summary-cancelled ((t ,cancel)))
+   `(gnus-summary-cancelled ((,class ,cancel)))
    `(gnus-summary-high-ancient ((,class (:weight normal :foreground "#808080" :background "#FFFFE6"))))
    `(gnus-summary-high-read ((,class (:weight normal :foreground "#808080" :background "#FFFFE6"))))
    `(gnus-summary-high-ticked ((,class (:weight normal :foreground "black" :background "#E7AEB0"))))
@@ -347,24 +347,24 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66"))))
    `(helm-dir-heading ((,class (:foreground "blue" :background "pink"))))
    `(helm-dir-priv ((,class (:foreground "dark red" :background "light grey"))))
-   `(helm-ff-directory ((t ,directory)))
+   `(helm-ff-directory ((,class ,directory)))
    `(helm-ff-executable ((,class (:foreground "green3" :background "white"))))
    `(helm-ff-file ((,class (:foreground "black"))))
    `(helm-ff-invalid-symlink ((,class (:foreground "yellow" :background "red"))))
-   `(helm-ff-symlink ((t ,symlink)))
+   `(helm-ff-symlink ((,class ,symlink)))
    `(helm-file-name ((,class (:foreground "blue"))))
    `(helm-gentoo-match-face ((,class (:foreground "red"))))
    `(helm-grep-running ((,class (:weight bold :foreground "white"))))
    `(helm-isearch-match ((,class (:background "#CCFFCC"))))
-   `(helm-match ((t ,match)))
-   `(helm-overlay-line-face ((,class (:underline t :foreground "white" :background "IndianRed4"))))
-   `(helm-selection ((t ,highlight-line)))
+   `(helm-match ((,class ,match)))
+   `(helm-selection ((,class ,highlight-line)))
+   `(helm-selection-line ((,class ,volatile-highlight)))
    `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#666699"))))
-   `(helm-visible-mark ((t ,marked-line)))
+   `(helm-visible-mark ((,class ,marked-line)))
    `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1"))))
    `(highlight-symbol-face ((,class (:background "#FFFFA0"))))
-   `(hl-line ((t ,highlight-line)))
-   `(holiday-face ((,class (:background "#B6B2AE"))))
+   `(hl-line ((,class ,highlight-line)))
+   `(holiday-face ((,class (:foreground "#777777" :background "#E4EBFE"))))
    `(html-helper-bold-face ((,class (:weight bold :foreground "black"))))
    `(html-helper-italic-face ((,class (:slant italic :foreground "black"))))
    `(html-helper-underline-face ((,class (:underline t :foreground "black"))))
@@ -375,54 +375,54 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(info-menu-header ((,class (:family "Sans Serif" :height 1.6 :weight bold :underline t :foreground "#00CC00")))) ;; menu titles (headers) -- major topics
    `(info-menu-star ((,class (:foreground "black")))) ;; every 3rd menu item
    `(info-node ((,class (:underline t :foreground "blue")))) ;; node names
-   `(info-quoted-name ((t ,code-inline)))
-   `(info-string ((t ,string)))
-   `(info-title-1 ((t ,ol1)))
+   `(info-quoted-name ((,class ,code-inline)))
+   `(info-string ((,class ,string)))
+   `(info-title-1 ((,class ,ol1)))
    `(info-xref ((,class (:weight bold :underline t :foreground "blue")))) ;; unvisited cross-references
    `(info-xref-visited ((,class (:weight bold :foreground "magenta4")))) ;; previously visited cross-references
    `(light-symbol-face ((,class (:background "#FFFFA0"))))
    `(linum ((,class (:foreground "#AFB7BA" :background "#DDEEFF"))))
    `(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
-   `(lui-button-face ((t ,link)))
+   `(lui-button-face ((,class ,link)))
    `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ;; my nickname
    `(lui-time-stamp-face ((,class (:foreground "purple"))))
-   `(magit-branch ((t ,vc-branch)))
-   `(magit-diff-add ((t ,diff-added)))
-   `(magit-diff-del ((t ,diff-removed)))
+   `(magit-branch ((,class ,vc-branch)))
+   `(magit-diff-add ((,class ,diff-added)))
+   `(magit-diff-del ((,class ,diff-removed)))
    `(magit-diff-file-header ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4"))))
-   `(magit-diff-hunk-header ((t ,diff-hunk-header)))
-   `(magit-diff-none ((t ,diff-none)))
+   `(magit-diff-hunk-header ((,class ,diff-hunk-header)))
+   `(magit-diff-none ((,class ,diff-none)))
    `(magit-header ((,class (:foreground "white" :background "#FF4040"))))
    `(magit-item-highlight ((,class (:background "#EAF2F5"))))
-   `(magit-item-mark ((t ,marked-line)))
+   `(magit-item-mark ((,class ,marked-line)))
    `(magit-log-head-label ((,class (:box (:line-width 1 :color "blue" :style nil)))))
    `(magit-log-tag-label ((,class (:box (:line-width 1 :color "#00CC00" :style nil)))))
    `(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "cornflower blue"))))
    `(makefile-space-face ((,class (:background "hot pink"))))
    `(makefile-targets ((,class (:weight bold :foreground "blue"))))
-   `(match ((t ,match)))
-   `(mm-uu-extract ((t ,code-block)))
+   `(match ((,class ,match)))
+   `(mm-uu-extract ((,class ,code-block)))
    `(moccur-current-line-face ((,class (:background "#FFFFCC" :foreground "black"))))
    `(moccur-face ((,class (:background "#FFFF99" :foreground "black"))))
    `(nobreak-space ((,class (:background "#CCE8F6"))))
    `(nxml-attribute-local-name-face ((,class (:foreground "magenta"))))
    `(nxml-attribute-value-delimiter-face ((,class (:foreground "green4"))))
    `(nxml-attribute-value-face ((,class (:foreground "green4"))))
-   `(nxml-comment-content-face  ((,class (:slant italic :foreground "red"))))
+   `(nxml-comment-content-face ((,class (:slant italic :foreground "red"))))
    `(nxml-comment-delimiter-face ((,class (:foreground "red"))))
    `(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :background "#DEDEDE" :foreground "#000088"))))
    `(nxml-element-local-name-face ((,class (:foreground "blue"))))
    `(nxml-processing-instruction-target-face ((,class (:foreground "purple1"))))
    `(nxml-tag-delimiter-face ((,class (:foreground "blue"))))
    `(nxml-tag-slash-face ((,class (:foreground "blue"))))
-   `(org-agenda-calendar-event ((,class (:weight bold :foreground "white" :background "#1662AF"))))
-   `(org-agenda-calendar-sexp ((,class (:foreground "black" :background "#80CBFF"))))
-   `(org-agenda-clocking ((t ,clock-line)))
-   `(org-agenda-column-dateline ((t ,column)))
+   `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#A8C5EF"))))
+   `(org-agenda-calendar-sexp ((,class (:foreground "#777777" :background "#E4EBFE"))))
+   `(org-agenda-clocking ((,class ,clock-line)))
+   `(org-agenda-column-dateline ((,class ,column)))
    `(org-agenda-current-time ((,class (:underline t :foreground "#1662AF"))))
-   `(org-agenda-date ((,class (:height 1.6 :weight normal :foreground "#0063F5"))))
-   `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#1662AF"))))
-   `(org-agenda-date-weekend ((,class (:height 1.6 :weight normal :foreground "dim gray"))))
+   `(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#1662AF"))))
+   `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
+   `(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#4E4E4E"))))
    `(org-agenda-diary ((,class (:weight bold :foreground "green4" :background "light blue"))))
    `(org-agenda-dimmed-todo-face ((,class (:foreground "gold2"))))
    `(org-agenda-done ((,class (:foreground "#555555" :background "#EEEEEE"))))
@@ -432,15 +432,15 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(org-agenda-structure ((,class (:height 1.6 :weight bold :box (:line-width 1 :color "#999999") :foreground "#666666" :background "#CCCCCC"))))
    `(org-archived ((,class (:foreground "gray70"))))
    `(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0"))))
-   `(org-block ((t ,code-block)))
+   `(org-block ((,class ,code-block)))
    `(org-block-background ((,class (:background "#FFFFE0"))))
    `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
    `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
    `(org-checkbox ((,class (:weight bold :foreground "white" :background "#777777" :box (:line-width 1 :style pressed-button)))))
    `(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4"))))
-   `(org-code ((t ,code-inline)))
-   `(org-column ((t ,column)))
-   `(org-column-title ((t ,column)))
+   `(org-code ((,class (:foreground "#0066CC"))))
+   `(org-column ((,class ,column)))
+   `(org-column-title ((,class ,column)))
    `(org-date ((,class (:underline t :foreground "#00459E"))))
    `(org-default ((,class (:foreground "#333333"))))
    `(org-dim ((,class (:foreground "#AAAAAA"))))
@@ -457,44 +457,44 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(org-hide ((,class (:foreground "#E2E2E2"))))
    `(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6"))))
    `(org-latex-and-export-specials ((,class (:foreground "blue"))))
-   `(org-level-1 ((t ,ol1)))
-   `(org-level-2 ((t ,ol2)))
-   `(org-level-3 ((t ,ol3)))
-   `(org-level-4 ((t ,ol4)))
-   `(org-level-5 ((t ,ol5)))
-   `(org-level-6 ((t ,ol6)))
-   `(org-level-7 ((t ,ol7)))
-   `(org-level-8 ((t ,ol8)))
-   `(org-link ((t ,link)))
+   `(org-level-1 ((,class ,ol1)))
+   `(org-level-2 ((,class ,ol2)))
+   `(org-level-3 ((,class ,ol3)))
+   `(org-level-4 ((,class ,ol4)))
+   `(org-level-5 ((,class ,ol5)))
+   `(org-level-6 ((,class ,ol6)))
+   `(org-level-7 ((,class ,ol7)))
+   `(org-level-8 ((,class ,ol8)))
+   `(org-link ((,class ,link)))
    `(org-list-dt ((,class (:weight bold :foreground "#335EA8"))))
    `(org-meta-line ((,class (:slant normal :foreground "#008ED1" :background "#EAEAFF"))))
-   `(org-mode-line-clock ((t ,clock-line)))
+   `(org-mode-line-clock ((,class ,clock-line)))
    `(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#335EA8") :foreground "white" :background "#FF4040"))))
    `(org-number-of-items ((,class (:weight bold :foreground "white" :background "#79BA79"))))
    `(org-property-value ((,class (:foreground "#00A000"))))
    `(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0"))))
-   `(org-scheduled ((,class (:slant italic :foreground "#0063DC"))))
+   `(org-scheduled ((,class (:foreground "#333333"))))
    `(org-scheduled-previously ((,class (:weight bold :foreground "#373737"))))
-   `(org-scheduled-today ((,class (:foreground "black" :background "#FFFFCB"))))
+   `(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
    `(org-sexp-date ((,class (:foreground "purple"))))
    `(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA"))))
    `(org-table ((,class (:foreground "dark green" :background "#EAFFEA"))))
-   `(org-tag ((,class (:height 1.0 :weight normal :slant italic :foreground "#3C424F" :background "#E5ECFA"))))
+   `(org-tag ((,class (:weight normal :slant italic :foreground "#3E6D8E" :background "#E0EAF1"))))
    `(org-target ((,class (:underline t))))
-   `(org-time-grid ((,class (:foreground "#6D6D6D"))))
+   `(org-time-grid ((,class (:foreground "#CFCFCF"))))
    `(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4"))))
    `(org-upcoming-deadline ((,class (:foreground "#FF5555"))))
    `(org-verbatim ((,class (:box (:line-width 1 :color "#DDDDDD") :foreground "#000088" :background "#E0FFE0"))))
    `(org-verse ((,class (:slant italic :foreground "dim gray" :background "#EEEEEE"))))
    `(org-warning ((,class (:weight bold :foreground "black" :background "#CCE7FF"))))
-   `(outline-1 ((t ,ol1)))
-   `(outline-2 ((t ,ol2)))
-   `(outline-3 ((t ,ol3)))
-   `(outline-4 ((t ,ol4)))
-   `(outline-5 ((t ,ol5)))
-   `(outline-6 ((t ,ol6)))
-   `(outline-7 ((t ,ol7)))
-   `(outline-8 ((t ,ol8)))
+   `(outline-1 ((,class ,ol1)))
+   `(outline-2 ((,class ,ol2)))
+   `(outline-3 ((,class ,ol3)))
+   `(outline-4 ((,class ,ol4)))
+   `(outline-5 ((,class ,ol5)))
+   `(outline-6 ((,class ,ol6)))
+   `(outline-7 ((,class ,ol7)))
+   `(outline-8 ((,class ,ol8)))
    `(pabbrev-debug-display-label-face ((,class (:background "chartreuse"))))
    `(pabbrev-suggestions-face ((,class (:weight bold :foreground "white" :background "red"))))
    `(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "white" :background "purple"))))
@@ -504,7 +504,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(pp^L-highlight ((,class (:strike-through t))))
    `(recover-this-file ((,class (:background "white" :background "#FF3F3F"))))
    `(sh-heredoc ((,class (:foreground "blue" :background "#FBF9EA"))))
-   `(shadow ((t ,shadow)))
+   `(shadow ((,class ,shadow)))
    `(shell-option-face ((,class (:foreground "forest green"))))
    `(shell-output-2-face ((,class (:foreground "blue"))))
    `(shell-output-3-face ((,class (:foreground "purple"))))
@@ -515,16 +515,16 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(speedbar-button-face ((,class (:foreground "green4"))))
    `(speedbar-directory-face ((,class (:foreground "blue4"))))
    `(speedbar-file-face ((,class (:foreground "cyan4"))))
-   `(speedbar-highlight-face ((,class (:background "green"))))
+   `(speedbar-highlight-face ((,class ,volatile-highlight)))
    `(speedbar-selected-face ((,class (:underline t :foreground "red"))))
    `(speedbar-tag-face ((,class (:foreground "brown"))))
-   `(svn-status-directory-face ((t ,directory)))
+   `(svn-status-directory-face ((,class ,directory)))
    `(svn-status-filename-face ((,class (:weight bold :foreground "#4183C4"))))
    `(svn-status-locked-face ((,class (:weight bold :foreground "red"))))
-   `(svn-status-marked-face ((t ,marked-line)))
+   `(svn-status-marked-face ((,class ,marked-line)))
    `(svn-status-marked-popup-face ((,class (:weight bold :foreground "green3"))))
    `(svn-status-switched-face ((,class (:slant italic :foreground "gray55"))))
-   `(svn-status-symlink-face  ((t ,symlink)))
+   `(svn-status-symlink-face ((,class ,symlink)))
    `(svn-status-update-available-face ((,class (:foreground "orange"))))
    `(tex-verbatim ((,class (:foreground "blue"))))
    `(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "black" :background "gray75"))))
@@ -549,7 +549,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(vc-annotate-face-FF993F ((,class (:foreground "#FF993F" :background "black"))))
    `(vc-annotate-face-FFC63F ((,class (:foreground "#FF993F" :background "black"))))
    `(vc-annotate-face-FFF33F ((,class (:foreground "#FFF33F" :background "black"))))
-   `(w3m-anchor ((t ,link)))
+   `(w3m-anchor ((,class ,link)))
    `(w3m-arrived-anchor ((,class (:foreground "purple1"))))
    `(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green"))))
    `(w3m-bold ((,class (:weight bold :foreground "medium sea green"))))
@@ -569,9 +569,9 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(whitespace-hspace ((,class (:background "#CCE8F6"))))
    `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow"))))
    `(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
-   `(whitespace-tab  ((,class (:foreground "lightgray" :background "beige"))))
+   `(whitespace-tab ((,class (:foreground "lightgray" :background "beige"))))
    `(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1"))))
-   `(widget-button-face ((t ,link)))
+   `(widget-button-face ((,class ,link)))
    `(widget-button-pressed-face ((,class (:foreground "red"))))
    `(widget-documentation-face ((,class (:foreground "green4"))))
    `(widget-field-face ((,class (:background "gray85"))))
@@ -583,8 +583,8 @@ Semantic, and Ansi-Color faces are included -- and much more...")
 
 (custom-theme-set-variables
  'leuven
- '(ansi-color-names-vector ["#242424" "#e5786d" "#95e454" "#cae682"
-                            "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"]))
+ '(ansi-color-names-vector ["#242424" "#E5786D" "#95E454" "#CAE682"
+                            "#8AC6F2" "#333366" "#CCAA8F" "#F6F3E8"]))
 
 (provide-theme 'leuven)