diff --git a/CHANGELOG.org b/CHANGELOG.org
index 0808b05..8144183 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -15,6 +15,15 @@ For further details, please consult these additional resources:
 + Manual :: <https://protesilaos.com/emacs/modus-themes>
 + Screenshots :: <https://protesilaos.com/emacs/modus-themes-pictures>
 
+
+* DEVELOPMENT
+
+** ~modus-themes-with-colors~ improved again
+
+The recently introduced ~let~-based method exhibits a subtle bug: since
+it sorts real colors prior to "mapped" colors, an override from the
+latter to the former would be lost.
+
 * 5.2.0 on 2025-12-31
 
 This version fixes some bugs, adds a new feature for those who want to
diff --git a/modus-themes.el b/modus-themes.el
index c9af2fe..a84f08c 100644
--- a/modus-themes.el
+++ b/modus-themes.el
@@ -3945,8 +3945,7 @@ doing so if the value of COLOR is not a key in the PALETTE.
 Return `unspecified' if the value of COLOR cannot be determined.
 This symbol is accepted by faces and is thus harmless.
 
-This function is used in the macros `modus-themes-theme',
-`modus-themes-with-colors'."
+This function is used in the macro `modus-themes-theme'"
   (let ((value (car (alist-get color palette))))
     (cond
      ((or (stringp value)
@@ -7492,23 +7491,18 @@ whose value is another symbol, which ultimately resolves to a string or
            (semantic-unique (funcall unique-fn semantic)))
       (nreverse (nconc semantic-unique named-unique)))))
 
-(defun modus-themes-with-colors-subr (body)
-  "Do the work of `modus-themes-with-colors' for BODY."
-  (condition-case data
-      (when-let* ((modus-themes-with-colors--current (modus-themes-get-current-theme))
-                  (palette (modus-themes--with-colors-get-palette modus-themes-with-colors--current))
-                  (sorted (modus-themes--with-colors-resolve-palette-sort palette)))
-        (eval
-         `(let* ((c '((class color) (min-colors 256)))
-                 (unspecified 'unspecified)
-                 ,@sorted)
-            (funcall ',body))))
-    (error (message "Error in `modus-themes-with-colors': %s" data))))
-
 (defmacro modus-themes-with-colors (&rest body)
   "Evaluate BODY with colors from current palette bound."
   (declare (indent 0))
-  `(modus-themes-with-colors-subr (lambda () ,@body)))
+  `(condition-case data
+       (when-let* ((theme (modus-themes-get-current-theme))
+                   (palette (modus-themes--with-colors-get-palette theme)))
+         (let ((bindings
+                (append
+                 '((c '((class color) (min-colors 256))) (unspecified 'unspecified))
+                 (cl-remove-duplicates (apply #'append palette) :key #'car))))
+           (eval (nconc `(cl-symbol-macrolet ,bindings) ',body))))
+     (error (message "Error in my/modus-with-color %s" data))))
 
 ;;;; Declare all the Modus themes