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

Fixes: debbugs:16442

2 files changed, 75 insertions, 69 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3849ca413d3..a34f6961a06 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-16  Fabrice Niessen  <fniessen@pirilampo.org>
+
+        * themes/leuven-theme.el: Updates.  (Bug#16442)
+
 2014-01-12  David Engster  <deng@randomsample.de>
 
         * NEWS: Add missing renames to EIEIO section.  Also, no functions
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index a6aa533bc06..7285398e6c9 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -4,7 +4,7 @@
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 ;; URL: https://github.com/fniessen/emacs-leuven-theme
-;; Version: 20130918.1010
+;; Version: 20140113.1205
 ;; Keywords: color theme
 
 ;; This file is part of GNU Emacs.
@@ -46,14 +46,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
       (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 "#FFFFE0"))
-      (code-inline '(:box (:line-width 1 :color "#DDDDDD") :foreground "#000088" :background "#FFFFE0"))
+      (code-inline '(:foreground "#007300" :background "#EBF5EB"))
       (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 '(:foreground "#990099" :background "#FFEEFF"))
       (diff-none '(:foreground "gray33"))
       (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
       (directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
-      (highlight-line '(:background "#FEFCAE")) ;; #F5F5F5 or #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"))
@@ -66,9 +66,9 @@ Semantic, and Ansi-Color faces are included -- and much more...")
       (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 "#ADD6FF")) ;; #CCCCCC
+      (region '(:background "#ADD6FF")) ; #CCCCCC
       (shadow '(:foreground "#7F7F7F"))
-      (string '(:foreground "#FF4700")) ;; #D0372D or #23238E
+      (string '(:foreground "#036A07")) ; #D0372D or #23238E or #20590C
       (subject '(:weight bold :foreground "#CF5D60"))
       (symlink '(:foreground "deep sky blue"))
       (volatile-highlight '(:background "#FBE448"))
@@ -81,22 +81,22 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(bold-italic ((,class (:weight bold :slant italic :foreground "black"))))
    `(italic ((,class (:slant italic :foreground "#1A1A1A"))))
    `(underline ((,class (:underline t))))
-   `(cursor ((,class (:background "#15FF00"))))
+   `(cursor ((,class (:background "#0FB300"))))
 
    ;; Highlighting faces
-   `(fringe ((,class (:foreground "#56B556" :background "#E2F9E2"))))
+   `(fringe ((,class (:foreground "#F7A421" :background "#F2F2F2"))))
    `(highlight ((,class ,volatile-highlight)))
    `(region ((,class ,region)))
-   `(secondary-selection ((,class ,match))) ;; used by Org-mode for highlighting matched entries and keywords
+   `(secondary-selection ((,class ,match))) ; used by Org-mode for highlighting matched entries and keywords
    `(isearch ((,class (:weight bold :foreground "#00AA00" :background "#99FF99"))))
    `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999"))))
    `(lazy-highlight ((,class (:weight bold :foreground "#990099" :background "#FF66FF"))))
    `(trailing-whitespace ((,class (:background "#F6EBFE"))))
+   `(whitespace-hspace ((,class (:foreground "#D2D2D2"))))
+   `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow"))))
    `(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
    `(whitespace-tab ((,class (:foreground "lightgray" :background "beige"))))
-   `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow"))))
    `(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1"))))
-   `(whitespace-hspace ((,class (:background "#CCE8F6"))))
 
    ;; Mode line faces
    `(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8"))))
@@ -110,31 +110,31 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
    `(escape-glyph ((,class (:foreground "#008ED1"))))
    `(error ((,class (:foreground "red"))))
-   `(warning ((,class (:foreground "orange"))))
+   `(warning ((,class (:weight bold :foreground "orange"))))
    `(success ((,class (:foreground "green"))))
 
    ;; Font lock faces
    `(font-lock-builtin-face ((,class (:foreground "#006FE0"))))
-   `(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-comment-delimiter-face ((,class (:foreground "#8D8D84")))) ; #696969
+   `(font-lock-comment-face ((,class (:slant italic :foreground "#8D8D84")))) ; #696969
+   `(font-lock-constant-face ((,class (:foreground "#D0372D"))))
    `(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-function-name-face ((,class (:weight normal :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 "#666666"))))
-   `(font-lock-variable-name-face ((,class (:foreground "#BA36A5")))) ;; #800080
+   `(font-lock-type-face ((,class (:weight normal :foreground "#6434A3"))))
+   `(font-lock-variable-name-face ((,class (:weight normal :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 (:underline t :foreground "#8AC6F2"))))
+   `(link-visited ((,class (:underline t :foreground "#E5786D"))))
    `(button ((,class (:underline t :foreground "#006DAF"))))
-   `(header-line ((,class (:weight bold :foreground "black" :background "#FFFF88" :underline "black" :overline "black"))))
+   `(header-line ((,class (:weight bold :underline "black" :overline "black" :foreground "black" :background "#FFFF88"))))
 
    ;; Gnus faces
    `(gnus-cite-attribution-face ((,class (:foreground "#5050B0"))))
@@ -195,7 +195,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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-summary-selected ((,class (:underline t :foreground "black" :background "#FFD0D0"))))
    `(gnus-x-face ((,class (:foreground "black" :background "white"))))
 
    ;; Message faces
@@ -219,7 +219,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
    `(diff-header ((,class (:foreground "#999999" :background "#EAF2F5"))))
    `(diff-hunk-header ((,class ,diff-hunk-header)))
-   `(diff-index ((,class (:foreground "#4183C4" :background "#EAF2F5")))) ;; my foreground is NOT applied!?
+   `(diff-index ((,class (:foreground "#4183C4" :background "#EAF2F5")))) ; my foreground is NOT applied!?
    `(diff-indicator-added ((,class (:foreground "#008000" :background "#AAFFAA"))))
    `(diff-indicator-changed ((,class (:foreground "black" :background "#AAAAFF"))))
    `(diff-indicator-removed ((,class (:foreground "#A60000" :background "#FFAAAA"))))
@@ -257,10 +257,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(Info-title-2-face ((,class ,ol2)))
    `(Info-title-3-face ((,class ,ol3)))
    `(Info-title-4-face ((,class ,ol4)))
+   `(ace-jump-face-foreground ((,class (:foreground "black" :background "#FBE448"))))
    `(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 (:foreground "#FF6633" :underline t))))
+   `(bbdb-name ((,class (:underline t :foreground "#FF6633"))))
    `(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"))))
@@ -283,17 +284,17 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6"))))
    `(change-log-date-face ((,class (:foreground "purple"))))
    `(change-log-file ((,class (:weight bold :foreground "#4183C4"))))
-   `(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ;; other nick names
-   `(circe-highlight-nick-face ((,class (:foreground "#009300" :background "#F0F0F0")))) ;; messages with my nick cited
+   `(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 ((,class ,code-block)))
-   `(comint-highlight-prompt ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
+   `(comint-highlight-input ((,class (:weight bold :foreground "#0000FF"))))
+   `(comint-highlight-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
    `(compare-windows ((,class (:background "#FFFF00"))))
    `(compilation-error ((,class (:weight bold :foreground "red"))))
-   `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ;; used for grep
+   `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ; used for grep
    `(compilation-line-number ((,class (:weight bold :foreground "#A535AE"))))
    `(compilation-warning ((,class (:weight bold :foreground "orange"))))
    `(css-property ((,class (:foreground "#00AA00"))))
@@ -301,7 +302,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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-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"))))
@@ -311,7 +312,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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 (:foreground "blue1" :underline t))))
+   `(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))))
@@ -375,8 +376,9 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(font-latex-verbatim-face ((,class (:foreground "#000088" :background "#FFFFE0" :inherit nil))))
    `(git-commit-summary-face ((,class (:foreground "#000000"))))
    `(git-commit-comment-face ((,class (:slant italic :foreground "#696969"))))
-   `(helm-action ((,class (:foreground "#335EA8"))))
+   `(helm-action ((,class (:foreground "black"))))
    `(helm-bookmarks-su-face ((,class (:foreground "red"))))
+   `(helm-buffer-process ((,class (:foreground "#008200"))))
    `(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"))))
@@ -388,20 +390,22 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(helm-file-name ((,class (:foreground "blue"))))
    `(helm-gentoo-match-face ((,class (:foreground "red"))))
    `(helm-grep-running ((,class (:weight bold :foreground "white"))))
+   `(helm-grep-lineno ((,class ,shadow)))
    `(helm-isearch-match ((,class (:background "#CCFFCC"))))
    `(helm-match ((,class ,match)))
+   `(helm-moccur-buffer ((,class (:foreground "#0066CC"))))
    `(helm-selection ((,class ,highlight-line)))
    `(helm-selection-line ((,class ,volatile-highlight)))
    `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#2F69BF"))))
    `(helm-visible-mark ((,class ,marked-line)))
-   `(helm-w3m-bookmarks-face ((,class (:foreground "cyan1" :underline t))))
+   `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1"))))
    `(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 (:foreground "black" :underline t))))
+   `(html-helper-underline-face ((,class (:underline t :foreground "black"))))
    `(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"))))
@@ -409,21 +413,21 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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 (: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 (:foreground "blue" :underline t)))) ;; node names
+   `(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 ,ol2))) ; 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 ((,class ,code-inline)))
    `(info-string ((,class ,string)))
    `(info-title-1 ((,class ,ol1)))
-   `(info-xref ((,class (:weight bold :foreground "blue" :underline t)))) ;; unvisited cross-references
-   `(info-xref-visited ((,class (:weight bold :foreground "magenta4")))) ;; previously visited cross-references
+   `(info-xref ((,class (:underline t :foreground "#006DAF")))) ; unvisited cross-references
+   `(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references
    `(light-symbol-face ((,class (:background "#FFFFA0"))))
    `(linum ((,class (:foreground "#AFAFAF" :background "white"))))
    `(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
    `(lui-button-face ((,class ,link)))
-   `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ;; my nickname
+   `(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 ((,class ,vc-branch)))
    `(magit-diff-add ((,class ,diff-added)))
@@ -460,7 +464,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(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 (:foreground "#1662AF" :underline t))))
+   `(org-agenda-current-time ((,class (:underline t :foreground "#1662AF"))))
    `(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"))))
@@ -470,19 +474,20 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(org-agenda-filter-category ((,class (:weight bold :foreground "orange"))))
    `(org-agenda-filter-tags ((,class (:weight bold :foreground "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-agenda-structure ((,class (:height 1.6 :weight bold :box (:line-width 1 :color "#999999") :foreground "#666666" :background "#CCCCCC"))))
+   `(org-agenda-structure ((,class (:height 1.6 :bold nil :foreground "#999999"))))
    `(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 (:foreground "#555555" :background "#E2E1D5" :underline "#A7A6AA"))))
+   `(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 :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-code ((,class ,code-inline)))
    `(org-column ((,class ,column)))
    `(org-column-title ((,class ,column)))
-   `(org-date ((,class (:foreground "#00459E" :underline t))))
+   `(org-date ((,class (:underline t :foreground "#00459E"))))
    `(org-default ((,class (:foreground "#333333"))))
    `(org-dim ((,class (:foreground "#AAAAAA"))))
    `(org-document-info ((,class (:foreground "#484848"))))
@@ -490,9 +495,9 @@ 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 (:box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0" :underline nil)))) ;; #FFEE62
+   `(org-ellipsis ((,class (:underline nil :box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0")))) ; #FFEE62
    `(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
-   `(org-footnote ((,class (:foreground "#008ED1" :underline t))))
+   `(org-footnote ((,class (:underline t :foreground "#008ED1"))))
    `(org-formula ((,class (:foreground "chocolate1"))))
    `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#999999"))))
    `(org-hide ((,class (:foreground "#E2E2E2"))))
@@ -516,11 +521,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0"))))
    `(org-scheduled ((,class (:foreground "#333333"))))
    `(org-scheduled-previously ((,class (:weight bold :foreground "#373737"))))
-   `(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
+   `(org-scheduled-today ((,class (:foreground "#4F4A3D" :background "#FFFABE"))))
    `(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 "#80A0BC"))))
+   `(org-tag ((,class (:weight normal :slant italic :foreground "#9A9FA4" :background "#F3F3F3"))))
    `(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"))))
@@ -554,11 +559,13 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(shell-prompt-face ((,class (:weight bold :foreground "yellow"))))
    `(show-paren-match ((,class (:foreground "#E2464C" :background "#FFFF00"))))
    `(show-paren-mismatch ((,class (:weight bold :foreground "white" :background "#FF3F3F"))))
+   `(sml-modeline-end-face ((,class (:background "#6BADF6")))) ; #335EA8
+   `(sml-modeline-vis-face ((,class (:background "#1979CA"))))
    `(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 (:foreground "red" :underline t))))
+   `(speedbar-selected-face ((,class (:underline t :foreground "red"))))
    `(speedbar-tag-face ((,class (:foreground "brown"))))
    `(svn-status-directory-face ((,class ,directory)))
    `(svn-status-filename-face ((,class (:weight bold :foreground "#4183C4"))))
@@ -595,30 +602,25 @@ Semantic, and Ansi-Color faces are included -- and much more...")
    `(w3m-arrived-anchor ((,class (:foreground "purple1"))))
    `(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green"))))
    `(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-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-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 ((,class ,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"))))
+   `(widget-button ((,class ,link)))
+   `(widget-button-pressed ((,class (:foreground "red"))))
+   `(widget-documentation ((,class (:foreground "green4"))))
+   `(widget-field ((,class (:background "gray85"))))
+   `(widget-inactive ((,class (:foreground "dim gray"))))
+   `(widget-single-line-field ((,class (:background "gray85"))))
    `(yas/field-debug-face ((,class (:background "ivory2"))))
    `(yas/field-highlight-face ((,class (:background "DarkSeaGreen1"))))
    ))