Merge from trunk + rename the event. Not tested yet.

4 files changed, 816 insertions, 25 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 60d4a7aa271..ad0f9e9c7e8 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,25 @@
+2012-12-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * themes/leuven-theme.el: Convert to Unix format.
+
+2012-12-06  Fabrice Niessen  <fniessen@pirilampo.org>
+
+        * themes/leuven-theme.el: New theme.
+
+2012-12-04  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Mention new Tramp method "adb".
+
+2012-11-25  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.4.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.4.
+
+2012-11-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * NEWS: Document Calc changes for Gregorian calendar (Bug#12633).
+
 2012-10-26  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * refcards/orgcard.tex: Fix keybindings about
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index aca5781fe35..4d003378c30 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,68 @@
 Copyright (C) 2001-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in MH-E 8.4
+
+Version 8.4 postpones junk processing and merges in your components
+file when re-editing a draft. A few bugs were also fixed.
+
+** New Features in MH-E 8.4
+
+*** Postpone junk processing
+
+The `J w' (`mh-junk-whitelist') and `J b' (`mh-junk-blacklist')
+commands now mark the message. Like with other marks, this mark can be
+removed with `u' (`mh-undo') and processed with `x'
+(`mh-execute-commands'). Thanks to Ted Phelps (closes SF #2945712).
+
+** New Variables in MH-E 8.4
+
+*** mh-blacklist-msg-hook
+
+Hook run by `J b' (`mh-junk-blacklist') after marking each message for blacklisting.
+
+*** mh-whitelist-msg-hook
+
+Hook run by `J w' (`mh-junk-whitelist') after marking each message for whitelisting.
+
+*** mh-whitelist-preserves-sequences-flag
+
+Non-nil means that sequences are preserved when messages are
+whitelisted.
+
+** New Faces in MH-E 8.4
+
+*** mh-folder-blacklisted
+
+Blacklisted message face.
+
+*** mh-folder-whitelisted
+
+Whitelisted message face.
+
+** Bug Fixes in MH-E 8.4
+
+*** mh-edit-again should add Fcc
+
+More generally, `mh-edit-again' now merges the components file into
+the draft (closes SF #1708292).
+
+*** Loses changes when message column goes from 1 to 2 digits
+
+Call `mh-process-or-undo-commands' before running inc to insure we do
+not lose any pending changes (closes SF #2321115).
+
+*** mh-yank-cur-msg fails in emacs 23
+
+Replace usage of `set-buffer' with `with-current-buffer' (closes SF
+#2830504).
+
+*** Folder pack action (Fp) missing in show mode
+
+Add missing key binding for `mh-show-pack-folder' (closes SF #3466086).
+
+
+
 * Changes in MH-E 8.3.1
 
 This version of MH-E fixes typos in the documentation and is packaged
diff --git a/etc/NEWS b/etc/NEWS
index a03c2e2f638..f04dcea2bde 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -24,14 +24,91 @@ so we will look at it and add it to the manual.
 * Installation Changes in Emacs 24.4
 * Startup Changes in Emacs 24.4
 * Changes in Emacs 24.4
+
++++
+** `eval-defun' on an already defined defcustom calls the :set function,
+if there is one.
+
+** The option `set-mark-default-inactive' has been deleted.
+This unfinished feature was introduced by accident in Emacs 23.1;
+simply disabling Transient Mark mode does the same thing.
+
 * Editing Changes in Emacs 24.4
 
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
+** New macro cl-tagbody in cl-lib.
+** Calc
+
+*** Calc by default now uses the Gregorian calendar for all dates, and
+uses January 1, 1 AD as its day number 1.  Previously Calc used the
+Julian calendar for dates before September 14, 1752, and it used
+December 31, 1 BC as its day number 1; the new scheme is more
+consistent with Calendar's calendrical system and day numbering.
+
+*** The new variable `calc-gregorian-switch' lets you configure the
+date when Calc switches from the Julian to the Gregorian calendar.
+Nil, the default value, means to always use the Gregorian calendar.
+The value (YEAR MONTH DAY) means to start using the Gregorian calendar
+on the given date.
+
+** ERC
+
+*** New option `erc-accidental-paste-threshold-seconds'.
+If set to a number, this can be used to avoid accidentally paste large
+amounts of data into the ERC input.
+
+** Icomplete is a bit more like IDO.
+*** key bindings to navigate through and select the completions.
+*** The icomplete-separator is customizable, and its default has changed.
+*** Removed icomplete-show-key-bindings.
+
+** MH-E has been updated to MH-E version 8.4.
+See MH-E-NEWS for details.
+
+---
+** The unrmail command converts from BABYL to mboxrd rather than mboxo.
+Customize `unrmail-mbox-format' to change this.
+
+---
+** Similarly, customize `rmail-mbox-format' to influence some minor aspects
+of how Rmail displays non-MIME messages.
+
 +++
 ** New function `ses-rename-cell' to give SES cells arbitrary names.
 
+** trace-function was largely rewritten.
+New features include:
+- no prompting for the destination buffer, unless a prefix-arg was used.
+- additionally to prompting for a destination buffer, when a prefix-arg is
+  used, the user can enter a "context", i.e. Lisp expression whose value at the
+  time the function is entered/exited will be printed along with the function
+  name and arguments.  Useful to trace the value of (current-buffer) or
+  (point) when the function is invoked.
+
+** New command `delete-duplicate-lines' has two types of operation:
+when its arg ADJACENT is non-nil (when called interactively with C-u C-u)
+it works like the utility `uniq'.  Otherwise by default it deletes
+duplicate lines everywhere in the region without regard to adjacency.
+
+** Tramp
++++
+*** New connection method "adb", which allows to access Android
+devices by the Android Debug Bridge.  The variable `tramp-adb-sdk-dir'
+must be set to the Android SDK installation directory.
+
+** Woman
+
+*** The commands `woman-default-faces' and `woman-monochrome-faces'
+are obsolete.  Customize the `woman-* faces instead.
+
+** Obsolete packages:
+
+*** longlines.el is obsolete; use visual-line-mode instead.
+
+*** terminal.el is obsolete; use term.el instead.
+
 
 * New Modes and Packages in Emacs 24.4
 ** New nadvice.el package offering lighter-weight advice facilities.
@@ -43,6 +120,10 @@ It is layered as:
 
 * Incompatible Lisp Changes in Emacs 24.4
 
+** nil and "unbound" are indistinguishable in symbol-function.
+`symbol-function' never signals `void-function' any more.
+`fboundp' returns non-nil if the symbol was `fset' to nil.
+
 ** `defadvice' does not honor the `freeze' flag and cannot advise
 special-forms any more.
 
@@ -52,6 +133,22 @@ spurious warnings about an unused var.
 
 * Lisp changes in Emacs 24.4
 
+** Support for filesystem notifications.
+Emacs now supports notifications of filesystem changes, such as
+creation, modification, and deletion of files.  This requires the
+'inotify' API on GNU/Linux systems.
+
+** Face changes
+
+*** The `face-spec-set' is now analogous to `setq' for face specs.
+Its third arg now accepts values specifying exactly which face spec to
+set (defface, custom, or user spec), and it directly sets the relevant
+property using the supplied face spec.
+
+*** Face specs set via Custom themes now replace the `defface' spec
+rather than inheriting from it (as do face specs set via Customize).
+
+** time-to-seconds is not obsolete any more.
 ** New function special-form-p.
 ** Docstrings can be made dynamic by adding a `dynamic-docstring-function'
 text-property on the first char.
@@ -61,6 +158,11 @@ and redirect them to your own function instead of `fset'.
 
 * Changes in Emacs 24.4 on non-free operating systems
 
++++
+** The "generate a backtrace on fatal error" feature now works on MS Windows.
+The backtrace is written to the 'emacs_backtrace.txt' file in the
+directory where Emacs was running.
+
 
 * Installation Changes in Emacs 24.3
 
@@ -210,9 +312,7 @@ This minor mode replaces `toggle-read-only', which is now obsolete.
 ** Emacs now generates backtraces on fatal errors.
 On encountering a fatal error, Emacs now outputs a textual description
 of the fatal signal, and a short backtrace on platforms like glibc
-that support backtraces, and also on MS-Windows.  On Windows, the
-backtrace is also written to the 'emacs_backtrace.txt' file in the
-directory where Emacs was running.
+that support backtraces.
 
 ---
 ** If your Emacs was built from a bzr checkout, the new variable
@@ -745,6 +845,10 @@ that substring is inserted literally even if the LITERAL arg is
 non-nil, instead of causing an error to be signaled.
 
 +++
+** `select-window' now always makes the window's buffer current.
+It does so even if the window was selected before.
+
++++
 ** Docstrings starting with `*' no longer indicate user options.
 Only variables defined using `defcustom' are considered user options.
 The function `user-variable-p' is now an obsolete alias for
@@ -752,9 +856,9 @@ The function `user-variable-p' is now an obsolete alias for
 
 +++
 ** The return values of `defalias', `defun' and `defmacro' have changed,
-and are now undefined.  For backwards compatibility, defun and
-defmacro currently return the name of the newly defined function/macro
-but this should not be relied upon.
+and are now undefined.  For backwards compatibility, `defun' and
+`defmacro' currently return the name of the newly defined
+function/macro, but this should not be relied upon.
 
 ---
 ** `face-spec-set' no longer sets frame-specific attributes when the
@@ -830,7 +934,7 @@ are deprecated and will be removed eventually.
 ** New sampling-based Elisp profiler.
 Try M-x profiler-start, do some work, and then call M-x profiler-report.
 When finished, use M-x profiler-stop.  The sampling rate can be based on
-CPU time (only supported on some systems) or memory allocations.
+CPU time or memory allocations.
 
 +++
 ** CL-style generalized variables are now in core Elisp.
@@ -855,15 +959,10 @@ More commands use `read-regexp' now to read their regexp arguments.
 *** New function `completion-table-with-quoting' to handle completion
 in the presence of quoting, such as file completion in shell buffers.
 
++++
 *** New function `completion-table-subvert' to use an existing completion
 table, but with a different prefix.
 
-FIXME?
-*** There are several other completion-table- functions that never got
-added to NEWS or documented: completion-table-case-fold (24.1),
-completion-table-with-context (23,1), completion-table-with-terminator (23.1),
-completion-table-with-predicate (23.1), completion-table-in-turn (23.1)
-
 ** Debugger changes
 
 +++
@@ -889,14 +988,19 @@ now accept a third argument to avoid choosing the selected window.
 +++
 *** Additional values recognized for option `window-combination-limit'.
 
-*** New macro `with-temp-buffer-window'.
++++
+*** New macro `with-temp-buffer-window', similar to
+`with-output-to-temp-buffer'.
 
+---
 *** `temp-buffer-resize-mode' no longer resizes windows that have been
 reused.
 
++++
 *** New command `fit-frame-to-buffer' adjusts the frame height to
 fit the contents.
 
++++
 *** The command `fit-window-to-buffer' can adjust the frame height
 if the new option `fit-frame-to-buffer' is non-nil.
 
@@ -906,11 +1010,11 @@ window's point when switching buffers.
 +++
 *** New display action functions `display-buffer-below-selected',
 and `display-buffer-in-previous-window'.
-
++++
 *** New display action alist entry `inhibit-switch-frame', if non-nil,
 tells display action functions to avoid changing which frame is
 selected.
-
++++
 *** New display action alist entry `pop-up-frame-parameters', if
 non-nil, specifies frame parameters to give any newly-created frame.
 +++
@@ -966,13 +1070,14 @@ Previously, they returned NaNs on some platforms but signaled errors
 on others.  The affected functions are acos, asin, tan, exp, expt,
 log, log10, sqrt, and mod.
 
-** Interpreted files are eagerly macro-expanded during load.
++++
+** Emacs tries to macroexpand interpreted (non-compiled) files during load.
 This can significantly speed up execution of non-byte-compiled code,
-but can also bump into harmless and previously unnoticed cyclic
-dependencies.  These should not be fatal: they will simply cause the
-macro-calls to be left for later expansion (as before), but will also
-result in a warning ("Eager macro-expansion skipped due to cycle")
-describing the cycle.
+but can also bump into previously unnoticed cyclic dependencies.
+These are generally harmless: they will simply cause the macro calls
+to be left for later expansion (as before), but will result in a
+warning ("Eager macro-expansion skipped due to cycle") describing the cycle.
+You may wish to restructure your code so this does not happen.
 
 ** Miscellaneous new functions:
 +++
@@ -1000,6 +1105,12 @@ takes precedence over most other maps for a short while (normally one key).
 +++
 ** New macros `setq-local' and `defvar-local'.
 
+** Changes to special forms and macros
++++
+*** `defun' and `defmacro' are now macros rather than special forms
++++
+*** `kbd' is now a function rather than a macro.
+
 +++
 ** New fringe bitmap `exclamation-mark'.
 
@@ -1030,9 +1141,10 @@ takes precedence over most other maps for a short while (normally one key).
 Pass --with-w32 to configure.  The default remains the X11 interface.
 
 ** Two new functions are available in Cygwin builds:
-`cygwin-convert-path-from-windows' and `cygwin-convert-path-to-windows'.
-These functions allow Lisp code to access the Cygwin file-name mapping
-machinery to convert between Cygwin and Windows-native file names.
+`cygwin-convert-file-name-from-windows' and
+`cygwin-convert-file-name-to-windows'.  These functions allow Lisp
+code to access the Cygwin file-name mapping machinery to convert
+between Cygwin and Windows-native file and directory names.
 
 ** When invoked with the -nw switch to run on the Windows text-mode terminal,
 Emacs now supports mouse highlight, help-echo (in the echo area), and
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
new file mode 100644
index 00000000000..af1b808c0ec
--- /dev/null
+++ b/etc/themes/leuven-theme.el
@@ -0,0 +1,595 @@
+;;; leuven-theme.el --- Emacs custom theme
+
+;; Copyright (C) 2003-2012 Free Software Foundation, Inc.
+;; Time-stamp: <2012-12-05 Wed 10:47>
+
+;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(deftheme leuven
+  "Face colors with a light background.
+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-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-none '(:foreground "gray33"))
+      (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
+      (directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
+      (highlight-line '(:inverse-video t))
+      (link '(:underline t :foreground "#006DAF"))
+      (mail-header-name '(:weight bold :foreground "black"))
+      (marked-line '(:weight bold :foreground "white" :background "red"))
+      (match '(:background "#FFFF99"))
+      (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"))
+      (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 "#D2D9E0"))
+      (shadow '(:foreground "#7F7F7F"))
+      (string '(:foreground "#008000"))
+      (subject '(:weight bold :foreground "#CF5D60"))
+      (symlink '(:foreground "deep sky blue"))
+      (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA")))
+
+  (custom-theme-set-faces
+   'leuven
+   `(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"))))
+   ;; 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
+   `(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"))))
+   ;; 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"))))
+   `(escape-glyph ((,class (:foreground "#008ED1"))))
+   `(error ((,class (:foreground "red"))))
+   `(warning ((,class (:foreground "orange"))))
+   `(success ((,class (:foreground "green"))))
+   ;; Font lock faces
+   `(font-lock-builtin-face ((,class (:foreground "#FF5803"))))
+   `(font-lock-comment-delimiter-face ((,class (:foreground "#EE0000"))))
+   `(font-lock-comment-face ((,class (:slant italic :foreground "#EE0000"))))
+   `(font-lock-constant-face ((,class (:foreground "#009944"))))
+   `(font-lock-doc-face ((,class (:foreground "#BA2121"))))
+   `(font-lock-doc-string-face ((,class (:foreground "#63639C"))))
+   `(font-lock-function-name-face ((,class (:foreground "#1A50B8"))))
+   `(font-lock-keyword-face ((,class (:bold t :foreground "#A535AE"))))
+   `(font-lock-preprocessor-face ((,class (:bold t :foreground "#A3A3A3"))))
+   `(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-type-face ((,class (:foreground "#1B781F"))))
+   `(font-lock-variable-name-face ((,class (:foreground "#2E91AF"))))
+   `(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))))
+   `(button ((,class (:underline t :foreground "#006DAF"))))
+   `(header-line ((,class (:weight bold :underline "black" :overline "black" :foreground "black" :background "#FFFF88"))))
+   ;; Gnus faces
+   `(gnus-group-news-1-empty ((,class (:foreground "#5050B0"))))
+   `(gnus-group-news-1 ((,class (:weight bold :foreground "#FF50B0"))))
+   `(gnus-group-news-2-empty ((,class (:foreground "#660066"))))
+   `(gnus-group-news-2 ((,class (:weight bold :foreground "#FF0066"))))
+   `(gnus-group-news-3-empty ((,class (:foreground "#808080"))))
+   `(gnus-group-news-3 ((,class (:weight bold :foreground "black"))))
+   `(gnus-group-news-4-empty ((,class (:foreground "#990000"))))
+   `(gnus-group-news-4 ((,class (:weight bold :foreground "#FF0000"))))
+   `(gnus-group-news-5-empty ((,class (:foreground "#000099"))))
+   `(gnus-group-news-5 ((,class (:weight bold :foreground "#FF0099"))))
+   `(gnus-group-news-6-empty ((,class (:foreground "#808080"))))
+   `(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 ((t ,cancel)))
+   `(gnus-group-mail-low ((t ,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-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
+   ;; Message faces
+   `(message-header-name ((t ,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-to ((,class (:family "Sans Serif" :foreground "blue"))))
+   `(message-cited-text ((,class (:foreground "#5050B0"))))
+   `(message-separator ((,class (:family "Sans Serif" :weight bold :foreground "red"))))
+   `(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
+   `(message-header-xheader ((,class (:foreground "red"))))
+   `(message-mml ((,class (:foreground "forest green"))))
+   ;; Diff
+   `(diff-added ((t ,diff-added)))
+   `(diff-changed ((,class (:foreground "blue" :background "#DDDDFF"))))
+   `(diff-context ((t ,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-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-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)))
+   ;; 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"))))
+   `(ediff-current-diff-C ((,class (:foreground "black" :background "cyan"))))
+   `(ediff-even-diff-A ((,class (:foreground "black" :background "light grey"))))
+   `(ediff-even-diff-B ((,class (:foreground "black" :background "light grey"))))
+   `(ediff-fine-diff-A ((,class (:foreground "#A60000" :background "#FFAAAA"))))
+   `(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"))))
+   `(flyspell-incorrect ((,class (:underline "red"))))
+   ;; ;; Semantic faces
+   ;; `(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)))
+   `(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"))))
+   `(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-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"))))
+   `(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
+   `(circe-highlight-nick-face ((,class (:foreground "#009300" :background "#F0F0F0")))) ;; messages with my nick cited
+   `(circe-my-message-face ((,class (:foreground "#8B8B8B" :background "#F0F0F0"))))
+   `(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-prompt ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
+   `(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-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-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-invalid ((,class (:foreground "yellow" :background "red"))))
+   `(custom-link ((,class (:underline t :foreground "blue1"))))
+   `(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-variable-button ((,class (:weight bold :underline t))))
+   `(custom-variable-tag ((,class (:bold t :family "Sans Serif" :foreground "blue1" :weight bold :height 1.2))))
+   `(diary-face ((,class (:foreground "#87C9FC"))))
+   `(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-doc ((,class (:foreground "black"))))
+   `(dircolors-face-dos ((,class (:foreground "green3"))))
+   `(dircolors-face-emacs ((,class (:foreground "black"))))
+   `(dircolors-face-exec ((,class (:foreground "green3"))))
+   `(dircolors-face-html ((,class (:foreground "black"))))
+   `(dircolors-face-img ((,class (:foreground "black"))))
+   `(dircolors-face-lang ((,class (:foreground "black"))))
+   `(dircolors-face-lang-interface ((,class (:foreground "black"))))
+   `(dircolors-face-make ((,class (:foreground "black"))))
+   `(dircolors-face-objet ((,class (:foreground "black"))))
+   `(dircolors-face-package ((,class (:foreground "red"))))
+   `(dircolors-face-paddb ((,class (:foreground "black"))))
+   `(dircolors-face-ps ((,class (:foreground "black"))))
+   `(dircolors-face-sound ((,class (:foreground "black"))))
+   `(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-ignored ((,class (:strike-through t :foreground "red"))))
+   `(dired-mark ((t ,marked-line)))
+   `(dired-marked ((t ,marked-line)))
+   `(dired-symlink ((t ,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-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-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)))
+   `(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-sedate-face ((,class (:foreground "#FF5803"))))
+   `(font-latex-string-face ((,class (:bold t :foreground "#0066FF"))))
+   `(font-latex-verbatim-face ((,class (:foreground "tan1"))))
+   `(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 ((t ,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"))))
+   `(helm-action ((,class (:foreground "#335EA8"))))
+   `(helm-bookmarks-su-face ((,class (:foreground "red"))))
+   `(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-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-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-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#666699"))))
+   `(helm-visible-mark ((t ,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"))))
+   `(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-tag-face ((,class (:foreground "blue"))))
+   `(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-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-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-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-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-header ((,class (:foreground "white" :background "#FF4040"))))
+   `(magit-item-highlight ((,class (:background "#EAF2F5"))))
+   `(magit-item-mark ((t ,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)))
+   `(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-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-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-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"))))
+   `(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-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-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-date ((,class (:underline t :foreground "#00459E"))))
+   `(org-default ((,class (:foreground "#333333"))))
+   `(org-dim ((,class (:foreground "#AAAAAA"))))
+   `(org-document-info ((,class (:foreground "#484848"))))
+   `(org-document-info-keyword ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
+   `(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-example ((,class (:foreground "blue" :background "#EAFFEA"))))
+   `(org-footnote ((,class (:underline t :foreground "#008ED1"))))
+   `(org-formula ((,class (:foreground "chocolate1"))))
+   `(org-headline-done ((,class (:height 1.0 :weight bold :strike-through "#BEBEBE" :foreground "#C5C5C5"))))
+   `(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-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-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-previously ((,class (:weight bold :foreground "#373737"))))
+   `(org-scheduled-today ((,class (:foreground "black" :background "#FFFFCB"))))
+   `(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-target ((,class (:underline t))))
+   `(org-time-grid ((,class (:foreground "#6D6D6D"))))
+   `(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)))
+   `(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"))))
+   `(paren-face-match ((,class (:foreground "white" :background "#FF3F3F"))))
+   `(paren-face-mismatch ((,class (:weight bold :foreground "white" :background "purple"))))
+   `(paren-face-no-match ((,class (:weight bold :foreground "white" :background "purple"))))
+   `(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)))
+   `(shell-option-face ((,class (:foreground "forest green"))))
+   `(shell-output-2-face ((,class (:foreground "blue"))))
+   `(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 "white" :background "#FF3F3F"))))
+   `(show-paren-mismatch ((,class (:weight bold :foreground "white" :background "purple"))))
+   `(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-selected-face ((,class (:underline t :foreground "red"))))
+   `(speedbar-tag-face ((,class (:foreground "brown"))))
+   `(svn-status-directory-face ((t ,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-popup-face ((,class (:weight bold :foreground "green3"))))
+   `(svn-status-switched-face ((,class (:slant italic :foreground "gray55"))))
+   `(svn-status-symlink-face  ((t ,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"))))
+   `(tooltip ((,class (:foreground "black" :background "light yellow"))))
+   `(trailing-whitespace ((,class (:background "#F6EBFE"))))
+   `(traverse-match-face ((,class (:weight bold :foreground "blue violet"))))
+   `(vc-annotate-face-3F3FFF ((,class (:foreground "#3F3FFF" :background "black"))))
+   `(vc-annotate-face-3F6CFF ((,class (:foreground "#3F3FFF" :background "black"))))
+   `(vc-annotate-face-3F99FF ((,class (:foreground "#3F99FF" :background "black"))))
+   `(vc-annotate-face-3FC6FF ((,class (:foreground "#3F99FF" :background "black"))))
+   `(vc-annotate-face-3FF3FF ((,class (:foreground "#3FF3FF" :background "black"))))
+   `(vc-annotate-face-3FFF56 ((,class (:foreground "#4BFF4B" :background "black"))))
+   `(vc-annotate-face-3FFF83 ((,class (:foreground "#3FFFB0" :background "black"))))
+   `(vc-annotate-face-3FFFB0 ((,class (:foreground "#3FFFB0" :background "black"))))
+   `(vc-annotate-face-3FFFDD ((,class (:foreground "#3FF3FF" :background "black"))))
+   `(vc-annotate-face-56FF3F ((,class (:foreground "#4BFF4B" :background "black"))))
+   `(vc-annotate-face-83FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
+   `(vc-annotate-face-B0FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
+   `(vc-annotate-face-DDFF3F ((,class (:foreground "#FFF33F" :background "black"))))
+   `(vc-annotate-face-FF3F3F ((,class (:foreground "#FF3F3F" :background "black"))))
+   `(vc-annotate-face-FF6C3F ((,class (:foreground "#FF3F3F" :background "black"))))
+   `(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-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-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"))))
+   `(w3m-image-face ((,class (:weight bold :foreground "DarkSeaGreen2"))))
+   `(w3m-link-numbering ((,class (:foreground "#B4C7EB")))) ;; mouseless browsing
+   `(w3m-strike-through-face ((,class (:strike-through t))))
+   `(w3m-underline-face ((,class (:underline t))))
+   `(which-func ((,class (:weight bold :foreground "white"))))
+   `(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-trailing ((,class (:weight bold :foreground "yellow" :background "red1"))))
+   `(widget-button-face ((t ,link)))
+   `(widget-button-pressed-face ((,class (:foreground "red"))))
+   `(widget-documentation-face ((,class (:foreground "green4"))))
+   `(widget-field-face ((,class (:background "gray85"))))
+   `(widget-inactive-face ((,class (:foreground "dim gray"))))
+   `(widget-single-line-field-face ((,class (:background "gray85"))))
+   `(yas/field-debug-face ((,class (:background "ivory2"))))
+   `(yas/field-highlight-face ((,class (:background "DarkSeaGreen1"))))
+   ))
+
+(custom-theme-set-variables
+ 'leuven
+ '(ansi-color-names-vector ["#242424" "#e5786d" "#95e454" "#cae682"
+                            "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"]))
+
+(provide-theme 'leuven)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; leuven-theme.el ends here