From 6547f387ddecdc95026a259e85bf68a739fa524a Mon Sep 17 00:00:00 2001
From: rearman <rearman@r717.net>
Date: Wed, 1 Apr 2026 15:19:55 -0400
Subject: [PATCH] Better colors

Use ':inherit default' on things that only use the default fg and bg.
---
 re/acme-theme.el | 138 +++++++++++++++++------------------------------
 1 file changed, 49 insertions(+), 89 deletions(-)

diff --git a/re/acme-theme.el b/re/acme-theme.el
index 3ce9736..f77fc69 100644
--- a/re/acme-theme.el
+++ b/re/acme-theme.el
@@ -20,55 +20,53 @@
    `(default
      ((,class (:foreground ,text :background ,bg))))
    `(error
-     ((,class (:foreground ,text :underline t))))
+     ((,class (:foreground ,red))))
    `(warning
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default :weight bold))))
    `(success
-     ((,class (:foreground ,text))))
-   `(link
-     ((,class (:foreground ,text :underline t))))
+     ((,class (:inherit default :weight bold))))
 ;;;; font-lock.
    `(font-lock-comment-face
-     ((,class (:foreground ,text :slant italic :weight light))))
+     ((,class (:slant italic :weight light))))
    `(font-lock-string-face
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(font-lock-builtin-face
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(font-lock-type-face
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(font-lock-constant-face
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(font-lock-function-name-face
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(font-lock-variable-name-face
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(font-lock-keyword-face
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(font-lock-number-face
-     ((,class (:foreground ,text))))
-   `(font-lock-warning-face
-     ((,class (:foreground ,text :underline nil))))
+     ((,class (:inherit default))))
 ;;;; Decorations.
    `(vertical-border
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(scroll-bar
-     ((,class (:foreground ,text))))
+     ((,class (:background ,darkscroll))))
    `(region
-     ((,class (:background ,highlight :foreground ,text))))
+     ((,class (:background ,highlight :extend t))))
    `(shadow
-     ((,class (:foreground ,text))))
+     ((,class (:foreground ,text :weight light))))
    `(match
-     ((,class (:background ,darkscroll))))
+     ((,class (:background ,highlight))))
    `(highlight
-     ((,class (:background ,highlight :foreground ,text))))
+     ((,class (:background ,highlight))))
+   `(secondary-selection
+     ((,class (:background ,darkscroll :extend t))))
    `(lazy-highlight
-     ((,class (:background ,highlight :foreground ,text))))
+     ((,class (:background ,darkscroll))))
    `(isearch
      ((,class (:foreground ,text :background ,highlight))))
    `(fringe
-     ((,class (:foreground ,text :background ,bg))))
+     ((,class (:inherit default))))
    `(line-number
-     ((,class (:foreground ,text :background ,bg))))
+     ((,class (:inherit default))))
    `(line-number-current-line
      ((,class (:foreground ,text :background ,darkscroll :weight bold))))
    `(mode-line
@@ -81,21 +79,21 @@
    `(org-document-title
      ((,class (:foreground ,text :weight bold))))
    `(org-level-1
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-level-2
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-level-3
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-level-4
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-level-5
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-level-6
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-level-7
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-level-8
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-todo
      ((,class (:foreground ,red :bold t))))
    `(org-done
@@ -103,83 +101,45 @@
    `(org-headline-done
      ((,class (:foreground ,green))))
    `(org-ellipsis
-     ((,class (:foreground ,text :underline nil))))
-   `(org-document-info-keyword
-     ((,class (:foreground ,text))))
-   `(org-special-keyword
-     ((,class (:foreground ,text))))
-   `(org-checkbox
-     ((,class (:foreground ,text :background ,bg :box nil))))
-   `(org-tag
-     ((,class (:foreground ,text :bold t))))
-   `(org-code
-     ((,class (:foreground ,text))))
-   `(org-verbatim
-     ((,class (:foreground ,text :box (:line-width 1 :color ,text :style released-button)))))
+     ((,class (:inherit default))))
    `(org-table
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-formula
-     ((,class (:foreground ,text))))
-   `(org-block
-     ((,class (:foreground ,text))))
-   `(org-block-begin-line
-     ((,class (:foreground ,text))))
-   `(org-block-end-line
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-drawer
-     ((,class (:foreground ,text))))
-   `(org-priority
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-footnote
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-date
-     ((,class (:foreground ,text))))
-   `(org-link
-     ((,class (:foreground ,text :underline t))))
+     ((,class (:inherit default))))
 ;;; Org Agenda
    `(header-line
-     ((,class (:foreground ,text :background ,bg :weight bold))))
+     ((,class (:inherit default))))
    `(org-agenda-structure
-     ((,class (:foreground ,text :background ,bg :box nil :weight bold))))
+     ((,class (:inherit default))))
    `(org-column
-     ((,class (:background ,bg))))
-   `(org-warning
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-agenda-done
      ((,class (:foreground ,text :italic t))))
    `(org-time-grid
-     ((,class (:foreground ,text :bold t))))
-   `(calendar-weekday-header
-     ((,class (:foreground ,text))))
-   `(org-agenda-calendar-event
-     ((,class (:foreground ,text))))
-   `(org-agenda-clocking
-     ((,class (:foreground ,bg :background ,text))))
-   `(org-agenda-date
-     ((,class (:foreground ,text :background ,bg :box nil :weight normal))))
+     ((,class (:inherit default))))
    `(org-agenda-date-weekend
-     ((,class (:foreground ,text :background ,bg :box nil :weight normal :underline nil))))
+     ((,class (:inherit org-agenda-date :weight bold))))
    `(org-agenda-date-today
-     ((,class (:foreground ,text :background ,bg :box nil :weight normal :slant normal :inverse-video nil))))
-   `(org-upcoming-distant-deadline
-     ((,class (:foreground ,text :italic t))))
+     ((,class (:inherit org-agenda-date :weight bold :slant italic))))
    `(org-upcoming-deadline
-     ((,class (:foreground ,text :italic t))))
-   `(org-imminent-deadline
-     ((,class (:foreground ,text :weight bold))))
+     ((,class (:inherit default))))
    `(org-scheduled
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-scheduled-today
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
    `(org-scheduled-previously
-     ((,class (:foreground ,text))))
+     ((,class (:inherit default))))
 ;;; Misc. other packages
    `(corfu-default
-     ((,class (:foreground ,text :background ,bg))))
+     ((,class (:inherit default))))
    `(corfu-current
-     ((,class (:foreground ,text :background ,highlight))))
-   `(dired-ignored
-     ((,class (:foreground ,text))))))
+     ((,class (:foreground ,text :background ,highlight :extend t))))))
 
 ;;;###autoload
 (when load-file-name
-- 
2.39.5