Revise colours for deadlines and scheduled tasks (Org agenda)

The goal is two-fold:

1. Improve the semantics of relevant faces. This now covers the Org
   agenda. We want pending/urgent tasks to be rendered in a bold font
   and use a vivid colour. Whereas tasks that are not urgent should
   have a subtle colour and a normal weight. Thanks to Adam
   Porter (GitHub @alphapapa) for discussing this with me in issue
   102 on the Modus themes repository (the same principles apply
   here): <https://github.com/protesilaos/modus-themes/issues/102>.

2. Make the applicable colours be more consistent with the rest of the
   theme. In practice, this means that the colour values are cooler
   overall and the intensity is lower.

35 files changed, 76 insertions, 8 deletions

diff --git a/ef-arbutus-theme.el b/ef-arbutus-theme.el
index 0055367..15a850d 100644
--- a/ef-arbutus-theme.el
+++ b/ef-arbutus-theme.el
@@ -208,13 +208,15 @@
 
       (date-common green-faint)
       (date-deadline red-cooler)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday yellow-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday green-cooler)
-      (date-weekend red-cooler)
+      (date-weekend red)
 
 ;;;; Prose mappings
 
diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index 4911dff..845946b 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -208,11 +208,13 @@
 
       (date-common yellow-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday cyan-cooler)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index 1e056ac..ec7bf2d 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red-cooler)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el
index 055528e..0210d94 100644
--- a/ef-cherie-theme.el
+++ b/ef-cherie-theme.el
@@ -208,11 +208,13 @@
 
       (date-common magenta)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday blue-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-warmer)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el
index ed9b063..0fafed9 100644
--- a/ef-cyprus-theme.el
+++ b/ef-cyprus-theme.el
@@ -208,11 +208,13 @@
 
       (date-common yellow-cooler)
       (date-deadline red-cooler)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday blue-cooler)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index 417cf5d..dea1645 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -208,11 +208,13 @@
 
       (date-common green-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-day-theme.el b/ef-day-theme.el
index de59940..50fb4f1 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday red-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index 776ce93..8ca5b1b 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -211,11 +211,13 @@
 
       (date-common yellow-cooler)
       (date-deadline yellow-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday cyan-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend magenta-faint)
 
diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el
index 6458bf9..ee8796a 100644
--- a/ef-deuteranopia-light-theme.el
+++ b/ef-deuteranopia-light-theme.el
@@ -211,11 +211,13 @@
 
       (date-common yellow-cooler)
       (date-deadline yellow-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday cyan)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend magenta-faint)
 
diff --git a/ef-dream-theme.el b/ef-dream-theme.el
index 779321b..b9a06c3 100644
--- a/ef-dream-theme.el
+++ b/ef-dream-theme.el
@@ -208,11 +208,13 @@
 
       (date-common magenta-faint)
       (date-deadline red-cooler)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday red-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday magenta)
       (date-weekend blue-faint)
 
diff --git a/ef-duo-dark-theme.el b/ef-duo-dark-theme.el
index bde508b..6550361 100644
--- a/ef-duo-dark-theme.el
+++ b/ef-duo-dark-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el
index e5231e5..792f8e6 100644
--- a/ef-duo-light-theme.el
+++ b/ef-duo-light-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-eagle-theme.el b/ef-eagle-theme.el
index 4adf866..2767495 100644
--- a/ef-eagle-theme.el
+++ b/ef-eagle-theme.el
@@ -208,11 +208,13 @@
 
       (date-common red-faint)
       (date-deadline red-cooler)
+      (date-deadline-subtle red)
       (date-event fg-alt)
       (date-holiday red-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday red)
       (date-weekend cyan)
 
diff --git a/ef-elea-dark-theme.el b/ef-elea-dark-theme.el
index e2f1b05..1c658f2 100644
--- a/ef-elea-dark-theme.el
+++ b/ef-elea-dark-theme.el
@@ -208,11 +208,13 @@
 
       (date-common green-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan-cooler)
       (date-weekend red-faint)
 
diff --git a/ef-elea-light-theme.el b/ef-elea-light-theme.el
index 440448d..f718048 100644
--- a/ef-elea-light-theme.el
+++ b/ef-elea-light-theme.el
@@ -208,11 +208,13 @@
 
       (date-common green-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan-cooler)
       (date-weekend red-faint)
 
diff --git a/ef-frost-theme.el b/ef-frost-theme.el
index d238958..b8b2761 100644
--- a/ef-frost-theme.el
+++ b/ef-frost-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-kassio-theme.el b/ef-kassio-theme.el
index 81fda7e..6db39d5 100644
--- a/ef-kassio-theme.el
+++ b/ef-kassio-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday red-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-warmer)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday blue)
       (date-weekend red)
 
diff --git a/ef-light-theme.el b/ef-light-theme.el
index cb492ce..c3252e1 100644
--- a/ef-light-theme.el
+++ b/ef-light-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-cooler)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-maris-dark-theme.el b/ef-maris-dark-theme.el
index dc91dff..43e90bf 100644
--- a/ef-maris-dark-theme.el
+++ b/ef-maris-dark-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday blue-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan-warmer)
       (date-weekend red-faint)
 
diff --git a/ef-maris-light-theme.el b/ef-maris-light-theme.el
index f7dda1a..70df614 100644
--- a/ef-maris-light-theme.el
+++ b/ef-maris-light-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-cooler)
       (date-event fg-alt)
       (date-holiday blue-warmer)
       (date-now fg-main)
       (date-range fg-alt)
-      (date-scheduled yellow-cooler)
+      (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan-warmer)
       (date-weekend red-faint)
 
diff --git a/ef-melissa-dark-theme.el b/ef-melissa-dark-theme.el
index 98b9c93..40d1385 100644
--- a/ef-melissa-dark-theme.el
+++ b/ef-melissa-dark-theme.el
@@ -208,11 +208,13 @@
 
       (date-common green-warmer)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday green-warmer)
       (date-weekend red-cooler)
 
diff --git a/ef-melissa-light-theme.el b/ef-melissa-light-theme.el
index 0e9e3ef..19d979e 100644
--- a/ef-melissa-light-theme.el
+++ b/ef-melissa-light-theme.el
@@ -208,11 +208,13 @@
 
       (date-common green-warmer)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday green-warmer)
       (date-weekend red-faint)
 
diff --git a/ef-night-theme.el b/ef-night-theme.el
index 253ddd8..25bc91d 100644
--- a/ef-night-theme.el
+++ b/ef-night-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-owl-theme.el b/ef-owl-theme.el
index 14cc5a9..3da6e8c 100644
--- a/ef-owl-theme.el
+++ b/ef-owl-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday red)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan-cooler)
       (date-weekend red-faint)
 
diff --git a/ef-reverie-theme.el b/ef-reverie-theme.el
index e2de032..f68f557 100644
--- a/ef-reverie-theme.el
+++ b/ef-reverie-theme.el
@@ -208,11 +208,13 @@
 
       (date-common magenta-faint)
       (date-deadline red-cooler)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday red-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday magenta)
       (date-weekend blue-faint)
 
diff --git a/ef-rosa-theme.el b/ef-rosa-theme.el
index a04efc6..4de7273 100644
--- a/ef-rosa-theme.el
+++ b/ef-rosa-theme.el
@@ -208,11 +208,13 @@
 
       (date-common magenta-cooler)
       (date-deadline magenta)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday green)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow-cooler)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday magenta-cooler)
       (date-weekend red-cooler)
 
diff --git a/ef-spring-theme.el b/ef-spring-theme.el
index 3db6f75..20a6846 100644
--- a/ef-spring-theme.el
+++ b/ef-spring-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-summer-theme.el b/ef-summer-theme.el
index 857add0..8b1f360 100644
--- a/ef-summer-theme.el
+++ b/ef-summer-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-symbiosis-theme.el b/ef-symbiosis-theme.el
index 5bca3d0..a92589d 100644
--- a/ef-symbiosis-theme.el
+++ b/ef-symbiosis-theme.el
@@ -208,11 +208,13 @@
 
       (date-common green-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday yellow-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday yellow-cooler)
       (date-weekend blue)
 
diff --git a/ef-themes.el b/ef-themes.el
index b2d4024..f4de5cb 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -2093,7 +2093,7 @@ text should not be underlined as well) yet still blend in."
     `(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 ,date-deadline)))
+    `(org-imminent-deadline ((,c :inherit bold :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)))
@@ -2112,9 +2112,9 @@ text should not be underlined as well) yet still blend in."
     `(org-priority ((,c :foreground ,prose-tag)))
     `(org-property-value ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata-value)))
     `(org-quote ((,c :inherit org-block)))
-    `(org-scheduled ((,c :foreground ,date-scheduled)))
-    `(org-scheduled-previously ((,c :inherit org-scheduled)))
-    `(org-scheduled-today ((,c :inherit org-scheduled)))
+    `(org-scheduled ((,c :foreground ,date-scheduled-subtle)))
+    `(org-scheduled-previously ((,c :inherit (bold org-scheduled-today))))
+    `(org-scheduled-today ((,c :foreground ,date-scheduled)))
     `(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 ,prose-table)))
@@ -2124,8 +2124,8 @@ text should not be underlined as well) yet still blend in."
     `(org-target ((,c :underline t)))
     `(org-time-grid ((,c :foreground ,fg-dim)))
     `(org-todo ((,c :foreground ,prose-todo)))
-    `(org-upcoming-deadline ((,c :foreground ,date-deadline)))
-    `(org-upcoming-distant-deadline ((,c :inherit org-upcoming-deadline)))
+    `(org-upcoming-deadline ((,c :foreground ,date-deadline-subtle)))
+    `(org-upcoming-distant-deadline ((,c :foreground ,fg-main)))
     `(org-verbatim ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-verbatim)))
     `(org-verse ((,c :inherit org-block)))
     `(org-warning ((,c :inherit warning)))
diff --git a/ef-trio-dark-theme.el b/ef-trio-dark-theme.el
index ccf7e07..e3f69f5 100644
--- a/ef-trio-dark-theme.el
+++ b/ef-trio-dark-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-trio-light-theme.el b/ef-trio-light-theme.el
index 06aaf85..52ddfcb 100644
--- a/ef-trio-light-theme.el
+++ b/ef-trio-light-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-cooler)
       (date-event fg-alt)
       (date-holiday magenta-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-tritanopia-dark-theme.el b/ef-tritanopia-dark-theme.el
index 596ee80..6e74365 100644
--- a/ef-tritanopia-dark-theme.el
+++ b/ef-tritanopia-dark-theme.el
@@ -211,11 +211,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-cooler)
       (date-event fg-alt)
       (date-holiday red-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled magenta)
+      (date-scheduled-subtle magenta-cooler)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-tritanopia-light-theme.el b/ef-tritanopia-light-theme.el
index 5ad098a..d3c4de1 100644
--- a/ef-tritanopia-light-theme.el
+++ b/ef-tritanopia-light-theme.el
@@ -211,11 +211,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-cooler)
       (date-event fg-alt)
       (date-holiday red-warmer)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled magenta)
+      (date-scheduled-subtle magenta-faint)
       (date-weekday cyan)
       (date-weekend red-faint)
 
diff --git a/ef-winter-theme.el b/ef-winter-theme.el
index 6be5622..365eb11 100644
--- a/ef-winter-theme.el
+++ b/ef-winter-theme.el
@@ -208,11 +208,13 @@
 
       (date-common cyan-cooler)
       (date-deadline red-warmer)
+      (date-deadline-subtle red-faint)
       (date-event fg-alt)
       (date-holiday magenta)
       (date-now fg-main)
       (date-range fg-alt)
       (date-scheduled yellow)
+      (date-scheduled-subtle yellow-faint)
       (date-weekday cyan)
       (date-weekend red-faint)