2 files changed, 16 insertions, 14 deletions
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 8f1eeba..65f2237 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -3565,14 +3565,15 @@ Also bind `class' to ((class color) (min-colors 89))."
 ;;;;; org
    `(org-agenda-calendar-event ((,class :foreground ,fg-main)))
    `(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
-   `(org-agenda-clocking ((,class :inherit modus-theme-special-cold)))
+   `(org-agenda-clocking ((,class :inherit modus-theme-special-cold
+                                  ,@(and (>= emacs-major-version 27) '(:extend t)))))
    `(org-agenda-column-dateline ((,class :background ,bg-alt)))
-   `(org-agenda-current-time ((,class :inherit modus-theme-subtle-cyan)))
-   `(org-agenda-date ((,class :inherit bold :foreground ,cyan)))
-   `(org-agenda-date-today ((,class :inherit (bold modus-theme-intense-cyan))))
-   `(org-agenda-date-weekend ((,class :inherit bold :foreground ,cyan-alt-other)))
+   `(org-agenda-current-time ((,class :inherit bold :foreground ,blue-alt-other)))
+   `(org-agenda-date ((,class :foreground ,cyan)))
+   `(org-agenda-date-today ((,class :inherit bold :foreground ,fg-main :underline t)))
+   `(org-agenda-date-weekend ((,class :foreground ,cyan-alt-other)))
    `(org-agenda-diary ((,class :foreground ,fg-main)))
-   `(org-agenda-dimmed-todo-face ((,class :inherit modus-theme-subtle-neutral)))
+   `(org-agenda-dimmed-todo-face ((,class :inherit bold :foreground ,fg-alt)))
    `(org-agenda-done ((,class :foreground ,green-alt)))
    `(org-agenda-filter-category ((,class :inherit bold :foreground ,magenta-active)))
    `(org-agenda-filter-effort ((,class :inherit bold :foreground ,magenta-active)))
@@ -3638,7 +3639,7 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(org-meta-line ((,class ,@(modus-operandi-theme-mixed-fonts) :foreground ,fg-alt)))
    `(org-mode-line-clock ((,class :foreground ,fg-main)))
    `(org-mode-line-clock-overrun ((,class :inherit modus-theme-active-red)))
-   `(org-priority ((,class :box ,bg-region :background ,bg-dim :foreground ,magenta)))
+   `(org-priority ((,class :foreground ,magenta)))
    `(org-property-value ((,class ,@(modus-operandi-theme-mixed-fonts)
                                  :foreground ,cyan-alt-other)))
    `(org-quote ((,class ,@(modus-operandi-theme-org-block bg-dim)
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index e7b338e..3426a86 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -3565,14 +3565,15 @@ Also bind `class' to ((class color) (min-colors 89))."
 ;;;;; org
    `(org-agenda-calendar-event ((,class :foreground ,fg-main)))
    `(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
-   `(org-agenda-clocking ((,class :inherit modus-theme-special-cold)))
+   `(org-agenda-clocking ((,class :inherit modus-theme-special-cold
+                                  ,@(and (>= emacs-major-version 27) '(:extend t)))))
    `(org-agenda-column-dateline ((,class :background ,bg-alt)))
-   `(org-agenda-current-time ((,class :inherit modus-theme-subtle-cyan)))
-   `(org-agenda-date ((,class :inherit bold :foreground ,cyan)))
-   `(org-agenda-date-today ((,class :inherit (bold modus-theme-intense-cyan))))
-   `(org-agenda-date-weekend ((,class :inherit bold :foreground ,cyan-alt-other)))
+   `(org-agenda-current-time ((,class :inherit bold :foreground ,blue-alt-other)))
+   `(org-agenda-date ((,class :foreground ,cyan)))
+   `(org-agenda-date-today ((,class :inherit bold :foreground ,fg-main :underline t)))
+   `(org-agenda-date-weekend ((,class :foreground ,cyan-alt-other)))
    `(org-agenda-diary ((,class :foreground ,fg-main)))
-   `(org-agenda-dimmed-todo-face ((,class :inherit modus-theme-subtle-neutral)))
+   `(org-agenda-dimmed-todo-face ((,class :inherit bold :foreground ,fg-alt)))
    `(org-agenda-done ((,class :foreground ,green-alt)))
    `(org-agenda-filter-category ((,class :inherit bold :foreground ,magenta-active)))
    `(org-agenda-filter-effort ((,class :inherit bold :foreground ,magenta-active)))
@@ -3638,7 +3639,7 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(org-meta-line ((,class ,@(modus-vivendi-theme-mixed-fonts) :foreground ,fg-alt)))
    `(org-mode-line-clock ((,class :foreground ,fg-main)))
    `(org-mode-line-clock-overrun ((,class :inherit modus-theme-active-red)))
-   `(org-priority ((,class :box ,bg-region :background ,bg-dim :foreground ,magenta)))
+   `(org-priority ((,class :foreground ,magenta)))
    `(org-property-value ((,class ,@(modus-vivendi-theme-mixed-fonts)
                                  :foreground ,cyan-alt-other)))
    `(org-quote ((,class ,@(modus-vivendi-theme-org-block bg-dim)