[elpa] externals/ef-themes 8057325b56: Add date mappings (WORK-IN-PROGRESS)

[ELPA Syncer]

branch: externals/ef-themes
commit 8057325b56bd268f0bc68a7949ecea63045b39f0
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Add date mappings (WORK-IN-PROGRESS)
    
    The idea is to expand the palette to make semantic colour mappings
    more "semantic" and to allow users more freedom to override what they
    want.
---
 ef-autumn-theme.el             | 14 ++++++++++--
 ef-bio-theme.el                | 14 ++++++++++--
 ef-cherie-theme.el             | 14 ++++++++++--
 ef-cyprus-theme.el             | 14 ++++++++++--
 ef-dark-theme.el               | 14 ++++++++++--
 ef-day-theme.el                | 14 ++++++++++--
 ef-deuteranopia-dark-theme.el  | 14 ++++++++++--
 ef-deuteranopia-light-theme.el | 14 ++++++++++--
 ef-duo-dark-theme.el           | 14 ++++++++++--
 ef-duo-light-theme.el          | 14 ++++++++++--
 ef-frost-theme.el              | 14 ++++++++++--
 ef-light-theme.el              | 14 ++++++++++--
 ef-night-theme.el              | 14 ++++++++++--
 ef-spring-theme.el             | 14 ++++++++++--
 ef-summer-theme.el             | 14 ++++++++++--
 ef-themes.el                   | 50 +++++++++++++++++++++---------------------
 ef-trio-dark-theme.el          | 14 ++++++++++--
 ef-trio-light-theme.el         | 14 ++++++++++--
 ef-tritanopia-dark-theme.el    | 14 ++++++++++--
 ef-tritanopia-light-theme.el   | 14 ++++++++++--
 ef-winter-theme.el             | 14 ++++++++++--
 21 files changed, 265 insertions(+), 65 deletions(-)

diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index 4c899550c0..c65b5dc529 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -159,8 +159,6 @@
 
       (link yellow)
       (link-alt cyan-cooler)
-      (date yellow-cooler)
-      (weekend red) ; for M-x calendar and Org agenda
       (name green-warmer)
       (keybind red-warmer)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape green-cooler) ; compare with `string'
       (rx-construct magenta-cooler)
 
+;;;; Date mappings
+
+      (date-common yellow-cooler)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday cyan-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 green-cooler)
       (accent-1 yellow-warmer)
       (accent-2 cyan-cooler)
diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index 45201f5400..b0e331b271 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -159,8 +159,6 @@
 
       (link green-cooler)
       (link-alt cyan-cooler)
-      (date cyan-cooler)
-      (weekend magenta) ; for M-x calendar and Org agenda
       (name green)
       (keybind green)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape yellow-cooler) ; compare with `string'
       (rx-construct green)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red-cooler)
+      (date-event fg-alt)
+      (date-holiday magenta-warmer)
+      (date-now fg-main)
+      (date-scheduled yellow-cooler)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 green-cooler)
       (accent-1 blue-warmer)
       (accent-2 magenta-warmer)
diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el
index caafca9bb3..f9f15dfb5b 100644
--- a/ef-cherie-theme.el
+++ b/ef-cherie-theme.el
@@ -159,8 +159,6 @@
 
       (link magenta-cooler)
       (link-alt yellow)
-      (date magenta)
-      (weekend red) ; for M-x calendar and Org agenda
       (name yellow-cooler)
       (keybind yellow-warmer)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape cyan-warmer) ; compare with `string'
       (rx-construct red)
 
+;;;; Date mappings
+
+      (date-common magenta)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday blue-warmer)
+      (date-now fg-main)
+      (date-scheduled yellow-warmer)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 magenta-warmer)
       (accent-1 yellow)
       (accent-2 blue-warmer)
diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el
index 6ea146012c..9386f67cce 100644
--- a/ef-cyprus-theme.el
+++ b/ef-cyprus-theme.el
@@ -159,8 +159,6 @@
 
       (link yellow)
       (link-alt cyan)
-      (date yellow-cooler)
-      (weekend red) ; for M-x calendar and Org agenda
       (name green-warmer)
       (keybind red)
       (identifier green-faint)
@@ -180,6 +178,18 @@
       (rx-escape magenta-cooler) ; compare with `string'
       (rx-construct cyan-cooler)
 
+;;;; Date mappings
+
+      (date-common yellow-cooler)
+      (date-deadline red-cooler)
+      (date-event fg-alt)
+      (date-holiday cyan-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 green)
       (accent-1 red-cooler)
       (accent-2 cyan-cooler)
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index ec4efb9cb1..ea2afddd4d 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -159,8 +159,6 @@
 
       (link cyan)
       (link-alt magenta)
-      (date green-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name blue-warmer)
       (keybind blue-cooler)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape green-warmer) ; compare with `string'
       (rx-construct red)
 
+;;;; Date mappings
+
+      (date-common green-cooler)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday green-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 blue)
       (accent-1 magenta-warmer)
       (accent-2 green-cooler)
diff --git a/ef-day-theme.el b/ef-day-theme.el
index dd580c8eb2..f15395bd3d 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -159,8 +159,6 @@
 
       (link cyan-warmer)
       (link-alt green-warmer)
-      (date cyan-cooler)
-      (weekend red) ; for M-x calendar and Org agenda
       (name yellow)
       (keybind red-warmer)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape blue) ; compare with `string'
       (rx-construct magenta-warmer)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red)
+      (date-event fg-alt)
+      (date-holiday yellow)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 red)
       (accent-1 green-cooler)
       (accent-2 yellow)
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index 3dbf7a44eb..a8a143d390 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -162,8 +162,6 @@
 
       (link blue)
       (link-alt yellow-cooler)
-      (date yellow-cooler)
-      (weekend blue-faint) ; for M-x calendar and Org agenda
       (name blue-warmer)
       (keybind yellow-warmer)
       (identifier cyan-faint)
@@ -183,6 +181,18 @@
       (rx-escape yellow-faint) ; compare with `string'
       (rx-construct yellow-warmer)
 
+;;;; Date mappings
+
+      (date-common yellow-cooler)
+      (date-deadline yellow-warmer)
+      (date-event fg-alt)
+      (date-holiday cyan-warmer)
+      (date-now fg-main)
+      (date-scheduled yellow-cooler)
+      (date-weekday cyan)
+      (date-weekend magenta-faint)
+
+
       (accent-0 blue-cooler)
       (accent-1 yellow-warmer)
       (accent-2 cyan-warmer)
diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el
index 41f27fe468..8369e73071 100644
--- a/ef-deuteranopia-light-theme.el
+++ b/ef-deuteranopia-light-theme.el
@@ -162,8 +162,6 @@
 
       (link blue)
       (link-alt yellow-cooler)
-      (date yellow-cooler)
-      (weekend blue-faint) ; for M-x calendar and Org agenda
       (name blue-warmer)
       (keybind yellow-warmer)
       (identifier cyan-faint)
@@ -183,6 +181,18 @@
       (rx-escape cyan-faint) ; compare with `string'
       (rx-construct blue-warmer)
 
+;;;; Date mappings
+
+      (date-common yellow-cooler)
+      (date-deadline yellow-warmer)
+      (date-event fg-alt)
+      (date-holiday cyan)
+      (date-now fg-main)
+      (date-scheduled yellow-cooler)
+      (date-weekday cyan)
+      (date-weekend magenta-faint)
+
+
       (accent-0 blue-cooler)
       (accent-1 yellow-warmer)
       (accent-2 cyan)
diff --git a/ef-duo-dark-theme.el b/ef-duo-dark-theme.el
index ea9ac178a9..6530468622 100644
--- a/ef-duo-dark-theme.el
+++ b/ef-duo-dark-theme.el
@@ -162,8 +162,6 @@
 
       (link cyan-warmer)
       (link-alt green-cooler)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name blue)
       (keybind blue-cooler)
       (identifier red-faint)
@@ -183,6 +181,18 @@
       (rx-escape magenta-cooler) ; compare with `string'
       (rx-construct blue)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red)
+      (date-event fg-alt)
+      (date-holiday green-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 blue-warmer)
       (accent-1 yellow-warmer)
       (accent-2 green-cooler)
diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el
index 1c7f14e6d8..624856cd8b 100644
--- a/ef-duo-light-theme.el
+++ b/ef-duo-light-theme.el
@@ -162,8 +162,6 @@
 
       (link cyan)
       (link-alt green-cooler)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name blue)
       (keybind blue-cooler)
       (identifier red-faint)
@@ -183,6 +181,18 @@
       (rx-escape cyan) ; compare with `string'
       (rx-construct red-warmer)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red)
+      (date-event fg-alt)
+      (date-holiday green-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 blue-warmer)
       (accent-1 yellow-warmer)
       (accent-2 green-cooler)
diff --git a/ef-frost-theme.el b/ef-frost-theme.el
index 9bda7a4bda..d86b36c413 100644
--- a/ef-frost-theme.el
+++ b/ef-frost-theme.el
@@ -159,8 +159,6 @@
 
       (link cyan)
       (link-alt magenta)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name cyan-warmer)
       (keybind blue-cooler)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape yellow-cooler) ; compare with `string'
       (rx-construct red-cooler)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red)
+      (date-event fg-alt)
+      (date-holiday magenta-warmer)
+      (date-now fg-main)
+      (date-scheduled yellow-cooler)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 blue-warmer)
       (accent-1 green-cooler)
       (accent-2 magenta-warmer)
diff --git a/ef-light-theme.el b/ef-light-theme.el
index 79da10461e..2dd1d440b6 100644
--- a/ef-light-theme.el
+++ b/ef-light-theme.el
@@ -159,8 +159,6 @@
 
       (link blue)
       (link-alt magenta)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name magenta-cooler)
       (keybind blue-cooler)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape green-cooler) ; compare with `string'
       (rx-construct magenta)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red)
+      (date-event fg-alt)
+      (date-holiday green-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 blue-warmer)
       (accent-1 magenta-warmer)
       (accent-2 green-cooler)
diff --git a/ef-night-theme.el b/ef-night-theme.el
index 1541304f59..8c17016755 100644
--- a/ef-night-theme.el
+++ b/ef-night-theme.el
@@ -159,8 +159,6 @@
 
       (link cyan-warmer)
       (link-alt magenta)
-      (date cyan)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name blue-warmer)
       (keybind green-cooler)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape green) ; compare with `string'
       (rx-construct magenta-warmer)
 
+;;;; Date mappings
+
+      (date-common cyan)
+      (date-deadline red)
+      (date-event fg-alt)
+      (date-holiday cyan-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 blue-cooler)
       (accent-1 magenta-warmer)
       (accent-2 cyan-cooler)
diff --git a/ef-spring-theme.el b/ef-spring-theme.el
index ec97726cbd..6bc55adc9e 100644
--- a/ef-spring-theme.el
+++ b/ef-spring-theme.el
@@ -159,8 +159,6 @@
 
       (link cyan-cooler)
       (link-alt yellow-cooler)
-      (date cyan)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name green-cooler)
       (keybind magenta-warmer)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape cyan) ; compare with `string'
       (rx-construct magenta-warmer)
 
+;;;; Date mappings
+
+      (date-common cyan)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday blue)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 green)
       (accent-1 red-cooler)
       (accent-2 blue)
diff --git a/ef-summer-theme.el b/ef-summer-theme.el
index afc7efa611..303c6e5760 100644
--- a/ef-summer-theme.el
+++ b/ef-summer-theme.el
@@ -159,8 +159,6 @@
 
       (link blue)
       (link-alt green-cooler)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name magenta-warmer)
       (keybind red-cooler)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape cyan-cooler) ; compare with `string'
       (rx-construct red-cooler)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday cyan-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 magenta-cooler)
       (accent-1 yellow)
       (accent-2 cyan-cooler)
diff --git a/ef-themes.el b/ef-themes.el
index 2ebecb0340..44c5db8d01 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -944,12 +944,12 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
 ;;;; calendar and diary
     `(calendar-month-header ((,c :inherit bold)))
     `(calendar-today ((,c :inherit bold :underline t)))
-    `(calendar-weekday-header ((,c :foreground ,date)))
-    `(calendar-weekend-header ((,c :foreground ,weekend)))
+    `(calendar-weekday-header ((,c :foreground ,date-weekday)))
+    `(calendar-weekend-header ((,c :foreground ,date-weekend)))
     `(diary ((,c :background ,bg-dim :foreground ,accent-0)))
     `(diary-anniversary ((,c :foreground ,accent-1)))
-    `(diary-time ((,c :foreground ,date)))
-    `(holiday ((,c :background ,bg-dim :foreground ,accent-2)))
+    `(diary-time ((,c :foreground ,date-common)))
+    `(holiday ((,c :background ,bg-dim :foreground ,date-holiday)))
 ;;;; cider
     `(cider-deprecated-face ((,c :background ,bg-warning :foreground 
,warning)))
     `(cider-enlightened-face ((,c :box ,warning)))
@@ -965,7 +965,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
 ;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log')
     `(change-log-acknowledgment ((,c :foreground ,identifier)))
     `(change-log-conditionals ((,c :inherit error)))
-    `(change-log-date ((,c :foreground ,date)))
+    `(change-log-date ((,c :foreground ,date-common)))
     `(change-log-email ((,c :foreground ,fg-alt)))
     `(change-log-file ((,c :inherit bold)))
     `(change-log-function ((,c :inherit warning)))
@@ -1047,7 +1047,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(dashboard-heading ((,c :foreground ,name)))
     `(dashboard-items-face (( ))) ; use the underlying style of all-the-icons
 ;;;; denote
-    `(denote-faces-date ((,c :foreground ,date)))
+    `(denote-faces-date ((,c :foreground ,date-common)))
     `(denote-faces-keywords ((,c :foreground ,name)))
 ;;;; dictionary
     `(dictionary-button-face ((,c :inherit bold)))
@@ -1103,7 +1103,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(diredfl-autofile-name ((,c :background ,bg-alt)))
     `(diredfl-compressed-file-name ((,c :foreground ,yellow-cooler)))
     `(diredfl-compressed-file-suffix ((,c :foreground ,red)))
-    `(diredfl-date-time ((,c :foreground ,date)))
+    `(diredfl-date-time ((,c :foreground ,date-common)))
     `(diredfl-deletion ((,c :inherit dired-flagged)))
     `(diredfl-deletion-file-name ((,c :inherit diredfl-deletion)))
     `(diredfl-dir-heading ((,c :inherit bold)))
@@ -1194,10 +1194,10 @@ Optional prefix argument MAPPINGS has the same meaning 
as for
     `(elfeed-log-error-level-face ((,c :inherit error)))
     `(elfeed-log-info-level-face ((,c :inherit success)))
     `(elfeed-log-warn-level-face ((,c :inherit warning)))
-    `(elfeed-search-date-face ((,c :foreground ,date)))
+    `(elfeed-search-date-face ((,c :foreground ,date-common)))
     `(elfeed-search-feed-face ((,c :foreground ,accent-1)))
     `(elfeed-search-filter-face ((,c :inherit bold)))
-    `(elfeed-search-last-update-face ((,c :inherit bold :foreground ,date)))
+    `(elfeed-search-last-update-face ((,c :inherit bold :foreground 
,date-common)))
     `(elfeed-search-tag-face ((,c :foreground ,accent-0)))
     `(elfeed-search-title-face ((,c :foreground ,fg-dim)))
     `(elfeed-search-unread-count-face (( )))
@@ -1489,7 +1489,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(magit-keyword ((,c :foreground ,keyword)))
     `(magit-keyword-squash ((,c :inherit bold :foreground ,warning)))
     `(magit-log-author ((,c :foreground ,name)))
-    `(magit-log-date ((,c :foreground ,date)))
+    `(magit-log-date ((,c :foreground ,date-common)))
     `(magit-log-graph ((,c :inherit shadow)))
     `(magit-mode-line-process ((,c :inherit bold :foreground ,modeline-info)))
     `(magit-mode-line-process-error ((,c :inherit bold :foreground 
,modeline-err)))
@@ -1534,7 +1534,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
 ;;;; marginalia
     `(marginalia-archive ((,c :foreground ,accent-0)))
     `(marginalia-char ((,c :foreground ,accent-2)))
-    `(marginalia-date ((,c :foreground ,date)))
+    `(marginalia-date ((,c :foreground ,date-common)))
     `(marginalia-documentation ((,c :inherit italic :foreground ,docstring)))
     `(marginalia-file-name (( )))
     `(marginalia-file-owner ((,c :inherit shadow)))
@@ -1676,7 +1676,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(notmuch-jump-key ((,c :inherit ef-themes-key-binding)))
     `(notmuch-message-summary-face ((,c :inherit bold :background ,bg-alt)))
     `(notmuch-search-count ((,c :foreground ,fg-dim)))
-    `(notmuch-search-date ((,c :foreground ,date)))
+    `(notmuch-search-date ((,c :foreground ,date-common)))
     `(notmuch-search-flagged-face ((,c :foreground ,err)))
     `(notmuch-search-matching-authors ((,c :foreground ,name)))
     `(notmuch-search-non-matching-authors ((,c :inherit shadow)))
@@ -1703,15 +1703,15 @@ Optional prefix argument MAPPINGS has the same meaning 
as for
     `(orderless-match-face-2 ((,c :inherit bold :foreground ,accent-2)))
     `(orderless-match-face-3 ((,c :inherit bold :foreground ,accent-3)))
 ;;;; org
-    `(org-agenda-calendar-event ((,c :foreground ,fg-alt)))
+    `(org-agenda-calendar-event ((,c :foreground ,date-event)))
     `(org-agenda-calendar-sexp ((,c :inherit (italic 
org-agenda-calendar-event))))
     `(org-agenda-clocking ((,c :background ,bg-warning :foreground ,warning)))
     `(org-agenda-column-dateline ((,c :background ,bg-alt)))
-    `(org-agenda-current-time ((,c :foreground ,fg-main)))
-    `(org-agenda-date ((,c ,@(ef-themes--heading 'agenda-date) :foreground 
,date)))
+    `(org-agenda-current-time ((,c :foreground ,date-now)))
+    `(org-agenda-date ((,c ,@(ef-themes--heading 'agenda-date) :foreground 
,date-weekday)))
     `(org-agenda-date-today ((,c :inherit org-agenda-date :underline t)))
-    `(org-agenda-date-weekend ((,c :inherit org-agenda-date :foreground 
,weekend)))
-    `(org-agenda-date-weekend-today ((,c :inherit org-agenda-date-today 
:foreground ,weekend)))
+    `(org-agenda-date-weekend ((,c :inherit org-agenda-date :foreground 
,date-weekend)))
+    `(org-agenda-date-weekend-today ((,c :inherit org-agenda-date-today 
:foreground ,date-weekend)))
     `(org-agenda-diary ((,c :inherit org-agenda-calendar-sexp)))
     `(org-agenda-dimmed-todo-face ((,c :inherit shadow)))
     `(org-agenda-done ((,c :inherit org-done)))
@@ -1734,8 +1734,8 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(org-code ((,c :inherit ef-themes-fixed-pitch :foreground ,accent-1)))
     `(org-column ((,c :inherit default :background ,bg-alt)))
     `(org-column-title ((,c :inherit (bold default) :underline t :background 
,bg-alt)))
-    `(org-date ((,c :inherit ef-themes-fixed-pitch :foreground ,date)))
-    `(org-date-selected ((,c :foreground ,date :inverse-video t)))
+    `(org-date ((,c :inherit ef-themes-fixed-pitch :foreground ,date-common)))
+    `(org-date-selected ((,c :foreground ,date-common :inverse-video t)))
     `(org-dispatcher-highlight ((,c :inherit warning :background ,bg-warning)))
     `(org-document-info ((,c :foreground ,rainbow-1)))
     `(org-document-info-keyword ((,c :inherit shadow)))
@@ -1749,7 +1749,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(org-headline-todo ((,c :inherit org-todo)))
     `(org-hide ((,c :foreground ,bg-main)))
     `(org-indent ((,c :inherit (fixed-pitch org-hide))))
-    `(org-imminent-deadline ((,c :foreground ,err)))
+    `(org-imminent-deadline ((,c :foreground ,date-deadline)))
     `(org-latex-and-related ((,c :foreground ,type)))
     `(org-level-1 ((,c :inherit ef-themes-heading-1)))
     `(org-level-2 ((,c :inherit ef-themes-heading-2)))
@@ -1768,10 +1768,10 @@ Optional prefix argument MAPPINGS has the same meaning 
as for
     `(org-priority ((,c :foreground ,fg-alt)))
     `(org-property-value ((,c :inherit ef-themes-fixed-pitch :foreground 
,fg-alt)))
     `(org-quote ((,c :inherit org-block)))
-    `(org-scheduled ((,c :foreground ,warning)))
+    `(org-scheduled ((,c :foreground ,date-scheduled)))
     `(org-scheduled-previously ((,c :inherit org-scheduled)))
     `(org-scheduled-today ((,c :inherit org-scheduled)))
-    `(org-sexp-date ((,c :foreground ,date)))
+    `(org-sexp-date ((,c :foreground ,date-common)))
     `(org-special-keyword ((,c :inherit (shadow ef-themes-fixed-pitch))))
     `(org-table ((,c :inherit ef-themes-fixed-pitch :foreground ,fg-alt)))
     `(org-table-header ((,c :inherit (bold org-table))))
@@ -1780,7 +1780,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(org-target ((,c :underline t)))
     `(org-time-grid ((,c :foreground ,fg-dim)))
     `(org-todo ((,c :foreground ,err)))
-    `(org-upcoming-deadline ((,c :foreground ,warning)))
+    `(org-upcoming-deadline ((,c :foreground ,date-deadline)))
     `(org-upcoming-distant-deadline ((,c :inherit org-upcoming-deadline)))
     `(org-verbatim ((,c :inherit ef-themes-fixed-pitch :foreground ,accent-0)))
     `(org-verse ((,c :inherit org-block)))
@@ -1819,7 +1819,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(package-description ((,c :foreground ,docstring)))
     `(package-help-section-name ((,c :inherit bold)))
     `(package-name ((,c :inherit link)))
-    `(package-status-available ((,c :foreground ,date)))
+    `(package-status-available ((,c :foreground ,date-common)))
     `(package-status-avail-obso ((,c :inherit error)))
     `(package-status-built-in ((,c :foreground ,builtin)))
     `(package-status-dependency ((,c :foreground ,warning)))
@@ -1872,7 +1872,7 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(rcirc-other-nick ((,c :inherit bold :foreground ,accent-0)))
     `(rcirc-prompt ((,c :inherit minibuffer-prompt)))
     `(rcirc-server ((,c :inherit font-lock-comment-face)))
-    `(rcirc-timestamp ((,c :foreground ,date)))
+    `(rcirc-timestamp ((,c :foreground ,date-common)))
     `(rcirc-track-keyword ((,c :inherit bold :foreground ,modeline-warning)))
     `(rcirc-track-nick ((,c :inherit rcirc-my-nick)))
     `(rcirc-url ((,c :inherit link)))
diff --git a/ef-trio-dark-theme.el b/ef-trio-dark-theme.el
index 4c092c9ae2..266d49aa43 100644
--- a/ef-trio-dark-theme.el
+++ b/ef-trio-dark-theme.el
@@ -159,8 +159,6 @@
 
       (link cyan)
       (link-alt magenta)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name blue)
       (keybind magenta-warmer)
       (identifier red-faint)
@@ -180,6 +178,18 @@
       (rx-escape blue-warmer) ; compare with `string'
       (rx-construct red)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday blue-warmer)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 magenta-warmer)
       (accent-1 green-cooler)
       (accent-2 blue-warmer)
diff --git a/ef-trio-light-theme.el b/ef-trio-light-theme.el
index a7985cb763..610e5fb08f 100644
--- a/ef-trio-light-theme.el
+++ b/ef-trio-light-theme.el
@@ -159,8 +159,6 @@
 
       (link cyan)
       (link-alt magenta)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name blue)
       (keybind magenta-warmer)
       (identifier red-faint)
@@ -180,6 +178,18 @@
       (rx-escape blue-warmer) ; compare with `string'
       (rx-construct red)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday blue-warmer)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 magenta-warmer)
       (accent-1 green-cooler)
       (accent-2 blue-warmer)
diff --git a/ef-tritanopia-dark-theme.el b/ef-tritanopia-dark-theme.el
index 9bf2fb07fc..4b801941f5 100644
--- a/ef-tritanopia-dark-theme.el
+++ b/ef-tritanopia-dark-theme.el
@@ -162,8 +162,6 @@
 
       (link cyan)
       (link-alt magenta-cooler)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name magenta)
       (keybind red-cooler)
       (identifier magenta-faint)
@@ -183,6 +181,18 @@
       (rx-escape cyan-cooler) ; compare with `string'
       (rx-construct red)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday cyan-warmer)
+      (date-now fg-main)
+      (date-scheduled magenta)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 cyan)
       (accent-1 red)
       (accent-2 cyan-warmer)
diff --git a/ef-tritanopia-light-theme.el b/ef-tritanopia-light-theme.el
index 6b88888255..b814a6096b 100644
--- a/ef-tritanopia-light-theme.el
+++ b/ef-tritanopia-light-theme.el
@@ -162,8 +162,6 @@
 
       (link cyan)
       (link-alt magenta-cooler)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name magenta)
       (keybind red-cooler)
       (identifier magenta-faint)
@@ -183,6 +181,18 @@
       (rx-escape cyan-warmer) ; compare with `string'
       (rx-construct red-warmer)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday cyan-warmer)
+      (date-now fg-main)
+      (date-scheduled magenta)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 cyan)
       (accent-1 red)
       (accent-2 cyan-warmer)
diff --git a/ef-winter-theme.el b/ef-winter-theme.el
index 01ac37f794..1ae7ccbee2 100644
--- a/ef-winter-theme.el
+++ b/ef-winter-theme.el
@@ -159,8 +159,6 @@
 
       (link magenta)
       (link-alt cyan-warmer)
-      (date cyan-cooler)
-      (weekend red-faint) ; for M-x calendar and Org agenda
       (name magenta)
       (keybind cyan-cooler)
       (identifier magenta-faint)
@@ -180,6 +178,18 @@
       (rx-escape green) ; compare with `string'
       (rx-construct blue)
 
+;;;; Date mappings
+
+      (date-common cyan-cooler)
+      (date-deadline red-warmer)
+      (date-event fg-alt)
+      (date-holiday green-cooler)
+      (date-now fg-main)
+      (date-scheduled yellow)
+      (date-weekday cyan)
+      (date-weekend red-faint)
+
+
       (accent-0 magenta-cooler)
       (accent-1 yellow)
       (accent-2 green-cooler)