* themes/leuven-theme.el: Add Commentary and some headers, update

  face definitions, add autoload block which is used when
  distributed separately from Emacs.

1 files changed, 162 insertions, 110 deletions

diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index c890997c8b6..9f7452836c5 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -1,9 +1,11 @@
-;;; leuven-theme.el --- Emacs custom theme
+;;; leuven-theme.el --- Awesome Emacs color theme on white background
 
 ;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
-;; Time-stamp: <2013-05-24 Fri 10:33>
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
+;; URL: https://github.com/fniessen/emacs-leuven-theme
+;; Version: 20130918.1010
+;; Keywords: color theme
 
 ;; This file is part of GNU Emacs.
 
@@ -20,6 +22,17 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+
+;; This Org-enhancing color theme "leuven" ROCKS!
+;; ... and not just for Org mode.
+;;
+;; To use it, put the following in your Emacs configuration file:
+;;
+;;   (load-theme 'leuven t)
+;;
+;; Requirements: Emacs 24.
+
 ;;; Code:
 
 (deftheme leuven
@@ -28,33 +41,34 @@ Basic, Font Lock, Isearch, Gnus, Message, Diff, Ediff, Flyspell,
 Semantic, and Ansi-Color faces are included -- and much more...")
 
 (let ((class '((class color) (min-colors 89)))
+
       ;; Leuven generic colors
       (cancel '(:slant italic :strike-through t :foreground "gray55"))
       (clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900"))
-      (code-block '(:foreground "#000088" :background "#FBF9EA"))
+      (code-block '(:foreground "#000088" :background "#FFFFE0"))
       (code-inline '(:box (:line-width 1 :color "#DDDDDD") :foreground "#000088" :background "#FFFFE0"))
       (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE"))
       (diff-added '(:foreground "#008000" :background "#DDFFDD"))
-      (diff-hunk-header '(:box (:line-width 1 :color "#FFE0FF") :foreground "#990099" :background "#FFEEFF"))
+      (diff-hunk-header '(:foreground "#990099" :background "#FFEEFF"))
       (diff-none '(:foreground "gray33"))
       (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
       (directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
-      (highlight-line '(:background "#CCDEED"))
+      (highlight-line '(:background "#FEFCAE")) ;; #F5F5F5 or #CCDEED
       (link '(:underline t :foreground "#006DAF"))
       (mail-header-name '(:weight bold :foreground "black"))
       (marked-line '(:weight bold :foreground "white" :background "red"))
       (match '(:background "#FBE448"))
       (ol1 '(:height 1.3 :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0"))
       (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB"))
-      (ol3 '(:height 1.0 :weight bold :overline "#005522" :foreground "#005522" :background "#EFFFEF"))
+      (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF"))
       (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300"))
       (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D"))
       (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC"))
       (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C"))
       (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008"))
-      (region '(:background "#CCDEED"))
+      (region '(:background "#ADD6FF")) ;; #CCCCCC
       (shadow '(:foreground "#7F7F7F"))
-      (string '(:foreground "#FF5500")) ;; D0372D
+      (string '(:foreground "#FF4700")) ;; #D0372D or #23238E
       (subject '(:weight bold :foreground "#CF5D60"))
       (symlink '(:foreground "deep sky blue"))
       (volatile-highlight '(:background "#FBE448"))
@@ -62,12 +76,13 @@ Semantic, and Ansi-Color faces are included -- and much more...")
 
   (custom-theme-set-faces
    'leuven
-   `(default ((,class (:background "#FFFFFF" :foreground "#333333"))))
+   `(default ((,class (:foreground "#333333" :background "#FFFFFF"))))
    `(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"))))
+
    ;; Highlighting faces
    `(fringe ((,class (:foreground "#56B556" :background "#E2F9E2"))))
    `(highlight ((,class ,volatile-highlight)))
@@ -82,12 +97,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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"))))
    `(mode-line-buffer-id ((,class (:weight bold :foreground "white"))))
    `(mode-line-emphasis ((,class (:weight bold :foreground "white"))))
    `(mode-line-highlight ((,class (:foreground "yellow"))))
+
    ;; Escape and prompt faces
    `(minibuffer-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
    `(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
@@ -95,51 +112,92 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(error ((,class (:foreground "red"))))
    `(warning ((,class (:foreground "orange"))))
    `(success ((,class (:foreground "green"))))
+
    ;; Font lock faces
    `(font-lock-builtin-face ((,class (:foreground "#006FE0"))))
-   `(font-lock-comment-delimiter-face ((,class (:foreground "#008200"))))
-   `(font-lock-comment-face ((,class (:slant italic :foreground "#008200"))))
+   `(font-lock-comment-delimiter-face ((,class (:foreground "#008200")))) ;; #696969
+   `(font-lock-comment-face ((,class (:slant italic :foreground "#008200")))) ;; #696969
    `(font-lock-constant-face ((,class (:foreground "#6434A3"))))
    `(font-lock-doc-face ((,class (:foreground "#008000"))))
    `(font-lock-doc-string-face ((,class (:foreground "#008000"))))
    `(font-lock-function-name-face ((,class (:foreground "#006699"))))
    `(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ;; #3654DC
    `(font-lock-preprocessor-face ((,class (:foreground "#808080"))))
+   `(font-lock-regexp-grouping-backslash ((,class (:weight bold :inherit nil))))
+   `(font-lock-regexp-grouping-construct ((,class (:weight bold :inherit nil))))
    `(font-lock-string-face ((,class ,string)))
-   `(font-lock-type-face ((,class (:foreground "#6D6D6D"))))
-   `(font-lock-variable-name-face ((,class (:foreground "#BA36A5")))) ;; 800080
+   `(font-lock-type-face ((,class (:foreground "#666666"))))
+   `(font-lock-variable-name-face ((,class (:foreground "#BA36A5")))) ;; #800080
    `(font-lock-warning-face ((,class (:weight bold :foreground "red"))))
+
    ;; Button and link faces
-   `(link ((,class (:foreground "#8ac6f2" :underline t))))
-   `(link-visited ((,class (:foreground "#e5786d" :underline t))))
+   `(link ((,class (:foreground "#8AC6F2" :underline t))))
+   `(link-visited ((,class (:foreground "#E5786D" :underline t))))
    `(button ((,class (:underline t :foreground "#006DAF"))))
-   `(header-line ((,class (:weight bold :underline "black" :overline "black" :foreground "black" :background "#FFFF88"))))
+   `(header-line ((,class (:weight bold :foreground "black" :background "#FFFF88" :underline "black" :overline "black"))))
+
    ;; Gnus faces
-   `(gnus-group-news-1-empty ((,class (:foreground "#5050B0"))))
+   `(gnus-cite-attribution-face ((,class (:foreground "#5050B0"))))
+   `(gnus-cite-face-1 ((,class (:foreground "#5050B0"))))
+   `(gnus-cite-face-10 ((,class (:foreground "#990000"))))
+   `(gnus-cite-face-2 ((,class (:foreground "#660066"))))
+   `(gnus-cite-face-3 ((,class (:foreground "#007777"))))
+   `(gnus-cite-face-4 ((,class (:foreground "#990000"))))
+   `(gnus-cite-face-5 ((,class (:foreground "#000099"))))
+   `(gnus-cite-face-6 ((,class (:foreground "#BB6600"))))
+   `(gnus-cite-face-7 ((,class (:foreground "#5050B0"))))
+   `(gnus-cite-face-8 ((,class (:foreground "#660066"))))
+   `(gnus-cite-face-9 ((,class (:foreground "#007777"))))
+   `(gnus-emphasis-bold ((,class (:weight bold))))
+   `(gnus-emphasis-highlight-words ((,class (:foreground "yellow" :background "black"))))
+   `(gnus-group-mail-1 ((,class (:weight bold :foreground "#FF50B0"))))
+   `(gnus-group-mail-1-empty ((,class (:foreground "#5050B0"))))
+   `(gnus-group-mail-2 ((,class (:weight bold :foreground "#FF0066"))))
+   `(gnus-group-mail-2-empty ((,class (:foreground "#660066"))))
+   `(gnus-group-mail-3 ((,class (:weight bold :foreground "black"))))
+   `(gnus-group-mail-3-empty ((,class (:foreground "#808080"))))
+   `(gnus-group-mail-low ((,class ,cancel)))
+   `(gnus-group-mail-low-empty ((,class ,cancel)))
    `(gnus-group-news-1 ((,class (:weight bold :foreground "#FF50B0"))))
-   `(gnus-group-news-2-empty ((,class (:foreground "#660066"))))
+   `(gnus-group-news-1-empty ((,class (:foreground "#5050B0"))))
    `(gnus-group-news-2 ((,class (:weight bold :foreground "#FF0066"))))
-   `(gnus-group-news-3-empty ((,class (:foreground "#808080"))))
+   `(gnus-group-news-2-empty ((,class (:foreground "#660066"))))
    `(gnus-group-news-3 ((,class (:weight bold :foreground "black"))))
-   `(gnus-group-news-4-empty ((,class (:foreground "#990000"))))
+   `(gnus-group-news-3-empty ((,class (:foreground "#808080"))))
    `(gnus-group-news-4 ((,class (:weight bold :foreground "#FF0000"))))
-   `(gnus-group-news-5-empty ((,class (:foreground "#000099"))))
+   `(gnus-group-news-4-empty ((,class (:foreground "#990000"))))
    `(gnus-group-news-5 ((,class (:weight bold :foreground "#FF0099"))))
-   `(gnus-group-news-6-empty ((,class (:foreground "#808080"))))
+   `(gnus-group-news-5-empty ((,class (:foreground "#000099"))))
    `(gnus-group-news-6 ((,class (:weight bold :foreground "gray50"))))
-   `(gnus-group-mail-1-empty ((,class (:foreground "#5050B0"))))
-   `(gnus-group-mail-1 ((,class (:weight bold :foreground "#FF50B0"))))
-   `(gnus-group-mail-2-empty ((,class (:foreground "#660066"))))
-   `(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 ((,class ,cancel)))
-   `(gnus-group-mail-low ((,class ,cancel)))
+   `(gnus-group-news-6-empty ((,class (:foreground "#808080"))))
    `(gnus-header-content ((,class (:family "Sans Serif" :foreground "#3399CC"))))
    `(gnus-header-from ((,class (:family "Sans Serif" :foreground "blue"))))
-   `(gnus-header-subject ((,class ,subject)))
    `(gnus-header-name ((,class ,mail-header-name)))
    `(gnus-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
+   `(gnus-header-subject ((,class ,subject)))
+   `(gnus-picon ((,class (:foreground "yellow" :background "white"))))
+   `(gnus-picon-xbm ((,class (:foreground "yellow" :background "white"))))
+   `(gnus-server-closed ((,class (:slant italic :foreground "blue" :background "white"))))
+   `(gnus-server-denied ((,class (:weight bold :foreground "red" :background "white"))))
+   `(gnus-server-opened ((,class (:foreground "white" :background "#83B869"))))
+   `(gnus-signature ((,class (:slant italic :foreground "#7F7F7F"))))
+   `(gnus-splash ((,class (:foreground "#FF8C00"))))
+   `(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"))))
+   `(gnus-summary-high-unread ((,class (:weight normal :foreground "black" :background "#FFFFCC"))))
+   `(gnus-summary-low-ancient ((,class (:slant italic :foreground "gray55"))))
+   `(gnus-summary-low-read ((,class (:slant italic :foreground "gray55" :background "#E0E0E0"))))
+   `(gnus-summary-low-ticked ((,class (:slant italic :foreground "black" :background "#E7AEB0"))))
+   `(gnus-summary-low-unread ((,class (:slant italic :foreground "black"))))
+   `(gnus-summary-normal-ancient ((,class (:foreground "#808080"))))
+   `(gnus-summary-normal-read ((,class (:foreground "#808080"))))
+   `(gnus-summary-normal-ticked ((,class (:foreground "black" :background "#E7AEB0"))))
+   `(gnus-summary-normal-unread ((,class (:foreground "black"))))
+   `(gnus-summary-selected ((,class (:foreground "black" :background "#FFD0D0" :underline t))))
+   `(gnus-x-face ((,class (:foreground "black" :background "white"))))
+
    ;; Message faces
    `(message-header-name ((,class ,mail-header-name)))
    `(message-header-cc ((,class (:family "Sans Serif" :foreground "blue"))))
@@ -151,6 +209,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
    `(message-header-xheader ((,class (:family "Sans Serif" :foreground "#3399CC"))))
    `(message-mml ((,class (:foreground "forest green"))))
+
    ;; Diff
    `(diff-added ((,class ,diff-added)))
    `(diff-changed ((,class (:foreground "blue" :background "#DDDDFF"))))
@@ -166,8 +225,10 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(diff-indicator-removed ((,class (:foreground "#A60000" :background "#FFAAAA"))))
    `(diff-refine-change ((,class (:background "#DDDDFF"))))
    `(diff-removed ((,class ,diff-removed)))
+
    ;; SMerge
    `(smerge-refined-change ((,class (:background "#AAAAFF"))))
+
    ;; Ediff
    `(ediff-current-diff-A ((,class (:foreground "gray33" :background "#FFDDDD"))))
    `(ediff-current-diff-B ((,class (:foreground "gray33" :background "#DDFFDD"))))
@@ -178,9 +239,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(ediff-fine-diff-B ((,class (:foreground "#008000" :background "#55FF55"))))
    `(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" :inherit nil))))
    `(flyspell-incorrect ((,class (:underline "red" :inherit nil))))
+
    ;; ;; Semantic faces
    ;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4))))
    ;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2))))
@@ -189,6 +252,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    ;; `(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)))
@@ -196,7 +260,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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"))))
+   `(bbdb-name ((,class (:foreground "#FF6633" :underline t))))
    `(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray"))))
    `(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
    `(cfw:face-annotation ((,class (:foreground "green" :background "red"))))
@@ -207,11 +271,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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-periods ((,class (:foreground "white" :background "#668CD9" :slant italic))))
    `(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-title ((,class (:height 2.0 :foreground "#676767" :weight bold :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"))))
@@ -230,32 +294,32 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(compare-windows ((,class (:background "#FFFF00"))))
    `(compilation-error ((,class (:weight bold :foreground "red"))))
    `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ;; used for grep
-   `(compilation-line-number ((,class (:bold t :foreground "#A535AE"))))
+   `(compilation-line-number ((,class (:weight bold :foreground "#A535AE"))))
    `(compilation-warning ((,class (:weight bold :foreground "orange"))))
    `(css-property ((,class (:foreground "#00AA00"))))
    `(css-selector ((,class (:weight bold :foreground "blue"))))
-   `(custom-button ((,class (:background "lightgrey" :foreground "black" :box (:line-width 2 :style released-button)))))
-   `(custom-button-mouse ((,class (:background "grey90" :foreground "black" :box (:line-width 2 :style released-button)))))
-   `(custom-button-pressed ((,class (:foreground "black" :background "light grey" :box (:line-width 2 :style pressed-button)))))
-   `(custom-button-pressed-unraised ((,class (:underline t :foreground "magenta4"))))
+   `(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "black" :background "lightgrey"))))
+   `(custom-button-mouse ((,class (:box (:line-width 2 :style released-button) :foreground "black" :background "grey90"))))
+   `(custom-button-pressed ((,class (:box (:line-width 2 :style pressed-button) :foreground "black" :background "light grey"))))
+   `(custom-button-pressed-unraised ((,class (:foreground "magenta4" :underline t))))
    `(custom-button-unraised ((,class (:underline t))))
    `(custom-changed ((,class (:foreground "white" :background "blue"))))
    `(custom-comment ((,class (:background "gray85"))))
    `(custom-comment-tag ((,class (:foreground "blue4"))))
    `(custom-documentation ((,class (nil))))
-   `(custom-face-tag ((,class (:family "Sans Serif" :weight bold :height 1.2))))
-   `(custom-group-tag ((,class (:bold t :foreground "blue1" :weight bold :height 1.2))))
-   `(custom-group-tag-1 ((,class (:bold t :family "Sans Serif" :foreground "red1" :weight bold :height 1.2))))
+   `(custom-face-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold))))
+   `(custom-group-tag ((,class (:height 1.2 :weight bold :foreground "blue1"))))
+   `(custom-group-tag-1 ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "red1"))))
    `(custom-invalid ((,class (:foreground "yellow" :background "red"))))
-   `(custom-link ((,class (:underline t :foreground "blue1"))))
+   `(custom-link ((,class (:foreground "blue1" :underline t))))
    `(custom-modified ((,class (:foreground "white" :background "blue"))))
    `(custom-rogue ((,class (:foreground "pink" :background "black"))))
    `(custom-saved ((,class (:underline t))))
    `(custom-set ((,class (:foreground "blue" :background "white"))))
    `(custom-state ((,class (:foreground "green4"))))
-   `(custom-themed ((,class (:background "blue1" :foreground "white"))))
+   `(custom-themed ((,class (:foreground "white" :background "blue1"))))
    `(custom-variable-button ((,class (:weight bold :underline t))))
-   `(custom-variable-tag ((,class (:bold t :family "Sans Serif" :foreground "blue1" :weight bold :height 1.2))))
+   `(custom-variable-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "blue1"))))
    `(custom-visibility ((,class ,link)))
    `(diary-face ((,class (:foreground "#87C9FC"))))
    `(dircolors-face-asm ((,class (:foreground "black"))))
@@ -294,7 +358,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(diredp-file-name ((,class (:foreground "black"))))
    `(diredp-file-suffix ((,class (:foreground "#008000"))))
    `(diredp-flag-mark-line ((,class ,marked-line)))
-   `(diredp-ignored-file-name ((,class (:strike-through t :foreground "red"))))
+   `(diredp-ignored-file-name ((,class ,shadow)))
    `(diredp-read-priv ((,class (:background "#0A99FF"))))
    `(diredp-write-priv ((,class (:foreground "white" :background "#FF4040"))))
    `(file-name-shadow ((,class ,shadow)))
@@ -307,40 +371,10 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(font-latex-sectioning-4-face ((,class ,ol3)))
    `(font-latex-sectioning-5-face ((,class ,ol4)))
    `(font-latex-sedate-face ((,class (:foreground "#FF5500"))))
-   `(font-latex-string-face ((,class (:bold t :foreground "#0066FF"))))
+   `(font-latex-string-face ((,class (:weight bold :foreground "#0066FF"))))
    `(font-latex-verbatim-face ((,class (:foreground "#000088" :background "#FFFFE0" :inherit nil))))
-   `(gnus-cite-attribution-face ((,class (:foreground "#5050B0"))))
-   `(gnus-cite-face-1 ((,class (:foreground "#5050B0"))))
-   `(gnus-cite-face-10 ((,class (:foreground "#990000"))))
-   `(gnus-cite-face-2 ((,class (:foreground "#660066"))))
-   `(gnus-cite-face-3 ((,class (:foreground "#007777"))))
-   `(gnus-cite-face-4 ((,class (:foreground "#990000"))))
-   `(gnus-cite-face-5 ((,class (:foreground "#000099"))))
-   `(gnus-cite-face-6 ((,class (:foreground "#BB6600"))))
-   `(gnus-cite-face-7 ((,class (:foreground "#5050B0"))))
-   `(gnus-cite-face-8 ((,class (:foreground "#660066"))))
-   `(gnus-cite-face-9 ((,class (:foreground "#007777"))))
-   `(gnus-emphasis-bold ((,class (:weight bold))))
-   `(gnus-emphasis-highlight-words ((,class (:foreground "yellow" :background "black"))))
-   `(gnus-picon ((,class (:foreground "yellow" :background "white"))))
-   `(gnus-picon-xbm ((,class (:foreground "yellow" :background "white"))))
-   `(gnus-signature ((,class (:foreground "#7F7F7F"))))
-   `(gnus-splash ((,class (:foreground "#FF8C00"))))
-   `(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"))))
-   `(gnus-summary-high-unread ((,class (:weight normal :foreground "black" :background "#FFFFCC"))))
-   `(gnus-summary-low-ancient ((,class (:slant italic :foreground "gray55"))))
-   `(gnus-summary-low-read ((,class (:slant italic :foreground "gray55" :background "#E0E0E0"))))
-   `(gnus-summary-low-ticked ((,class (:slant italic :foreground "black" :background "#E7AEB0"))))
-   `(gnus-summary-low-unread ((,class (:slant italic :foreground "black"))))
-   `(gnus-summary-normal-ancient ((,class (:foreground "#808080"))))
-   `(gnus-summary-normal-read ((,class (:foreground "#808080"))))
-   `(gnus-summary-normal-ticked ((,class (:foreground "black" :background "#E7AEB0"))))
-   `(gnus-summary-normal-unread ((,class (:foreground "black"))))
-   `(gnus-summary-selected ((,class (:foreground "black" :background "#FFD0D0" :underline t))))
-   `(gnus-x-face ((,class (:foreground "black" :background "white"))))
+   `(git-commit-summary-face ((,class (:foreground "#000000"))))
+   `(git-commit-comment-face ((,class (:slant italic :foreground "#696969"))))
    `(helm-action ((,class (:foreground "#335EA8"))))
    `(helm-bookmarks-su-face ((,class (:foreground "red"))))
    `(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66"))))
@@ -360,24 +394,30 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(helm-selection-line ((,class ,volatile-highlight)))
    `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#2F69BF"))))
    `(helm-visible-mark ((,class ,marked-line)))
-   `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1"))))
+   `(helm-w3m-bookmarks-face ((,class (:foreground "cyan1" :underline t))))
    `(highlight-symbol-face ((,class (:background "#FFFFA0"))))
    `(hl-line ((,class ,highlight-line)))
+   `(hl-tags-face ((,class (:background "#FEFCAE"))))
    `(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"))))
+   `(html-helper-underline-face ((,class (:foreground "black" :underline t))))
    `(html-tag-face ((,class (:foreground "blue"))))
+   `(ilog-non-change-face ((,class (:height 2.0 :foreground "#6434A3"))))
+   `(ilog-change-face ((,class (:height 2.0 :foreground "#008200"))))
+   `(ilog-echo-face ((,class (:height 2.0 :foreground "#006FE0"))))
+   `(ilog-load-face ((,class (:foreground "#BA36A5"))))
+   `(ilog-message-face ((,class (:foreground "#808080"))))
    `(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#0000CC") :foreground "cornflower blue" :background "LightSteelBlue1"))))
-   `(info-header-node ((,class (:underline t :foreground "orange")))) ;; nodes in header
-   `(info-header-xref ((,class (:underline t :foreground "dodger blue")))) ;; cross references in header
-   `(info-menu-header ((,class (:family "Sans Serif" :height 1.6 :weight bold :underline t :foreground "#00CC00")))) ;; menu titles (headers) -- major topics
+   `(info-header-node ((,class (:foreground "orange" :underline t)))) ;; nodes in header
+   `(info-header-xref ((,class (:foreground "dodger blue" :underline t)))) ;; cross references in header
+   `(info-menu-header ((,class (:family "Sans Serif" :height 1.6 :weight bold :foreground "#00CC00" :underline t)))) ;; 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-node ((,class (:foreground "blue" :underline t)))) ;; node names
    `(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 ((,class (:weight bold :foreground "blue" :underline t)))) ;; unvisited cross-references
    `(info-xref-visited ((,class (:weight bold :foreground "magenta4")))) ;; previously visited cross-references
    `(light-symbol-face ((,class (:background "#FFFFA0"))))
    `(linum ((,class (:foreground "#AFAFAF" :background "white"))))
@@ -401,24 +441,26 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(makefile-targets ((,class (:weight bold :foreground "blue"))))
    `(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"))))
+   `(moccur-current-line-face ((,class (:foreground "black" :background "#FFFFCC"))))
+   `(moccur-face ((,class (:foreground "black" :background "#FFFF99"))))
+   `(next-error ((,class ,volatile-highlight)))
    `(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-delimiter-face ((,class (:foreground "red"))))
-   `(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :background "#DEDEDE" :foreground "#000088"))))
+   `(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :foreground "#000088" :background "#DEDEDE"))))
    `(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-block-count ((,class (:weight bold :foreground "blue"))))
    `(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-current-time ((,class (:foreground "#1662AF" :underline t))))
    `(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"))))
@@ -427,20 +469,20 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(org-agenda-done ((,class (:foreground "#555555" :background "#EEEEEE"))))
    `(org-agenda-filter-category ((,class (:weight bold :foreground "orange"))))
    `(org-agenda-filter-tags ((,class (:weight bold :foreground "orange"))))
-   `(org-agenda-restriction-lock ((,class (:weight bold :foreground "white" :background "orange"))))
+   `(org-agenda-restriction-lock ((,class (:background "#E77D63"))))
    `(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 ((,class ,code-block)))
    `(org-block-background ((,class (:background "#FFFFE0"))))
-   `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
+   `(org-block-begin-line ((,class (:foreground "#555555" :background "#E2E1D5" :underline "#A7A6AA"))))
    `(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-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "white" :background "#777777"))))
    `(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4"))))
    `(org-code ((,class (:foreground "#007300" :background "#EBF5EB"))))
    `(org-column ((,class ,column)))
    `(org-column-title ((,class ,column)))
-   `(org-date ((,class (:underline t :foreground "#00459E"))))
+   `(org-date ((,class (:foreground "#00459E" :underline t))))
    `(org-default ((,class (:foreground "#333333"))))
    `(org-dim ((,class (:foreground "#AAAAAA"))))
    `(org-document-info ((,class (:foreground "#484848"))))
@@ -448,14 +490,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(org-document-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "black"))))
    `(org-done ((,class (:weight bold :box (:line-width 1 :color "#BBBBBB") :foreground "#BBBBBB" :background "#F0F0F0"))))
    `(org-drawer ((,class (:foreground "light sky blue"))))
-   `(org-ellipsis ((,class (:underline "#B0EEB0" :foreground "#00BB00"))))
+   `(org-ellipsis ((,class (:box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0" :underline nil)))) ;; #FFEE62
    `(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
-   `(org-footnote ((,class (:underline t :foreground "#008ED1"))))
+   `(org-footnote ((,class (:foreground "#008ED1" :underline t))))
    `(org-formula ((,class (:foreground "chocolate1"))))
-   `(org-headline-done ((,class (:height 1.0 :weight bold :strike-through "#BEBEBE" :foreground "#C5C5C5"))))
+   `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#999999"))))
    `(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-latex-and-related ((,class ,code-block)))
    `(org-level-1 ((,class ,ol1)))
    `(org-level-2 ((,class ,ol2)))
    `(org-level-3 ((,class ,ol3)))
@@ -475,10 +517,10 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(org-scheduled ((,class (:foreground "#333333"))))
    `(org-scheduled-previously ((,class (:weight bold :foreground "#373737"))))
    `(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
-   `(org-sexp-date ((,class (:foreground "purple"))))
+   `(org-sexp-date ((,class (:foreground "#3774CC"))))
    `(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA"))))
    `(org-table ((,class (:foreground "dark green" :background "#EAFFEA"))))
-   `(org-tag ((,class (:weight normal :slant italic :foreground "#3E6D8E" :background "#E0EAF1"))))
+   `(org-tag ((,class (:weight normal :slant italic :foreground "#80A0BC"))))
    `(org-target ((,class ,link)))
    `(org-time-grid ((,class (:foreground "#CFCFCF"))))
    `(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4"))))
@@ -500,8 +542,8 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(paren-face-match ((,class (:foreground "#E2464C" :background "#FFE182"))))
    `(paren-face-mismatch ((,class (:weight bold :foreground "white" :background "#FF3F3F"))))
    `(paren-face-no-match ((,class (:weight bold :foreground "white" :background "#FF3F3F"))))
-   `(pp^L-highlight ((,class (:strike-through t))))
-   `(recover-this-file ((,class (:background "white" :background "#FF3F3F"))))
+   `(recover-this-file ((,class (:weight bold :background "#FF3F3F"))))
+   `(rng-error ((,class (:weight bold :foreground "red" :background "#FBE3E4"))))
    `(sh-heredoc ((,class (:foreground "blue" :background "#EEF5FE"))))
    `(sh-quoted-exec ((,class (:foreground "#FF1493"))))
    `(shadow ((,class ,shadow)))
@@ -510,13 +552,13 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(shell-output-3-face ((,class (:foreground "purple"))))
    `(shell-output-face ((,class (:foreground "black"))))
    `(shell-prompt-face ((,class (:weight bold :foreground "yellow"))))
-   `(show-paren-match ((,class (:foreground "#E2464C" :background "#FFE182"))))
+   `(show-paren-match ((,class (:foreground "#E2464C" :background "#FFFF00"))))
    `(show-paren-mismatch ((,class (:weight bold :foreground "white" :background "#FF3F3F"))))
    `(speedbar-button-face ((,class (:foreground "green4"))))
    `(speedbar-directory-face ((,class (:foreground "blue4"))))
    `(speedbar-file-face ((,class (:foreground "cyan4"))))
    `(speedbar-highlight-face ((,class ,volatile-highlight)))
-   `(speedbar-selected-face ((,class (:underline t :foreground "red"))))
+   `(speedbar-selected-face ((,class (:foreground "red" :underline t))))
    `(speedbar-tag-face ((,class (:foreground "brown"))))
    `(svn-status-directory-face ((,class ,directory)))
    `(svn-status-filename-face ((,class (:weight bold :foreground "#4183C4"))))
@@ -552,12 +594,12 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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"))))
-   `(w3m-current-anchor ((,class (:weight bold :underline t :foreground "blue"))))
-   `(w3m-form ((,class (:underline t :foreground "tan1"))))
-   `(w3m-form-button-face ((,class (:weight bold :underline t :foreground "gray4" :background "light grey"))))
-   `(w3m-form-button-mouse-face ((,class (:underline t :foreground "light grey" :background "#2B7E2A"))))
-   `(w3m-form-button-pressed-face ((,class (:weight bold :underline t :foreground "gray4" :background "light grey"))))
+   `(w3m-bold ((,class (:weight bold :foreground "black"))))
+   `(w3m-current-anchor ((,class (:weight bold :foreground "blue" :underline t))))
+   `(w3m-form ((,class (:foreground "tan1" :underline t))))
+   `(w3m-form-button-face ((,class (:weight bold :foreground "gray4" :background "light grey" :underline t))))
+   `(w3m-form-button-mouse-face ((,class (:foreground "light grey" :background "#2B7E2A" :underline t))))
+   `(w3m-form-button-pressed-face ((,class (:weight bold :foreground "gray4" :background "light grey" :underline t))))
    `(w3m-header-line-location-content-face ((,class (:foreground "#7F7F7F":background "#F7F7F7"))))
    `(w3m-header-line-location-title-face ((,class (:foreground "#2C55B1" :background "#F7F7F7"))))
    `(w3m-history-current-url-face ((,class (:foreground "lemon chiffon"))))
@@ -586,9 +628,19 @@ Semantic, and Ansi-Color faces are included -- and much more...")
  '(ansi-color-names-vector ["#242424" "#E5786D" "#95E454" "#CAE682"
                             "#8AC6F2" "#333366" "#CCAA8F" "#F6F3E8"]))
 
+;;;###autoload
+(when (and (boundp 'custom-theme-load-path)
+           load-file-name)
+  ;; add theme folder to `custom-theme-load-path' when installing over MELPA
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+
 (provide-theme 'leuven)
 
 ;; Local Variables:
+;; time-stamp-format: "%:y%02m%02d.%02H%02M"
+;; time-stamp-start: "Version: "
+;; time-stamp-end: "$"
 ;; no-byte-compile: t
 ;; End: