Merge branch 'main' into icalendar

171 files changed, 1368 insertions, 481 deletions

diff --git a/etc/CALC-NEWS b/etc/CALC-NEWS
index aec31e940de..c0d109f44f9 100644
--- a/etc/CALC-NEWS
+++ b/etc/CALC-NEWS
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Calc is an advanced desk calculator for GNU Emacs.
diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1
index d241e6d636d..feddd880066 100644
--- a/etc/ChangeLog.1
+++ b/etc/ChangeLog.1
@@ -6891,7 +6891,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2025 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2026 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/etc/DEBUG b/etc/DEBUG
index dc1601a34f8..e70fe8de390 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -1,6 +1,6 @@
 Debugging GNU Emacs
 
-Copyright (C) 1985, 2000-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 2000-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 ** Preliminaries
diff --git a/etc/DISTRIB b/etc/DISTRIB
index 1f154fd74d7..b548b65f864 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -1,7 +1,7 @@
                                                 -*- text -*-
             GNU Emacs availability information
 
-Copyright (C) 1986-1993, 1995, 1998, 2000-2025 Free Software Foundation,
+Copyright (C) 1986-1993, 1995, 1998, 2000-2026 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS
index b3edd77cacd..20c2208c54c 100644
--- a/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@ -1,6 +1,6 @@
 Eglot NEWS                                                     -*- outline -*-
 
-Copyright (C) 2018-2025 Free Software Foundation, Inc.
+Copyright (C) 2018-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Eglot bug reports to 'bug-gnu-emacs@gnu.org', and Cc (or
@@ -20,6 +20,71 @@ https://github.com/joaotavora/eglot/issues/1234.
 
 * Changes to upcoming Eglot
 
+** File watch limits to prevent resource exhaustion (github#1568)
+
+The new variable 'eglot-max-file-watches' limits the number of file
+watches that can be created.  Some language servers request watching
+for a very large number of directories (e.g. Python virtualenvs), which
+can exhaust system resources and cause slow startup.
+
+** Support for complex workspace edits (create/rename/delete files)
+
+Eglot now advertises support for file resource operations in workspace
+edits and can handle create, rename, and delete file operations.  The
+confirmation UI has been reworked to handle mixed operation types.
+
+The 'eglot-confirm-server-edits' defcustom has been overhauled and now
+also accepts file operation kinds as keys in the alist form, providing
+more fine-grained control over what confirmation mechanism to use.
+
+** 'eglot-advertise-cancellation' now defaults to t
+
+The variable 'eglot-advertise-cancellation' now defaults to t, which
+means Eglot will send '$/cancelRequest' notifications to servers when it
+thinks responses to inflight requests are no longer useful.  The current
+2026 LSP landscape (especially gopls and ocamllsp) suggests this is
+beneficial and helps servers avoid costly useless work.
+
+** Imenu setup is more predictable (github#1569)
+
+Eglot now sets 'imenu-create-index-function' using ':override' advice,
+making the integration cleaner and more predictable.
+
+** Fixed textDocument/prepareRename support (github#1554)
+
+Eglot now properly checks server capabilities before sending
+prepareRename requests.
+
+
+* Changes in Eglot 1.21 (11/1/2026)
+
+This is a bugfix release with small fixes for semantic tokens and Emacs
+26.3 compatibility.
+
+
+* Changes in Eglot 1.20 (11/1/2026)
+
+** Dramatically faster handling of files with many diagnostics
+
+Diagnostic conversion between LSP and Flymake versions is now much
+faster.  Previously, editing, e.g. a Python file with thousands of
+diagnostics was next to impossible to to periodic interruptions of
+diagnostic reports.  Now it's practically unnoticeable.
+
+** Support for LSP server multiplexers via Rassumfrassum
+
+Eglot can now leverage LSP server multiplexer programs like Rassumfrassum
+(invoked via the 'rass' command) to use multiple language servers in a
+single buffer.  This enables combining spell-checkers with language
+servers, using multiple servers for the same language (e.g., 'ty' for
+type checking and 'ruff' for linting in Python), or handling
+multi-language files like Vue.
+
+Some invocations of 'rass' are offered as alternatives in the built-in
+'eglot-server-programs' variable.  The manual (readable with 'M-x
+eglot-manual') contains a comprehensive discussion of how to set up and
+use multiplexers in the new "Multi-server support" chapter.
+
 ** Support for pull diagnostics (github#1559, github#1290)
 
 For servers supporting the 'diagnosticProvider' capability, Eglot
@@ -28,6 +93,15 @@ requests diagnostics explicitly rather than relying on sporadic
 server is known to support the "pull" variant exclusively, while the
 'ty' server is known to support it alongside "push".
 
+** New command 'eglot-momentary-inlay-hints'
+
+When bound to a single key in 'eglot-mode-map' this will arrange for
+inlay hints to be displayed as long as the key is held down, and then
+hidden shortly after it is released.  Emacs doesn't support binding to
+\"key up\" events, but this function offers an approximation.  It relies
+on measuring your keyboard initial delay and repeat rate, and may not be
+100% accurate.
+
 ** Support for watching files outside the project (bug#79809)
 
 Eglot now supports and advertises the 'relativePatternSupport'
@@ -45,6 +119,11 @@ controlling which token types and modifiers to consider, as well as
 faces for customizing their appearance.  The minor mode is on by
 default: consult the manual on how to turn it off.
 
+** Reading the Eglot manual in Emacs is easy again
+
+The command 'M-x eglot-manual' is now easier to reach and directly drops
+the user into the manual.
+
 
 * Changes in Eglot 1.19 (23/10/2025)
 
@@ -155,7 +234,7 @@ use this.
 
 ** Eglot uses an internal 'track-changes.el' library (bug#70077)
 
-This should in theory help smoothen the Eglot's handling of events that
+This should in theory help smooth the Eglot's handling of events that
 change the buffer.  The library has been problematic in the past, let's
 hope we're past that phase.
 
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 932b7a58aa7..9ede2566e6d 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,6 +1,6 @@
 ERC NEWS
 
-Copyright (C) 2006-2025 Free Software Foundation, Inc.
+Copyright (C) 2006-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send ERC bug reports to 'bug-gnu-emacs@gnu.org',
@@ -68,8 +68,8 @@ ERC buffers as having been read.
 ** An arguably less distracting 'erc-nicks-track-faces' variant.
 Setting this option to t tells the 'track' module to have the mode-line
 indicator stick with the most recent speaker's face, even when they're
-monologuing, instead of alternating between it and the highest ranked
-'erc-track-faces-normal-list' member in a given message.
+the only speaker, instead of alternating between it and the highest
+ranked 'erc-track-faces-normal-list' member in a given message.
 
 ** Module 'querypoll' has left 'goodies' and moved in with 'notify'.
 The 'querypoll' module was initially placed in 'erc-goodies' even though
diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF
index e617c1c4592..53636e496cd 100644
--- a/etc/ETAGS.EBNF
+++ b/etc/ETAGS.EBNF
@@ -94,7 +94,7 @@ those.
 
 ===================== end of discussion of tag names =====================
 
-Copyright (C) 2002-2025 Free Software Foundation, Inc.
+Copyright (C) 2002-2026 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/ETAGS.README b/etc/ETAGS.README
index 4e077728e8a..4b5e717e475 100644
--- a/etc/ETAGS.README
+++ b/etc/ETAGS.README
@@ -28,7 +28,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2025 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2026 Free Software
 Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
diff --git a/etc/HELLO b/etc/HELLO
index 07be2d55293..8a7c7dbe706 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -132,7 +132,7 @@ Wancho (𞋒𞋀𞋉𞋃𞋕)    	𞋂𞋈𞋛
 
 
 
-Copyright (C) 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 2001-2026 Free Software Foundation, Inc.
 
 
 This file is part of GNU Emacs.
diff --git a/etc/MACHINES b/etc/MACHINES
index c3f091800b8..a3046f271d7 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1,6 +1,6 @@
 Emacs machines list
 
-Copyright (C) 1989-2025 Free Software Foundation, Inc.
+Copyright (C) 1989-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 This is a list of the status of GNU Emacs on various machines and systems.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 96bffc0bb2c..19677670860 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -1,6 +1,6 @@
 * COPYRIGHT
 
-Copyright (C) 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 * Changes in MH-E 8.6
diff --git a/etc/NEWS b/etc/NEWS
index c7b9ec1341b..1b95bc37364 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2022-2025 Free Software Foundation, Inc.
+Copyright (C) 2022-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'.
@@ -82,6 +82,13 @@ other directory on your system.  You can also invoke the
 
 * Changes in Emacs 31.1
 
++++
+** 'line-spacing' now supports specifying spacing above the line.
+Previously, only spacing below the line could be specified.  The user
+option can now be set to a cons cell to specify spacing both above and
+below the line, which allows for vertically centering text.
+
++++
 ** 'prettify-symbols-mode' attempts to ignore undisplayable characters.
 Previously, such characters would be rendered as, e.g., white boxes.
 
@@ -199,6 +206,13 @@ different completion categories by customizing
 be updated as you type, or nil to suppress this always.  Note that for
 large or inefficient completion tables this can slow down typing.
 
++++
+*** New optional value of 'minibuffer-visible-completions'.
+If the value of this option is 'up-down', only the '<up>' and '<down>'
+arrow keys move point between candidates shown in the "*Completions*"
+buffer display, while '<right>' and '<left>' arrows move point in the
+minibuffer window.
+
 ---
 *** 'RET' chooses the completion selected with 'M-<up>/M-<down>'.
 If a completion candidate is selected with 'M-<up>' or 'M-<down>',
@@ -306,7 +320,7 @@ to extend the boundaries of the active region by dragging the mouse pointer.
 ---
 *** 'context-menu-mode' now includes a "Send to..." menu item.
 The menu item enables sending current file(s) or region text to external
-(non-Emacs) applications or services.  See send-to.el for customisations.
+(non-Emacs) applications or services.  See send-to.el for customizations.
 
 ---
 *** The mouse now drags lines in character increments again.
@@ -315,7 +329,7 @@ dividing side-by-side windows now by default happens in increments of
 the corresponding frame's character size again.  This is the behavior
 described in the manual and was the default behavior before
 'window-resize-pixelwise' was added for Emacs 24.1.  To drag in pixel
-increments as with Emcas 24 through Emacs 30 you now have to set
+increments as with Emacs 24 through Emacs 30 you now have to set
 'window-resize-pixelwise' to t.
 
 ** Windows
@@ -402,11 +416,20 @@ for which you can use '(category . tex-shell)'.
 
 +++
 *** New user option 'split-window-preferred-direction'.
-Users can now choose in which direction Emacs tries to split first:
-vertically or horizontally.  The new default is to prefer to split
-horizontally if the frame is landscape and vertically if it is portrait.
-You can customize this option to 'vertical' to restore Emacs's old
-behavior of always preferring vertical splits.
+Functions called by 'display-buffer' split the selected window when they
+need to create a new window.  A window can be split either vertically,
+one below the other, or horizontally, side by side.  This new option
+determines which direction will be tried first, when both directions are
+possible according to the values of 'split-width-threshold' and
+'split-height-threshold'.  The default value is 'longest', which means
+to prefer to split horizontally if the window's frame is a "landscape"
+frame, and vertically if it is a "portrait" frame.  (A frame is
+considered to be "portrait" if its vertical dimension in pixels is
+greater or equal to its horizontal dimension, otherwise it's considered
+to be "landscape".)  Previous versions of Emacs always tried to split
+vertically first, so to get previous behavior, you can customize this
+option to 'vertical'.  The value 'horizontal' always prefers the
+horizontal split.
 
 +++
 *** New argument INDIRECT for 'get-buffer-window-list'.
@@ -440,6 +463,12 @@ adjacent windows and subsequently operate on that parent.
 'uncombine-window' can then be used to restore the window configuration
 to the state it had before running 'combine-windows'.
 
++++
+*** New function 'window-cursor-info'.
+This function returns a vector of pixel-level information about the
+physical cursor in a given window, including its type, coordinates,
+dimensions, and ascent.
+
 ** Frames
 
 +++
@@ -465,6 +494,13 @@ either resize the frame and change the fullscreen status accordingly or
 keep the frame size unchanged.  The value t means to first reset the
 fullscreen status and then resize the frame.
 
+*** New functions to set frame size and position in one compound step.
+'set-frame-size-and-position' sets the new size and position of a frame
+in one compound step.  Both, size and position, can be specified as with
+the corresponding frame parameters 'width', 'height', 'left' and 'top'.
+'set-frame-size-and-position-pixelwise' is similar but has a more
+restricted set of values for specifying size and position.
+
 *** New commands 'split-frame' and 'merge-frames'.
 'split-frame' moves a specified number of windows from an existing frame
 to a newly-created frame.  'merge-frames' merges all windows from two
@@ -475,6 +511,30 @@ frames into one of these frames and deletes the other one.
 Unlike with other frame names, an attempt to rename to "F<number>" throws
 an error when a frame of that name already exists.
 
++++
+*** New frame parameters 'cloned-from' and 'undeleted'.
+The frame parameter 'cloned-from' is set to the frame from which the new
+frame is cloned using the command 'clone-frame'.
+
+The frame parameter 'undeleted' is set to t when a frame is undeleted
+using the command 'undelete-frame'.
+
+These are useful if you need to detect a cloned frame or undeleted frame
+in hooks like 'after-make-frame-functions' and
+'server-after-make-frame-hook'.
+
+*** Frames now have unique ids and the new function 'frame-id'.
+Each non-tooltip frame is assigned a unique integer id.  This allows you
+to unambiguously identify frames even if they share the same name or
+title.  When 'undelete-frame-mode' is enabled, each deleted frame's id
+is stored for resurrection.  The function 'frame-id' returns a frame's
+id (in C, use the frame struct member 'id').
+
+*** New commands 'select-frame-by-id', 'undelete-frame-by-id'.
+The command 'select-frame-by-id' selects a frame by ID and undeletes it
+if deleted.  The command 'undelete-frame-by-id' undeletes a frame by its
+ID.  When called interactively, both functions prompt for an ID.
+
 ** Mode Line
 
 +++
@@ -499,6 +559,12 @@ every buffer.
 ** Tab Bars and Tab Lines
 
 ---
+*** New commands 'split-tab' and 'merge-tabs'.
+'split-tab' moves a specified number of windows from an existing tab
+to a newly-created tab.  'merge-tabs' merges all windows from two tabs
+into one of these tabs and closes the other tab.
+
+---
 *** New abnormal hook 'tab-bar-auto-width-functions'.
 This hook allows you to control which tab-bar tabs are auto-resized.
 
@@ -654,6 +720,17 @@ project, during completion.  That makes some items shorter.
 The category defaults are the same as for 'buffer' but any user
 customizations would need to be re-added.
 
++++
+*** 'project-mode-line' can now show project name only for local files.
+If the value of 'project-mode-line' is 'non-remote', project name and
+the Project menu will be shown on the mode line only for projects with
+local files.
+
+** Help
+
++++
+*** New keybinding 'C-h u' for 'apropos-user-option'.
+
 ** IDLWAVE has been moved to GNU ELPA.
 The version bundled with Emacs is out-of-date, and is now marked as
 obsolete.  Use 'M-x list-packages' to install the 'idlwave' package from
@@ -737,6 +814,15 @@ Emacs previously discarded arguments to emacsclient of zero length, such
 as in 'emacsclient --eval "(length (pop server-eval-args-left))" ""'.
 These are no longer discarded.
 
++++
+** New user option 'xterm-update-cursor' to update cursor display on TTYs.
+When enabled, Emacs sends Xterm escape sequences on Xterm-compatible
+terminals to update the cursor's appearacse.  Emacs can update the
+cursor's shape and color.  For example, if you use a purple bar cursor
+on graphical displays then when this option is enabled Emacs will use a
+purple bar cursor on compatible terminals as well.  See the Info node
+"(emacs) Cursor Display" for more information.
+
 
 * Editing Changes in Emacs 31.1
 
@@ -767,10 +853,10 @@ Northern Iroquoian language family: 'mohawk-postfix' (Mohawk
 [Kanien’kéha / Kanyen’kéha / Onkwehonwehnéha]), 'oneida-postfix' (Oneida
 [Onʌyote’a·ká· / Onyota’a:ká: / Ukwehuwehnéha]), 'cayuga-postfix'
 (Cayuga [Gayogo̱ho:nǫhnéha:ˀ]), 'onondaga-postfix' (Onondaga
-[Onųdaʔgegáʔ]), and 'seneca-postfix' (Seneca [Onödowá’ga:’]).
-Additionally, there is a general-purpose 'haudenosaunee-postfix' input
-method to facilitate writing in the orthographies of the five languages
-simultaneously.
+[Onųdaʔgegáʔ]), 'seneca-postfix' (Seneca [Onödowá’ga:’]), and
+'tuscarora-postfix' (Tuscarora [Skarù·ręʔ]).  Additionally, there is a
+general-purpose 'haudenosaunee-postfix' input method to facilitate
+writing in the orthographies of the six languages simultaneously.
 
 ---
 *** New input methods for languages based on Burmese.
@@ -846,6 +932,12 @@ The default value is t, which retains the old behavior.
 This variable has no effect when Transient Mark mode is off.
 
 ---
+** You can now use 'M-s t' to swap FROM and TO during 'query-replace'.
+Likewise during 'query-replace-regexp'.  The original binding of 'M-s'
+('next-matching-history-element') is now available on 'M-s M-s' or 'M-s
+s' for query replace minibuffer input.
+
+---
 ** New commands for filling text using semantic linefeeds.
 The new command 'fill-paragraph-semlf' fills a paragraph of text using
 "semantic linefeeds", whereby a newline is inserted after every
@@ -870,6 +962,19 @@ failed.
 You can now use 'C-u C-x .' to clear the fill prefix, similarly to how
 you could already use 'C-u C-x C-n' to clear the goal column.
 
++++
+** New prefix argument for 'C-/' in Dired and Proced modes.
+The Dired and Proced major modes bind mode-specific undo commands to the
+same keys to which 'undo' is globally bound, 'C-/', 'C-_' and 'C-x u'.
+These commands did not previously accept a prefix argument.
+Now a numeric prefix argument specifies a repeat count, just like it
+already did for 'undo'.
+
+** New minor mode 'center-line-mode'.
+This mode keeps modified lines centered horizontally according to the
+value of 'fill-column', by calling 'center-line' on each non-empty line
+of the modified region.
+
 
 * Changes in Specialized Modes and Packages in Emacs 31.1
 
@@ -1013,6 +1118,14 @@ The new variable 'forward-comment-function' is set to the new function
 'treesit-forward-comment' if a major mode defines the thing 'comment'.
 
 +++
+*** New function 'treesit-query-eagerly-compiled-p'.
+This function returns non-nil if a query was eagerly compiled.
+
++++
+*** New function 'treesit-query-source'.
+This function returns the string or sexp source query of a compiled query.
+
++++
 *** New function 'treesit-language-display-name'.
 This new function returns the display name of a language given the
 language symbol.  For example, 'cpp' is translated to "C++".  A new
@@ -1101,6 +1214,11 @@ convention.  Also, the ':match?' predicate can now take the regexp as
 either the first or second argument, so it works with both tree-sitter
 convention (regexp arg second) and Emacs convention (regexp arg first).
 
+** Track changes
+
++++
+*** New variable 'track-changes-undo-only' to distinguish undo changes.
+
 ** Hideshow
 
 +++
@@ -1114,7 +1232,7 @@ blocks.
 This command hides or shows all the blocks in the current buffer.
 
 ---
-*** 'hs-hide-level' no longer hide all the blocks in the current buffer.
+*** 'hs-hide-level' no longer hides all the blocks in the current buffer.
 If 'hs-hide-level' was not inside a code block it would hide all the
 blocks in the buffer like 'hs-hide-all'.  Now it should only hide all
 the second level blocks.
@@ -1170,10 +1288,9 @@ buffer-local variables 'hs-block-start-regexp', 'hs-c-start-regexp',
 'hs-forward-sexp-function', etc.
 
 +++
-*** 'hs-hide-level' and 'hs-cycle' can now hide comments too.
+*** 'hs-hide-level' can now hide comments too.
 This is controlled by 'hs-hide-comments-when-hiding-all'.
 
-
 ** C-ts mode
 
 +++
@@ -1232,6 +1349,12 @@ available.
 Now method chaining is indented by 8 spaces rather than 4, and this
 option controls how much is indented for method chaining.
 
+** JSON-ts mode
+
+*** New command 'json-ts-jq-path-at-point'.
+This command copies the path of the JSON element at point to the
+kill-ring, formatted for use with the 'jq' utility.
+
 ** PHP-ts mode
 
 ---
@@ -1283,6 +1406,13 @@ associated to a remote PHP file, show the remote PHP ini files.
 Rust number literals may have an optional type suffix.  When this option
 is non-nil, this suffix is fontified using 'font-lock-type-face'.
 
+** YAML-ts mode
+
+---
+*** New user option 'yaml-ts-mode-yamllint-options'.
+Additional options for 'yamllint', the command used for Flymake's YAML
+support.
+
 ** EIEIO
 
 ---
@@ -1521,7 +1651,7 @@ If 'page-delimiters' is set in 'whitespace-style', or the new minor mode
 'whitespace-page-delimiters-mode' is on, the page delimiter characters
 ('^L') are displayed as a pretty horizontal line that spans the entire
 width of the window.  The new 'whitespace-page-delimiter' face can be
-used to customize the appearence.
+used to customize the appearance.
 
 ** Bookmark
 
@@ -1588,7 +1718,6 @@ is the default.
 This user option is in sympathy with recentf, and savehist autosave
 timers.
 
-
 ** Savehist
 
 ---
@@ -1958,6 +2087,15 @@ for docstrings where symbols 'nil' and 't' are in quotes.
 In most cases, having it enabled leads to a large amount of false
 positives.
 
+---
+*** New function 'checkdoc-batch'.
+It checks the buffer in batch mode, prints all found errors
+and signals the first found error.
+
+*** New file-local variable 'lisp-indent-local-overrides'.
+This variable can be used to locally override the indent specification
+of symbols.
+
 ** IELM
 
 ---
@@ -1966,6 +2104,14 @@ When you kill the IELM process with 'C-c C-c', the input history is now
 saved to the file specified by 'ielm-history-file-name', just like when
 you exit the Emacs session or kill the IELM buffer.
 
+---
+*** New value 'point' for user option 'ielm-dynamic-return'.
+When 'ielm-dynamic-return' is set to 'point', typing 'RET' has dynamic
+behavior based on whether point is inside an sexp.  While point is
+inside an sexp typing 'RET' inserts a newline, and otherwise Emacs
+proceeds with evaluating the expression.  This is useful when
+'electric-pair-mode', or a similar automatic pairing mode, is enabled.
+
 ** DocView
 
 ---
@@ -1996,6 +2142,14 @@ option 'doc-view-djvused-program'.
 The default value is now 30 seconds, as the old value was too short to
 allow reading the help text.
 
++++
+*** Ispell can now save spelling corrections as abbrevs.
+In the Ispell command loop, type 'C-u' immediately before selecting a
+replacement to toggle whether that correction will be saved as a global
+abbrev expansion for its misspelling.  The new user option
+'ispell-save-corrections-as-abbrevs' determines whether abbrev saving
+is enabled by default.
+
 ** Flyspell
 
 ---
@@ -2024,6 +2178,10 @@ cherry-pick via 'tramp-cleanup-connection' or clear them all via
 'tramp-cleanup-all-connections'.
 
 +++
+*** External methods can now be used in multi-hop connections.
+This is implemented for 'tramp-sh' methods, like "/scp:user@host|sudo::".
+
++++
 *** New command 'tramp-dired-find-file-with-sudo'.
 This command, bound to '@' in Dired, visits the file or directory on the
 recent Dired line with superuser, or root, permissions.
@@ -2126,15 +2284,19 @@ one as before.  This makes them different from 'vc-diff' and
 *** 'diff-apply-hunk' now supports creating and deleting files.
 
 +++
-*** 'diff-apply-hunk' and 'diff-apply-buffer' now consider the region.
-If the region is active, these commands now apply all hunks that the
-region overlaps.  Otherwise, they have their existing behavior.
+*** Diff mode's application and killing commands now consider the region.
+If the region is active, 'diff-apply-hunk', 'diff-apply-buffer' and
+'diff-hunk-kill' now apply or kill all hunks that the region overlaps.
+Otherwise, they have their existing behavior.
 
 +++
 *** 'diff-apply-buffer' can reverse-apply.
 With a prefix argument, it now reverse-applies hunks.
 This matches the existing prefix argument to 'diff-apply-hunk'.
 
+---
+*** 's' is now bound to 'diff-split-hunk' in read-only Diff mode buffers.
+
 ** Ediff
 
 +++
@@ -2346,6 +2508,12 @@ When point is between indentation, the command
 deletes the text in the region and deactivates the mark if Transient
 Mark mode is enabled, the mark is active, and prefix argument is 1.
 
+---
+*** 'python-eldoc-function-timeout' now accepts floating-point numbers.
+To allow for finer-grained adjustment of timeout for
+'python-eldoc-function', 'python-eldoc-function-timeout' now accepts
+floating-point numbers as well as integers.
+
 ** Tmm Menubar
 
 ---
@@ -2355,7 +2523,7 @@ The hardcoded '^' shortcut gets you back to the previous menu.
 ---
 *** New user option 'tmm-shortcut-inside-entry'.
 When non-nil, highlight the character shortcut in the menu entry's
-string instead of preprending it and 'tmm-mid-prompt' to said entry.
+string instead of prepending it and 'tmm-mid-prompt' to said entry.
 
 ** Foldout
 
@@ -2402,6 +2570,25 @@ appearance of the list can be customized with the new faces
 ** VC
 
 +++
+*** Printing root branch logs has moved to 'C-x v b L'.
+Previously, the command to print the root log for a branch was bound to
+'C-x v b l'.  It has now been renamed from 'vc-print-branch-log' to
+'vc-print-root-branch-log', and bound to 'C-x v b L'.  This is more
+consistent with the rest of the 'C-x v' keymap, and makes room for a new
+fileset-specific branch log command.
+
+To undo this change you can use
+
+    (keymap-global-set "C-x v b l" #'vc-print-root-branch-log)
+    (with-eval-after-load 'vc-dir
+      (keymap-set vc-dir-mode-map "b l" #'vc-print-root-branch-log))
+
++++
+*** New command 'C-x v b l' ('vc-print-fileset-branch-log').
+This command prints the log of VC changes to the current fileset on
+another branch.
+
++++
 *** New commands to handle repositories with multiple working trees.
 Some VCS support more than one working tree with the same backing
 revisions store, such as with Git's 'worktree' subcommand and
@@ -2447,8 +2634,15 @@ cloning, or prompts for that, too.
 When the argument is non-nil, the function switches to a buffer visiting
 the directory into which the repository was cloned.
 
++++
+*** 'vc-revert' is now bound to '@' in VC Directory.
+
++++
+*** 'vc-revert' is now additionally bound to 'C-x v @'.
+This is in addition to 'C-x v u'.
+
 ---
-*** 'C-x v u' ('vc-revert') now works on directories listed in VC Directory.
+*** 'vc-revert' now works on directories listed in VC Directory.
 Reverting a directory means reverting changes to all files inside it.
 
 +++
@@ -2564,8 +2758,8 @@ relevant buffers before generating the contents of a VC Directory buffer
 *** New commands to report incoming and outgoing diffs.
 'vc-root-diff-incoming' and 'vc-root-diff-outgoing' report diffs of all
 the changes that would be pulled and would be pushed, respectively.
-They are the diff analogues of the existing commands 'vc-log-incoming'
-and 'vc-log-outgoing'.
+They are the diff analogues of the existing commands
+'vc-root-log-incoming' and 'vc-root-log-outgoing'.
 
 In particular, 'vc-root-diff-outgoing' is useful as a way to preview
 your push and ensure that all and only the changes you intended to
@@ -2575,12 +2769,15 @@ include were committed and will be pushed.
 current VC fileset.
 
 +++
-*** New commands to report diffs of outstanding changes.
-'C-x v B =' ('vc-diff-outgoing-base') and 'C-x v B D'
+*** New commands to report information about outstanding changes.
+'C-x v T =' ('vc-diff-outgoing-base') and 'C-x v T D'
 ('vc-root-diff-outgoing-base') report diffs of changes since the merge
 base with the remote branch, including uncommitted changes.
-They are useful to view all outstanding (unmerged, unpushed) changes on
-the current branch.
+'C-x v T l' ('vc-log-outgoing-base') and 'C-x v T L'
+('vc-root-log-outgoing-base') show the corresponding revision logs.
+These are useful to view all outstanding (unmerged, unpushed) changes on
+the current branch.  They are also available as 'T =', 'T D', 'T l' and
+'T L' in VC Directory buffers.
 
 +++
 *** New user option 'vc-use-incoming-outgoing-prefixes'.
@@ -2588,16 +2785,16 @@ If this is customized to non-nil, 'C-x v I' and 'C-x v O' become prefix
 commands, such that the new incoming and outgoing commands have global
 bindings:
 
-- 'C-x v I L' is bound to 'vc-log-incoming'
+- 'C-x v I L' is bound to 'vc-root-log-incoming'
 - 'C-x v I D' is bound to 'vc-root-diff-incoming'
-- 'C-x v O L' is bound to 'vc-log-outgoing'
+- 'C-x v O L' is bound to 'vc-root-log-outgoing'
 - 'C-x v O D' is bound to 'vc-root-diff-outgoing'.
 
 +++
 *** New display of outgoing revisions count in VC Directory.
 If there are outgoing revisions, VC Directory now includes a count of
 how many in its headers, to remind you to push them.
-You can disable this by customizing vc-dir-show-outgoing-count to nil.
+You can disable this by customizing 'vc-dir-show-outgoing-count' to nil.
 
 +++
 *** New user option 'vc-async-checkin' to enable async checkin operations.
@@ -2672,8 +2869,35 @@ the log entry.  If there are marked revisions, it copies the IDs of
 those, instead.
 
 ---
+*** New commands 'vc-print-change-log' and 'vc-print-root-change-log'.
+These are just like 'vc-print-log' and 'vc-print-root-log' except that
+they have a different prefix argument that some users may prefer.
+With a prefix argument, these commands prompt for a branch, tag or other
+reference to a revision to log, and a maximum number of revisions to
+print.  If you find this prefix argument more useful, or more mnemonic,
+than the prefix arguments that 'vc-print-log' and 'vc-print-root-log'
+already have, consider replacing the default global bindings, like this:
+
+    (keymap-global-set "C-x v l" #'vc-print-change-log)
+    (keymap-global-set "C-x v L" #'vc-print-root-change-log)
+
+---
 *** New command alias 'vc-restore' for 'vc-revert'.
 
+---
+*** The 'diff-restrict-view' command is disabled by default.
+This command is Diff mode's specialized 'narrow-to-region'.
+'narrow-to-region' has long been disabled by default, so for
+consistency, 'diff-restrict-view' is now too.
+To enable it again, use 'M-x enable-command'.
+
+---
+*** 'C-x v !' has its own input history.
+
+---
+*** 'C-u C-x v +' and 'C-u C-x v P' for Git have an input history.
+This was already in place for Mercurial.
+
 ** Package
 
 +++
@@ -2709,6 +2933,11 @@ When called from Lisp, it now only accepts a symbol.
 When invoking the command in a Dired buffer with marked files,
 the command will only copy those files.
 
+---
+*** 'package-isolate' can now also install packages.
+If a package is missing, 'package-isolate' will fetch the missing
+tarballs and prepare them to be activated in the sub-process.
+
 +++
 *** package-x.el is now obsolete.
 
@@ -2732,6 +2961,14 @@ packages.
 ---
 *** Uninstalling a package now removes its directory from 'load-path'.
 
++++
+*** Packages can be reviewed before installation or upgrade.
+The user option 'package-review-policy' can configure which packages
+the user should be allowed to review before any processing takes place.
+The package review can include reading the downloaded source code,
+presenting a diff between the downloaded code and a previous
+installation or displaying a ChangeLog.
+
 ** Rcirc
 
 +++
@@ -2809,7 +3046,7 @@ used to write notes.
 ---
 *** New handler that appends remember data in directory.
 The 'remember-append-in-data-directory' handler appends remember data in
-a file, that file being choosen by the user through the minibuffer.
+a file, that file being chosen by the user through the minibuffer.
 
 ---
 *** New prefix map for remember commands.
@@ -2842,6 +3079,10 @@ Meant to be given a global binding convenient to the user.  Example:
 
 ** Icomplete
 
+*** New key 'M-j' for 'icomplete-mode' and 'icomplete-vertical-mode'.
+Like 'M-j' in 'fido-mode', it can exit the minibuffer with a selected
+candidate even when 'icomplete-show-matches-on-no-input' is non-nil.
+
 *** New user options for 'icomplete-vertical-mode'.
 New user options have been added to enhance 'icomplete-vertical-mode':
 
@@ -3138,6 +3379,11 @@ each refresh.  The sort direction can be controlled by using a cons cell
 of a format string and a boolean.  Alternatively, a sorting function can
 be provided directly.
 
+---
+*** New user option 'display-time-help-echo-format'.
+This option controls the format of the help echo when hovering over the
+time.
+
 ** Fill
 
 +++
@@ -3248,7 +3494,7 @@ the source, or to 'antlr-v3' otherwise.
 
 *** New command 'antlr-v4-mode' is a derived mode of 'antlr-mode'.
 It sets 'antlr-tool-version' to value 'antlr-v4', and is automatically
-used for files with extension "g4".
+used for files with extension ".g4".
 
 *** The variable 'antlr-language' is now used more generally.
 The variable has a symbol as value which determines which of the
@@ -3261,8 +3507,8 @@ ObjC, Python and Ruby, additional to Java and Cpp.
 
 *** New user option 'antlr-run-tool-on-buffer-file'.
 Command 'antlr-run-tool' now usually runs on the file for the current
-buffer.  Customize this user option to have value ' nil' to get the
-previous behavior back.
+buffer.  Customize this user option to nil to get the previous behavior
+back.
 
 ** Hi Lock
 
@@ -3272,6 +3518,10 @@ If an active region exists, the commands 'hi-lock-line-face-buffer' and
 'hi-lock-face-phrase-buffer' now use its contents as their default
 value.  Previously, only 'hi-lock-face-buffer' supported this.
 
+** Shadowfile
+
+*** 'shadow-info-buffer' and 'shadow-todo-buffer' use ephemeral buffer names now.
+
 
 * New Modes and Packages in Emacs 31.1
 
@@ -3311,6 +3561,21 @@ This library provides functions to throttle or debounce Emacs Lisp
 functions.  This is useful for corralling overeager code that is slow
 and blocks Emacs, or does not provide ways to limit how often it runs.
 
++++
+** New mode 'system-taskbar-mode'.
+This is a global minor mode and companion functions that integrate Emacs
+with system GUI taskbars (also called docks or launchers or something
+similar) to display a taskbar icon "badge" overlay, a progress bar
+report overlay, alert the user that an Emacs session needs attention,
+often by flashing or bouncing the Emacs application icon.  Supported
+capable systems are GNU/Linux via D-Bus, macOS/GNUstep 10.5+, MS-Windows
+7+.
+
+On GNU/Linux systems, shell extensions or similar helpers such as
+"dash-to-dock" may be required.  See
+<https://extensions.gnome.org/extension/307/dash-to-dock/> and
+<https://wiki.ubuntu.com/Unity/LauncherAPI>.
+
 
 * Incompatible Lisp Changes in Emacs 31.1
 
@@ -3421,6 +3686,12 @@ separator, are also supported.
 ---
 ** The obsolete variable 'load-convert-to-unibyte' has been removed.
 
+---
+** The experimental variable 'binary-as-unsigned' has been removed.
+Instead of '(let ((binary-as-unsigned t)) (format "%x" N))' you can use
+'(format "%x" (logand N MASK))' where MASK is for the desired word size,
+e.g., #x3fffffffffffffff for typical Emacs fixnums.
+
 +++
 ** The 'exec-path' variable now uses same default PATH as other programs.
 That is, if the PATH environment variable is unset or empty, 'exec-path'
@@ -3432,7 +3703,7 @@ on GNU/Linux systems.
 The display optimization where the combination 'TAB' characters +
 'BACKSPACE' is used to move to a position on a TTY frame is now disabled
 by default and controlled by this variable; it can be set to non-nil
-to keep the old behavior.  This change is to accomodate screen
+to keep the old behavior.  This change is to accommodate screen
 readers.
 
 ---
@@ -3465,10 +3736,28 @@ display time or even cause Emacs to hang trying to display such a face.
 Affected APIs include 'defface', 'set-face-attribute', their callers,
 and other similar functions.
 
+---
+** 'help-setup-xref' now re-enables the major mode of the Help buffer.
+As a result, in many cases the buffer will be read-only afterwards.
+This should not cause any trouble as long as the actual buffer
+modification takes place inside 'with-help-window' or
+'with-output-to-temp-buffer' after the call to 'help-setup-xref'.
+
+---
+** Xref commands don't automatically suggest to visit a tags table anymore.
+When no tags file is loaded, symbol completion just won't provide any
+suggestions.  So the 'M-?' command now works without a tags table.  And
+the 'M-.' will show a message describing the several built-in options
+that will provide an Xref backend when used.
 
 * Lisp Changes in Emacs 31.1
 
 +++
+** New function 'garbage-collect-heapsize'.
+Same as 'garbage-collect' but just returns the info from the last GC
+without performing a collection.
+
++++
 ** Improve 'replace-region-contents' to accept more forms of sources.
 It has been promoted from 'subr-x' to the C code.
 You can now directly pass it a string or a buffer rather than a function.
@@ -3599,12 +3888,23 @@ without marking it as automatically buffer-local.
 ** The obsolete face attribute ':reverse-video' has been removed.
 Use ':inverse-video' instead.
 
+** D-Bus
+
 +++
-** Support interactive D-Bus authorization.
+*** Support interactive D-Bus authorization.
 A new ':authorizable t' parameter has been added to 'dbus-call-method'
 and 'dbus-call-method-asynchronously' to allow the user to interactively
 authorize the invoked D-Bus method (for example via polkit).
 
++++
+*** Support D-Bus file descriptor manipulation.
+A new ':keep-fd' parameter has been added to 'dbus-call-method' and
+'dbus-call-method-asynchronously' to instruct D-Bus to keep a file
+descriptor, which has been returned by a method call, internally.  The
+functions 'dbus--fd-open', 'dbus--fd-close' and 'dbus--registered-fds'
+implement managing these file descriptors.  See the Info node "(dbus)
+File Descriptors" for details.
+
 ** The customization group 'wp' has been removed.
 It has been obsolete since Emacs 26.1.  Use the group 'text' instead.
 
@@ -3613,6 +3913,14 @@ It has been obsolete since Emacs 26.1.  Use the group 'text' instead.
 If supplied, 'string-pixel-width' will use any face remappings from
 BUFFER when computing the string's width.
 
++++
+** New function 'truncate-string-pixelwise'.
+This function truncates a string to the specified maximum number of
+pixels rather than by characters, as in 'truncate-string-to-width', and
+respects face remappings if BUFFER is specified.  You can also specify
+an optional ellipsis string to append, similar to
+'truncate-string-to-width'.
+
 ---
 ** New macro 'with-work-buffer'.
 This macro is similar to the already existing macro 'with-temp-buffer',
@@ -3708,6 +4016,13 @@ Binding 'inhibit-message' to a non-nil value will now suppress both
 the display of messages and the clearing of the echo area, such as
 caused by calling 'message' with a nil argument.
 
+---
+** 'minibuffer-message' no longer blocks while displaying message.
+'minibuffer-message' now uses a timer to clear the message printed to
+the minibuffer, instead of waiting with 'sit-for' and then clearing it.
+This makes 'minibuffer-message' usable in Lisp programs which want to
+print a message and then continue to perform work.
+
 ** Special Events
 
 +++
@@ -3775,6 +4090,26 @@ When the theme is set on PGTK, Android, or MS-Windows systems,
 variable 'toolkit-theme' as either symbol 'dark' or 'light', but may be
 extended to encompass other toolkit-specific symbols in the future.
 
+** Progress reporter
+
++++
+*** Progress reporter callbacks.
+'make-progress-reporter' now accepts optional arguments UPDATE-CALLBACK,
+called on progress steps, and DONE-CALLBACK, called when the progress
+reporter is done.  See the 'make-progress-reporter' docstring for a full
+specification of these new optional arguments.
+
++++
+*** Progress reporter context.
+'make-progress-reporter' now accepts the optional argument CONTEXT,
+which if it is the symbol 'async', inhibits updates in the echo area
+when it is busy.  This is useful, for example, if you want to monitor progress
+of an inherently asynchronous command such as 'compile'.
+
+** Binary format specifications '%b' and '%B' added.
+These produce the binary representation of a number.
+'%#b' and '%#B' prefix the bits with '0b' and '0B', respectively.
+
 
 * Changes in Emacs 31.1 on Non-Free Operating Systems
 
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 431bf3490a0..793dc2a3014 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
 
-Copyright (C) 1985-1986, 2006-2025 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2006-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index 68aba7b00df..bf559981c04 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
 
-Copyright (C) 1988, 2006-2025 Free Software Foundation, Inc.
+Copyright (C) 1988, 2006-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 1cd69144dc5..4d13ee9a923 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
 
-Copyright (C) 1993-1995, 2001, 2006-2025 Free Software Foundation, Inc.
+Copyright (C) 1993-1995, 2001, 2006-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index 1aa093f0957..36ccfd64b61 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
 
-Copyright (C) 1999-2001, 2006-2025 Free Software Foundation, Inc.
+Copyright (C) 1999-2001, 2006-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 2b6b6084c6e..50f195b635a 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
 
-Copyright (C) 2000-2025 Free Software Foundation, Inc.
+Copyright (C) 2000-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 9d3c5b97dde..41a9718c0f3 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index bf89e62cadf..624331f0370 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2007-2025 Free Software Foundation, Inc.
+Copyright (C) 2007-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index e2614767a61..4a5ac24cfff 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2010-2025 Free Software Foundation, Inc.
+Copyright (C) 2010-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
diff --git a/etc/NEWS.25 b/etc/NEWS.25
index 0aa49c68153..1801020619e 100644
--- a/etc/NEWS.25
+++ b/etc/NEWS.25
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2014-2025 Free Software Foundation, Inc.
+Copyright (C) 2014-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
diff --git a/etc/NEWS.26 b/etc/NEWS.26
index 471c48f1eb6..04909314257 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2016-2025 Free Software Foundation, Inc.
+Copyright (C) 2016-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'.
diff --git a/etc/NEWS.27 b/etc/NEWS.27
index d3f47a356a7..cd8c7d1ec9f 100644
--- a/etc/NEWS.27
+++ b/etc/NEWS.27
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2017-2025 Free Software Foundation, Inc.
+Copyright (C) 2017-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'.
diff --git a/etc/NEWS.28 b/etc/NEWS.28
index cf61e762c88..b8fcc731b19 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2019-2025 Free Software Foundation, Inc.
+Copyright (C) 2019-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'.
diff --git a/etc/NEWS.29 b/etc/NEWS.29
index 00641ef1e16..378e5ad48a2 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2021-2025 Free Software Foundation, Inc.
+Copyright (C) 2021-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'.
diff --git a/etc/NEWS.30 b/etc/NEWS.30
index dfe6c5cafe6..3789456f941 100644
--- a/etc/NEWS.30
+++ b/etc/NEWS.30
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2022-2025 Free Software Foundation, Inc.
+Copyright (C) 2022-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'.
@@ -2807,7 +2807,7 @@ parsers with that tag.  Note that passing nil as tag doesn't mean return
 all parsers, but rather "all parsers with no tags".
 
 *** New variable 'treesit-primary-parser'.
-This variable should be set by multi-langauge major modes before calling
+This variable should be set by multi-language major modes before calling
 'treesit-major-mode-setup', in order for tree-sitter integration
 functionalities to operate correctly.
 
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index 13b7c11e738..58726c0cc8b 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -1,4 +1,4 @@
-Copyright (C) 2008-2025 Free Software Foundation, Inc.
+Copyright (C) 2008-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 This file contains information about GNU Emacs on "Nextstep" platforms.
diff --git a/etc/NXML-NEWS b/etc/NXML-NEWS
index 5bb887063ce..c7042115394 100644
--- a/etc/NXML-NEWS
+++ b/etc/NXML-NEWS
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2025 Free Software Foundation, Inc.
+Copyright (C) 2007-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 1a73eea5c91..3302f50ec69 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -6,7 +6,7 @@ ORG NEWS -- history of user-visible changes.   -*- mode: org; coding: utf-8 -*-
 #+LINK: msg https://list.orgmode.org/%s/
 #+LINK: git https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=%s
 
-Copyright (C) 2012-2025 Free Software Foundation, Inc.
+Copyright (C) 2012-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
@@ -323,7 +323,7 @@ This is no longer the case. ~display-buffer-alist~ is fully obeyed.
 
 ~org-switch-to-buffer-other-window~ and ~org-no-popups~ are now deprecated.
 
-*** Asynchronous code evaluatation in ~ob-shell~
+*** Asynchronous code evaluation in ~ob-shell~
 
 Running shell blocks with the ~:session~ header freezes Emacs until
 execution completes.  The new ~:async~ header allows users to continue
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index ff9c0105cb3..340e99c0425 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1,6 +1,6 @@
 Known Problems with GNU Emacs
 
-Copyright (C) 1987-1989, 1993-1999, 2001-2025 Free Software Foundation,
+Copyright (C) 1987-1989, 1993-1999, 2001-2026 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
@@ -1382,6 +1382,19 @@ these problems by disabling XIM in your X resources:
 
   Emacs.useXIM: false
 
+** When the compose key is pressed, a small window appears that won't go away
+
+In some circumstances, pressing the compose key under X pops up a small
+character-selection window next to the cursor, which can be moved but
+not closed; it disappears when some window manager operation is
+performed, like creating or deleting a window.  You can prevent this
+window from appearing by completely disabling the X input method (XIM).
+If this is acceptable to you, you should set the 'XMODIFIERS'
+environment variable to the value '@im=none', and export it before
+calling Emacs, for example by invoking Emacs like so:
+
+  env XMODIFIERS=@im=none emacs
+
 ** On Haiku, BeCJK doesn't work properly with Emacs
 
 Some popular Haiku input methods such BeCJK are known to behave badly
diff --git a/etc/README b/etc/README
index f7187c0e084..94676cfb226 100644
--- a/etc/README
+++ b/etc/README
@@ -7,5 +7,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 File: emacs.icon
   Author: Sun Microsystems, Inc
-  Copyright (C) 1999, 2001-2025 Free Software Foundation, Inc.
+  Copyright (C) 1999, 2001-2026 Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/TERMS b/etc/TERMS
index 8caa6f39197..7835e09715f 100644
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -1,4 +1,4 @@
-Copyright (C) 1999, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2026 Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 This file describes what you must or might want to do to termcap entries
diff --git a/etc/TODO b/etc/TODO
index 40cfbbb85d7..2ee6b0e8eb1 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -1,6 +1,6 @@
 Emacs TODO List                                                   -*-outline-*-
 
-Copyright (C) 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 2001-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/etc/charsets/README b/etc/charsets/README
index 1ad5b6335a9..a751f817f57 100644
--- a/etc/charsets/README
+++ b/etc/charsets/README
@@ -1,6 +1,6 @@
 # README file for charset mapping files in this directory.
 
-# Copyright (C) 2003-2025 Free Software Foundation, Inc.
+# Copyright (C) 2003-2026 Free Software Foundation, Inc.
 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 39d9c3a923c..c2a0967c6a5 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -735,7 +735,7 @@ Compilation segmentation fault at Thu Jul 13 10:55:49
 Compilation finished at Thu Jul 21 15:02:15
 
 
-Copyright (C) 2004-2025 Free Software Foundation, Inc.
+Copyright (C) 2004-2026 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/edt-user.el b/etc/edt-user.el
index 6108893272c..033e6067a0e 100644
--- a/etc/edt-user.el
+++ b/etc/edt-user.el
@@ -1,6 +1,6 @@
 ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation -*- lexical-binding: t -*-
 
-;; Copyright (C) 1986, 1992-1993, 2000-2025 Free Software Foundation,
+;; Copyright (C) 1986, 1992-1993, 2000-2026 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index 2615cd87408..73bb71644b0 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -1,6 +1,6 @@
 # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps
 
-# Copyright (C) 2005-2025 Free Software Foundation, Inc.
+# Copyright (C) 2005-2026 Free Software Foundation, Inc.
 
 # Author: Noah Friedman <friedman@splode.com>
 # Created: 2005-04-28
diff --git a/etc/emacs.metainfo.xml b/etc/emacs.metainfo.xml
index 8414e9ac6ba..e6f748cd3b0 100644
--- a/etc/emacs.metainfo.xml
+++ b/etc/emacs.metainfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014-2025 Free Software Foundation, Inc. -->
+<!-- Copyright (C) 2014-2026 Free Software Foundation, Inc. -->
 <component type="desktop-application">
  <id>org.gnu.emacs</id>
  <metadata_license>GFDL-1.3+</metadata_license>
diff --git a/etc/emacs_lldb.py b/etc/emacs_lldb.py
index c7cd0577902..2d2dd00c02a 100644
--- a/etc/emacs_lldb.py
+++ b/etc/emacs_lldb.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2022-2025 Free Software Foundation, Inc.
+# Copyright (C) 2022-2026 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/etc/enriched.txt b/etc/enriched.txt
index 23b34e26d14..b4559c1d6aa 100644
--- a/etc/enriched.txt
+++ b/etc/enriched.txt
@@ -259,7 +259,7 @@ it.</indent>
 
 
 
-Copyright (C) 1995, 1997, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1995, 1997, 2001-2026 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/forms/forms-d2.el b/etc/forms/forms-d2.el
index 5118d960bf8..8241f6f9bb9 100644
--- a/etc/forms/forms-d2.el
+++ b/etc/forms/forms-d2.el
@@ -1,6 +1,6 @@
 ;;; forms-d2.el --- demo forms-mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1991, 1994-1997, 2001-2025 Free Software Foundation,
+;; Copyright (C) 1991, 1994-1997, 2001-2026 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index 89fcc988f9a..3dd6e088169 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -24,7 +24,7 @@ was done by moi, yours truly, your humble servant, Lars Magne
 Ingebrigtsen.  If you have a WWW browser, you can investigate to your
 heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
-;; Copyright (C) 1995, 2001-2025 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2026 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
diff --git a/etc/grep.txt b/etc/grep.txt
index b529034f046..3977cb2b2c7 100644
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -104,7 +104,7 @@ grep -nH -e "xyzxyz" ../info/*
 
 * Miscellaneous
 
-Copyright (C) 2005-2025 Free Software Foundation, Inc.
+Copyright (C) 2005-2026 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/images/README b/etc/images/README
index a439c0c9348..a36f0a8a0ce 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -27,19 +27,19 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 File: mh-logo.xpm
   Author: Satyaki Das
-  Copyright (C) 2003-2025 Free Software Foundation, Inc.
+  Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
 Files: gnus.pbm
   Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2003-2025 Free Software Foundation, Inc.
+  Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
 Files: splash.png, splash.svg, splash.pbm, splash.xpm
   Author: Francesc Rocher <francesc.rocher@gmail.com>
-  Copyright (C) 2003-2025 Free Software Foundation, Inc.
+  Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
 Files: checked.xpm, unchecked.xpm
   Author: Chong Yidong <cyd@stupidchicken.com>
-  Copyright (C) 2003-2025 Free Software Foundation, Inc.
+  Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
 
 * The following icons are from GTK+ 2.x.  They are not part of Emacs, but
diff --git a/etc/images/custom/README b/etc/images/custom/README
index 7f1d2e313fb..59533e9c45e 100644
--- a/etc/images/custom/README
+++ b/etc/images/custom/README
@@ -6,5 +6,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm
 Author: Juri Linkov
-Copyright (C) 2008-2025 Free Software Foundation, Inc.
+Copyright (C) 2008-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/ezimage/README b/etc/images/ezimage/README
index d9521a1436b..456125140df 100644
--- a/etc/images/ezimage/README
+++ b/etc/images/ezimage/README
@@ -7,5 +7,5 @@ Files: bits.xpm bitsbang.xpm box-minus.xpm box-plus.xpm
        tag-gt.xpm tag-minus.xpm tag-plus.xpm tag-type.xpm tag-v.xpm
        tag.xpm unlock.xpm
 Author: Eric M. Ludlam
-Copyright (C) 1999-2025 Free Software Foundation, Inc.
+Copyright (C) 1999-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/gnus/README b/etc/images/gnus/README
index 3e415fdfd7e..77da3eaf637 100644
--- a/etc/images/gnus/README
+++ b/etc/images/gnus/README
@@ -7,7 +7,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 Files: important.xpm, unimportant.xpm
 Author: Simon Josefsson <simon@josefsson.org>
-Copyright (C) 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 2001-2026 Free Software Foundation, Inc.
 
 Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
   describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm
@@ -21,11 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
   unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm
   uu-post.pbm uu-post.xpm
 Author: Luis Fernandes <elf@ee.ryerson.ca>
-Copyright (C) 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 2001-2026 Free Software Foundation, Inc.
 
 Files: gnus.png, gnus.svg
   Author: Francesc Rocher <rocher@member.fsf.org>
-  Copyright (C) 2008-2025 Free Software Foundation, Inc.
+  Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
 
 * The following icons are from GNOME 2.x. They are not part of Emacs,
diff --git a/etc/images/gnus/gnus-pointer.svg b/etc/images/gnus/gnus-pointer.svg
index 3252c156be4..7d3822b1d04 100644
--- a/etc/images/gnus/gnus-pointer.svg
+++ b/etc/images/gnus/gnus-pointer.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
 
-   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+   Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
    Author: Francesc Rocher <f.rocher@member.fsf.org>
 
diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg
index 621f145cdd6..a0b3fc782e9 100644
--- a/etc/images/gnus/gnus.svg
+++ b/etc/images/gnus/gnus.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
 
-   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+   Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
    Author: Francesc Rocher <f.rocher@member.fsf.org>
 
diff --git a/etc/images/gud/README b/etc/images/gud/README
index cde9e76d85a..7d518ebfadf 100644
--- a/etc/images/gud/README
+++ b/etc/images/gud/README
@@ -1,7 +1,7 @@
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 The following icons were created by Nick Roberts <nickrob@snap.net.nz>.
-Copyright (C) 2002-2025 Free Software Foundation, Inc.
+Copyright (C) 2002-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm
@@ -31,7 +31,7 @@ their copyright assignment included the icons.
 The following icons are converted from the Insight Windows style icon
 set in src/gdb/gdbtk/library/images2.
 
-Copyright (C) 2002-2025 Free Software Foundation, Inc.
+Copyright (C) 2002-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   cont.pbm and cont.xpm were converted from continue.gif
@@ -47,7 +47,7 @@ License: GNU General Public License version 3 or later (see COPYING)
 The following icons are created from the Insight Windows style icon
 set in src/gdb/gdbtk/library/images2.
 
-Copyright (C) 2002-2025 Free Software Foundation, Inc.
+Copyright (C) 2002-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   rcont.xpm rfinish.xpm
diff --git a/etc/images/icons/README b/etc/images/icons/README
index 9d6ecd5eedb..27ee2d58145 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -6,7 +6,7 @@ Files: hicolor/16x16/apps/emacs.png hicolor/24x24/apps/emacs.png
        hicolor/scalable/mimetypes/emacs-document.svg
 
 Author: Nicolas Petton <nicolas@petton.fr>
-Copyright (C) 2015-2025 Free Software Foundation, Inc.
+Copyright (C) 2015-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png
@@ -14,7 +14,7 @@ Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png
        hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg
 
 Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
-Copyright (C) 2015-2025 Free Software Foundation, Inc.
+Copyright (C) 2015-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 
@@ -22,7 +22,7 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
        hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
 
 Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
-Copyright (C) 2015-2025 Free Software Foundation, Inc.
+Copyright (C) 2015-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 Files: allout-widgets-dark-bg/closed.png
@@ -71,5 +71,5 @@ Files: allout-widgets-dark-bg/closed.png
        allout-widgets-light-bg/through-descender.xpm
 
 Author: Ken Manheimer <ken.manheimer@gmail.com>
-Copyright (C) 2015-2025 Free Software Foundation, Inc.
+Copyright (C) 2015-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/icons/hicolor/scalable/apps/emacs.svg b/etc/images/icons/hicolor/scalable/apps/emacs.svg
index 38680248ecf..c76e9da0ca1 100644
--- a/etc/images/icons/hicolor/scalable/apps/emacs.svg
+++ b/etc/images/icons/hicolor/scalable/apps/emacs.svg
@@ -15,7 +15,7 @@
      id="metadata70"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><!-- Gnu Emacs Icon
-   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+   Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
    Author: Nicolas Petton <nicolas@petton.fr>
 
diff --git a/etc/images/icons/hicolor/scalable/apps/emacs23.svg b/etc/images/icons/hicolor/scalable/apps/emacs23.svg
index 0cd6ec5616f..5fbeb3488bd 100644
--- a/etc/images/icons/hicolor/scalable/apps/emacs23.svg
+++ b/etc/images/icons/hicolor/scalable/apps/emacs23.svg
@@ -10,7 +10,7 @@
    id="svg4768"
    xml:space="preserve">
 <!-- Gnu Emacs Icon
-   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+   Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
index 2dfd58859d6..ad6e24a4ba1 100644
--- a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
+++ b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Document Icon
 
-   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+   Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/etc/images/mpc/README b/etc/images/mpc/README
index d6a28741b91..53e3cb5af2e 100644
--- a/etc/images/mpc/README
+++ b/etc/images/mpc/README
@@ -2,5 +2,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 Files: add.xpm ffwd.xpm next.xpm pause.xpm play.xpm prev.xpm rewind.xpm stop.xpm
 Author: Stefan Monnier <monnier@iro.umontreal.ca>
-Copyright (C) 2009-2025 Free Software Foundation, Inc.
+Copyright (C) 2009-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/newsticker/README b/etc/images/newsticker/README
index 55e9573f354..f8af7962bb9 100644
--- a/etc/images/newsticker/README
+++ b/etc/images/newsticker/README
@@ -4,5 +4,5 @@ Files: browse-url.xpm get-all.xpm mark-immortal.xpm mark-read.xpm
        narrow.xpm next-feed.xpm next-item.xpm prev-feed.xpm
        prev-item.xpm rss-feed.png rss-feed.svg update.xpm
 Author: Ulf Jasper
-Copyright (C) 2011-2025 Free Software Foundation, Inc.
+Copyright (C) 2011-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/package-menu/README b/etc/images/package-menu/README
index 6b6414689c2..7b74e50634f 100644
--- a/etc/images/package-menu/README
+++ b/etc/images/package-menu/README
@@ -2,7 +2,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES -*- coding: utf-8 -*-
 
 The following icons were created by Elías Gabriel Pérez <eg642616@gmail.com>
 based on package-x-generic icon from GNOME 2.x.
-Copyright (C) 2025 Free Software Foundation, Inc.
+Copyright (C) 2025-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   delete.pbm  delete.xpm
diff --git a/etc/images/smilies/README b/etc/images/smilies/README
index cf7399391ba..0053c174fb8 100644
--- a/etc/images/smilies/README
+++ b/etc/images/smilies/README
@@ -3,5 +3,5 @@ Files: blink.pbm blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm
        sad.xpm smile.pbm smile.xpm wry.pbm wry.xpm
 Authors: Reiner Steib, Simon Josefsson, Kai Grossjohann, Alex
          Schroeder, Oliver Scholz, Per Abrahamsen, Kim F. Storm.
-Copyright (C) 1999-2025 Free Software Foundation, Inc.
+Copyright (C) 1999-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/smilies/grayscale/README b/etc/images/smilies/grayscale/README
index e768d9c3ae7..c8355a63085 100644
--- a/etc/images/smilies/grayscale/README
+++ b/etc/images/smilies/grayscale/README
@@ -3,5 +3,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm
        frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
        smile.xpm wry.xpm
 Author: Adam Sjøgren
-Copyright (C) 2007-2025 Free Software Foundation, Inc.
+Copyright (C) 2007-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/smilies/medium/README b/etc/images/smilies/medium/README
index e768d9c3ae7..c8355a63085 100644
--- a/etc/images/smilies/medium/README
+++ b/etc/images/smilies/medium/README
@@ -3,5 +3,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm
        frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
        smile.xpm wry.xpm
 Author: Adam Sjøgren
-Copyright (C) 2007-2025 Free Software Foundation, Inc.
+Copyright (C) 2007-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/splash.svg b/etc/images/splash.svg
index 4305bce95e1..b0c4497a58c 100644
--- a/etc/images/splash.svg
+++ b/etc/images/splash.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
 
-   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+   Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
    Author: Francesc Rocher <francesc.rocher@gmail.com>
    Based on the original work by Luis Fernandes <elf@ee.ryerson.ca>
diff --git a/etc/images/symbols/README b/etc/images/symbols/README
index bcce6fc1f98..ca2b562549c 100644
--- a/etc/images/symbols/README
+++ b/etc/images/symbols/README
@@ -4,7 +4,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 Files: *.svg
 Author: Yuan Fu <casouri@gmail.com>
-Copyright (C) 2023-2025 Free Software Foundation, Inc.
+Copyright (C) 2023-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 How I made these icons: I made them with Figma, and exported them into
@@ -44,7 +44,7 @@ Emacsen that cannot display SVG images.
 
 
 
-The behaviour described above for setting the foreground color to match
+The behavior described above for setting the foreground color to match
 the text has changed.  It must now be set to `currentcolor', so the
 above sed commands are now:
 
diff --git a/etc/images/tabs/README b/etc/images/tabs/README
index 2a68577951f..020939a9dbd 100644
--- a/etc/images/tabs/README
+++ b/etc/images/tabs/README
@@ -8,5 +8,5 @@ Author: Juri Linkov <juri@linkov.net>
 Files: close-modified.xpm
 Author: Elías Gabriel Pérez <eg642616@gmail.com>
 
-Copyright (C) 2019-2025 Free Software Foundation, Inc.
+Copyright (C) 2019-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/tree-widget/default/README b/etc/images/tree-widget/default/README
index 732377bd001..c67db3ea751 100644
--- a/etc/images/tree-widget/default/README
+++ b/etc/images/tree-widget/default/README
@@ -5,5 +5,5 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png end-guide.xpm
        no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png
        open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004-2025 Free Software Foundation, Inc.
+Copyright (C) 2004-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/tree-widget/folder/README b/etc/images/tree-widget/folder/README
index c5f0b77b050..3da44c86aff 100644
--- a/etc/images/tree-widget/folder/README
+++ b/etc/images/tree-widget/folder/README
@@ -5,5 +5,5 @@ Files:  close.png close.xpm empty.png empty.xpm end-guide.png
         leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png
         no-handle.xpm open.png open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004-2025 Free Software Foundation, Inc.
+Copyright (C) 2004-2026 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/org.gnu.emacs.defaults.gschema.xml b/etc/org.gnu.emacs.defaults.gschema.xml
index ba7f346413e..b3e7248ce84 100644
--- a/etc/org.gnu.emacs.defaults.gschema.xml
+++ b/etc/org.gnu.emacs.defaults.gschema.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019-2020, 2022-2025 Free Software Foundation, Inc. -->
+<!-- Copyright (C) 2019-2020, 2022-2026 Free Software Foundation, Inc. -->
 <schemalist>
 
   <schema id="org.gnu.emacs.defaults">
diff --git a/etc/org/README b/etc/org/README
index 685396e50a5..af2160bf9d9 100644
--- a/etc/org/README
+++ b/etc/org/README
@@ -1,7 +1,7 @@
 The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
 following copyright information:
 
-Copyright (C) 2010-2025 Free Software Foundation, Inc.
+Copyright (C) 2010-2026 Free Software Foundation, Inc.
 
 These files are part of GNU Emacs.
 
diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index 35540d8c1df..c984bd4d0d6 100644
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -1,7 +1,7 @@
 % === BEGIN ps-print prologue 0
 % version: 6.0
 
-% Copyright (C) 2000-2025 Free Software Foundation, Inc.
+% Copyright (C) 2000-2026 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index d4476cc01fd..802da716b28 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -1,7 +1,7 @@
 % === BEGIN ps-print prologue 1
 % version: 6.1
 
-% Copyright (C) 2000-2025 Free Software Foundation, Inc.
+% Copyright (C) 2000-2026 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 727ed18e2e3..3cc1c9d7a7c 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -1,6 +1,6 @@
 ### Makefile for Emacs refcards
 
-## Copyright (C) 1993-1994, 2001-2025 Free Software Foundation, Inc.
+## Copyright (C) 1993-1994, 2001-2026 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 #
diff --git a/etc/refcards/README b/etc/refcards/README
index d344f82d3a4..9836961def6 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -1,4 +1,4 @@
-Copyright (C) 2013-2025 Free Software Foundation, Inc.
+Copyright (C) 2013-2026 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -82,7 +82,7 @@ it is reproduced here for convenience.
 
 File: gnus-logo.eps, gnus-logo.pdf
   Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2013-2025 Free Software Foundation, Inc.
+  Copyright (C) 2013-2026 Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
 
 
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index aeaaddb7ae5..71e54229c39 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -20,7 +20,7 @@
 % Typical command to format:  tex calccard.tex
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
-% Copyright (C) 1987, 1992, 2001--2025 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1992, 2001--2026 Free Software Foundation, Inc.
 
 % This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index 92d355afd91..1d1e41a8b75 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired -*- coding: utf-8 -*-
 
-% Copyright (C) 2000--2025 Free Software Foundation, Inc.
+% Copyright (C) 2000--2026 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 3eee9ff37ea..764f490a540 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs -*- coding: utf-8 -*-
 
-% Copyright (C) 1987, 1993, 1996--1997, 2001--2025 Free Software
+% Copyright (C) 1987, 1993, 1996--1997, 2001--2026 Free Software
 % Foundation, Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index f8fe0fd3305..6d41b5d3d84 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -1,6 +1,6 @@
 % Title:  GNU Emacs Survival Card -*- coding: utf-8 -*-
 
-% Copyright (C) 2000--2025 Free Software Foundation, Inc.
+% Copyright (C) 2000--2026 Free Software Foundation, Inc.
 
 % Author: Włodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 4ab3c474d7e..b640977aebb 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996, 2000--2025 Free Software Foundation,
+% Copyright (C) 1987, 1993, 1996, 2000--2026 Free Software Foundation,
 % Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index df65c2a5734..97ac0e36f7e 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired
 
-% Copyright (C) 2000--2025 Free Software Foundation, Inc.
+% Copyright (C) 2000--2026 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 
diff --git a/etc/refcards/emacsver.tex.in b/etc/refcards/emacsver.tex.in
index b1061e09c4a..3d09588c782 100644
--- a/etc/refcards/emacsver.tex.in
+++ b/etc/refcards/emacsver.tex.in
@@ -2,4 +2,4 @@
 \def\versionemacs{@majorversion@}           % major version of emacs
 %% This one should not be automatically updated;
 %% M-x set-copyright in admin.el handles it.
-\def\year{2025}                             % latest copyright year
+\def\year{2026}                             % latest copyright year
diff --git a/etc/refcards/es-dired-ref.tex b/etc/refcards/es-dired-ref.tex
index d8a065d4692..db02349336e 100644
--- a/etc/refcards/es-dired-ref.tex
+++ b/etc/refcards/es-dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired
 
-% Copyright (C) 2025 Free Software Foundation, Inc.
+% Copyright (C) 2025--2026 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Spanish translation: Elias Gabriel Perez <eg642616@gmail.com>
diff --git a/etc/refcards/es-refcard.tex b/etc/refcards/es-refcard.tex
index 22343fe1aeb..b742a7fbd98 100644
--- a/etc/refcards/es-refcard.tex
+++ b/etc/refcards/es-refcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 2025 Free Software Foundation, Inc.
+% Copyright (C) 2025--2026 Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Spanish translation: Elias Gabriel Perez <eg642616@gmail.com>
diff --git a/etc/refcards/es-survival.tex b/etc/refcards/es-survival.tex
index f0e64717fc4..de5cad7b6a3 100644
--- a/etc/refcards/es-survival.tex
+++ b/etc/refcards/es-survival.tex
@@ -1,7 +1,7 @@
 %&tex
 % Title:  GNU Emacs Survival Card
 
-% Copyright (C) 2025 Free Software Foundation, Inc.
+% Copyright (C) 2025--2026 Free Software Foundation, Inc.
 
 % Author: Włodek Bzyl <matwb@univ.gda.pl>
 % Spanish translation: Elias Gabriel Perez <eg642616@gmail.com>
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 81e1c94e484..412a469b3c3 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired -*- coding: utf-8 -*-
 
-% Copyright (C) 2000--2025 Free Software Foundation, Inc.
+% Copyright (C) 2000--2026 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % French translation: Eric Jacoboni
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index fc9622d2927..4079a84a9bf 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996--1997, 2001--2025 Free Software
+% Copyright (C) 1987, 1993, 1996--1997, 2001--2026 Free Software
 % Foundation, Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 7de6d6f7611..d8bcef58d6f 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -1,7 +1,7 @@
 %&tex
 % Title:  GNU Emacs Survival Card
 
-% Copyright (C) 2000--2025 Free Software Foundation, Inc.
+% Copyright (C) 2000--2026 Free Software Foundation, Inc.
 
 % Author: Włodek Bzyl <matwb@univ.gda.pl>
 % French translation:  \'Eric Jacoboni <jaco@teaser.fr>, November 2001
diff --git a/etc/refcards/gnus-logo.eps b/etc/refcards/gnus-logo.eps
index 98ff7f93c6f..12c32ae05c7 100644
--- a/etc/refcards/gnus-logo.eps
+++ b/etc/refcards/gnus-logo.eps
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0 EPSF-2.0
-% Copyright (C) 2000-2025 Free Software Foundation, Inc.
+% Copyright (C) 2000-2026 Free Software Foundation, Inc.
 %
 % Author: Luis Fernandes <elf@ee.ryerson.ca>
 %
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index b798296036d..705c342d934 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -120,7 +120,7 @@
 %% Gnus logo by Luis Fernandes.
 \newcommand{\Copyright}{%
   \begin{center}
-    Copyright \copyright\ 1995, 2000, 2002--2025 Free Software Foundation, Inc.\\*
+    Copyright \copyright\ 1995, 2000, 2002--2026 Free Software Foundation, Inc.\\*
   \end{center}
 
   Released under the terms of the GNU General Public License version 3 or later.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 9b3bdddc103..69f67100541 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -21,7 +21,7 @@
 \pdflayout=(1l)
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996--1997, 2001--2025 Free Software
+% Copyright (C) 1987, 1993, 1996--1997, 2001--2026 Free Software
 % Foundation, Inc.
 
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty
index 20e0afe4c31..6b8acf79b1e 100644
--- a/etc/refcards/pdflayout.sty
+++ b/etc/refcards/pdflayout.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2007-2025 Free Software Foundation, Inc.
+% Copyright (C) 2007-2026 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index af4acf7dd33..f06b5d07f3c 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -1,7 +1,7 @@
 %&mex
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1999, 2001--2025 Free Software Foundation, Inc.
+% Copyright (C) 1999, 2001--2026 Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Polish translation: Włodek Bzyl <matwb@univ.gda.pl>
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 4e67652cfbf..97e57d08c23 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996--1997, 2002--2004, 2006--2025 Free
+% Copyright (C) 1987, 1993, 1996--1997, 2002--2004, 2006--2026 Free
 % Software Foundation, Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 20d545271c5..84dab82b967 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996--1997, 2001--2025 Free Software
+% Copyright (C) 1987, 1993, 1996--1997, 2001--2026 Free Software
 % Foundation, Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 58a81677e03..53fa116722e 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -1,4 +1,4 @@
-% Copyright (C) 1997, 2002--2025 Free Software Foundation, Inc.
+% Copyright (C) 1997, 2002--2026 Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Russian translation: Alex Ott <alexott@gmail.com>
@@ -41,7 +41,7 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionemacs}[0]{31} % version of Emacs this is for
-\newcommand{\cyear}[0]{2024}       % copyright year
+\newcommand{\cyear}[0]{2026}       % copyright year
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
   \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 80457560617..545da04475e 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired -*- coding: utf-8 -*-
 
-% Copyright (C) 2000--2025 Free Software Foundation, Inc.
+% Copyright (C) 2000--2026 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index e37784be17b..f250e5331bd 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs -*- coding: utf-8 -*-
 
-% Copyright (C) 1987, 1993, 1996--1997, 2001--2025 Free Software
+% Copyright (C) 1987, 1993, 1996--1997, 2001--2026 Free Software
 % Foundation, Inc.
 
 % Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 889da9667bf..cf6eeb0fb63 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -1,6 +1,6 @@
 % Title:  GNU Emacs Survival Card -*- coding: utf-8 -*-
 
-% Copyright (C) 2000--2025 Free Software Foundation, Inc.
+% Copyright (C) 2000--2026 Free Software Foundation, Inc.
 
 % Author: Włodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 6f13bdbe374..bc90b4b3ce5 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -1,7 +1,7 @@
 %&tex
 % Title:  GNU Emacs Survival Card
 
-% Copyright (C) 2000--2025 Free Software Foundation, Inc.
+% Copyright (C) 2000--2026 Free Software Foundation, Inc.
 
 % Author: Włodek Bzyl <matwb@univ.gda.pl>
 
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index 81681791c24..4759ed92d02 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -1,6 +1,6 @@
 % ViperCard -- The Reference Card for Viper under GNU Emacs
 
-% Copyright (C) 1995--1997, 2001--2025 Free Software Foundation, Inc.
+% Copyright (C) 1995--1997, 2001--2026 Free Software Foundation, Inc.
 
 % Author: Michael Kifer <kifer@cs.stonybrook.edu> (Viper)
 %       Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3)
diff --git a/etc/schema/locate.rnc b/etc/schema/locate.rnc
index 56f68436afd..04a1873a3da 100644
--- a/etc/schema/locate.rnc
+++ b/etc/schema/locate.rnc
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2004, 2007-2025 Free Software Foundation, Inc.
+# Copyright (C) 2003-2004, 2007-2026 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/etc/schema/relaxng.rnc b/etc/schema/relaxng.rnc
index ecc8d40a221..a9b8a381060 100644
--- a/etc/schema/relaxng.rnc
+++ b/etc/schema/relaxng.rnc
@@ -1,6 +1,6 @@
 # RELAX NG XML syntax expressed in RELAX NG Compact syntax.
 
-# Copyright (C) 2003-2004, 2007-2025 Free Software Foundation, Inc.
+# Copyright (C) 2003-2004, 2007-2026 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index 6701b9b56a6..b245d87cc0a 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2003-2004, 2007-2025 Free Software Foundation, Inc.
+<!-- Copyright (C) 2003-2004, 2007-2026 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/etc/ses-example.ses b/etc/ses-example.ses
index d15bd0cb9fb..fcb6df1cddd 100644
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@@ -205,7 +205,7 @@ Sales summary - Acme fundraising
 ;;; ses--symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other"))
 ;;; End:
 
-;;; Copyright (C) 2002-2025 Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2026 Free Software Foundation, Inc.
 
 ;;; COPYING PERMISSIONS:
 ;;; 
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index 68d66286958..dabe626f29b 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -1,6 +1,6 @@
 ;;; c.srt --- SRecode templates for c-mode
 
-;; Copyright (C) 2007-2010, 2012-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2010, 2012-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index 73b16256236..8705479a387 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -1,6 +1,6 @@
 ;;; cpp.srt --- SRecode templates for c++-mode
 
-;; Copyright (C) 2007-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index 9400e4bc71a..e84bdbec904 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -1,6 +1,6 @@
 ;;; default.srt --- SRecode templates for srecode-template-mode
 
-;; Copyright (C) 2007-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index a11f2de44ab..5646e6cf1bc 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -1,6 +1,6 @@
 ;; doc-c.srt --- SRecode templates for "document" applications
 
-;; Copyright (C) 2008-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 611089171d3..617d04af50b 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -1,6 +1,6 @@
 ;; doc-default.srt --- SRecode templates for "document" applications
 
-;; Copyright (C) 2009-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index a53ae3f0a43..89540e9668a 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -1,6 +1,6 @@
 ;; doc-java.srt --- SRecode templates for "document" applications
 
-;; Copyright (C) 2009-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
index e254178e3cc..0e37af1b594 100644
--- a/etc/srecode/ede-autoconf.srt
+++ b/etc/srecode/ede-autoconf.srt
@@ -1,6 +1,6 @@
 ;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE
 
-;; Copyright (C) 2010, 2012-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2012-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index 25da8226f34..0b4058d73dd 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -1,6 +1,6 @@
 ;; ede-make.srt --- SRecode templates for Makefiles used by EDE.
 
-;; Copyright (C) 2008-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index c91f2783f73..56a971d3169 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -1,6 +1,6 @@
 ;;; el.srt --- SRecode templates for Emacs Lisp mode
 
-;; Copyright (C) 2007-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt
index d1c2cd553b0..18f20a3af52 100644
--- a/etc/srecode/getset-cpp.srt
+++ b/etc/srecode/getset-cpp.srt
@@ -1,6 +1,6 @@
 ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.
 
-;; Copyright (C) 2007-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index 1066dc81600..77efa3d8bf6 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -1,6 +1,6 @@
 ;; java.srt
 
-;; Copyright (C) 2009-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt
index 58acdcf068a..60ffec02a43 100644
--- a/etc/srecode/make.srt
+++ b/etc/srecode/make.srt
@@ -1,6 +1,6 @@
 ;; make.srt
 
-;; Copyright (C) 2009-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/proj-test.srt b/etc/srecode/proj-test.srt
index 6fe2e94fe71..005e27e038b 100644
--- a/etc/srecode/proj-test.srt
+++ b/etc/srecode/proj-test.srt
@@ -1,6 +1,6 @@
 ;; proj-test.srt --- SRecode template for testing project scoping.
 
-;; Copyright (C) 2008-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index 5d3dde995cd..ba24be65334 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -1,6 +1,6 @@
 ;;; template.srt --- Templates for Semantic Recoders
 
-;; Copyright (C) 2005, 2007-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index 214906bbffb..13bd588b144 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -1,6 +1,6 @@
 ;; test.srt --- SRecode templates for testing
 
-;; Copyright (C) 2008-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt
index 2ce4cf04687..05d0aa06a2f 100644
--- a/etc/srecode/texi.srt
+++ b/etc/srecode/texi.srt
@@ -1,6 +1,6 @@
 ;; texi.srt --- SRecode templates for Texinfo
 
-;; Copyright (C) 2008-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index 3e6a4249fbc..f05456da643 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -1,6 +1,6 @@
 ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.
 
-;; Copyright (C) 2007-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2026 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/etc/symbol-releases.eld b/etc/symbol-releases.eld
index 3c666423cc0..225e7d86cff 100644
--- a/etc/symbol-releases.eld
+++ b/etc/symbol-releases.eld
@@ -9,6 +9,8 @@
 ;; TYPE being `fun' or `var'.
 
 (
+ ("31.1" fun any)
+ ("31.1" fun all)
  ("30.1" fun dired-click-to-select-mode)
  ("30.1" var dired-click-to-select-mode)
  ("29.1" fun plistp)
diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el
index f7e032ee5be..c55ae8041d7 100644
--- a/etc/themes/adwaita-theme.el
+++ b/etc/themes/adwaita-theme.el
@@ -1,6 +1,6 @@
 ;;; adwaita-theme.el --- Tango-based custom theme for faces  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2010-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2026 Free Software Foundation, Inc.
 
 ;; Author: William Stevenson <yhvh2000@gmail.com>
 
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
index 3e3c81f76e1..ea70b6f9349 100644
--- a/etc/themes/deeper-blue-theme.el
+++ b/etc/themes/deeper-blue-theme.el
@@ -1,6 +1,6 @@
 ;;; deeper-blue-theme.el --- Custom theme for faces  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; Author: Scott Frazer <frazer.scott@gmail.com>
 
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index ee19c86dbe5..849d6926457 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -1,6 +1,6 @@
 ;;; dichromacy-theme.el --- color theme suitable for color-blind users  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken>
 
diff --git a/etc/themes/leuven-dark-theme.el b/etc/themes/leuven-dark-theme.el
index cfcb7224d89..b58a64cb92e 100644
--- a/etc/themes/leuven-dark-theme.el
+++ b/etc/themes/leuven-dark-theme.el
@@ -1,6 +1,6 @@
 ;;; leuven-dark-theme.el --- Awesome Emacs color theme on dark background  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2003-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 ;; Contributor: Thibault Polge <(concat "thibault" at-sign "thb.lt")>
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index 37fbea4e681..29ee9021080 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -1,6 +1,6 @@
 ;;; leuven-theme.el --- Elegant Emacs color theme for a white background -*- lexical-binding: t -*-
 
-;; Copyright (C) 2003-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 ;; URL: https://github.com/fniessen/emacs-leuven-theme
diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el
index 1bf92f67191..6143f2a8d94 100644
--- a/etc/themes/light-blue-theme.el
+++ b/etc/themes/light-blue-theme.el
@@ -1,6 +1,6 @@
 ;;; light-blue-theme.el --- Custom theme for faces  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; Author: Drew Adams <drew.adams@oracle.com>
 ;; Maintainer: emacs-devel@gnu.org
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index 9c6798ab324..b8e9cf6494f 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -1,6 +1,6 @@
 ;;; manoj-dark-theme.el --- A dark theme from Manoj  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; Author: Manoj Srivastava <srivasta@ieee.org>
 ;; Keywords: lisp, faces
diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
index 89ff07271cd..716b0c938d4 100644
--- a/etc/themes/misterioso-theme.el
+++ b/etc/themes/misterioso-theme.el
@@ -1,6 +1,6 @@
 ;;; misterioso-theme.el --- Custom face theme for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Hermida
 
diff --git a/etc/themes/modus-operandi-deuteranopia-theme.el b/etc/themes/modus-operandi-deuteranopia-theme.el
index 1617b933676..c86649d0c70 100644
--- a/etc/themes/modus-operandi-deuteranopia-theme.el
+++ b/etc/themes/modus-operandi-deuteranopia-theme.el
@@ -1,6 +1,6 @@
 ;;; modus-operandi-deuteranopia-theme.el --- Deuteranopia-optimized theme with a white background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
@@ -87,6 +87,7 @@ standard)."
  'light
  'modus-themes-operandi-deuteranopia-palette
  'modus-operandi-deuteranopia-palette-user
- 'modus-operandi-deuteranopia-palette-overrides)
+ 'modus-operandi-deuteranopia-palette-overrides
+ 'modus-themes-faces-deuteranopia)
 
 ;;; modus-operandi-deuteranopia-theme.el ends here
diff --git a/etc/themes/modus-operandi-theme.el b/etc/themes/modus-operandi-theme.el
index e9eb67c2a93..590c6d9903e 100644
--- a/etc/themes/modus-operandi-theme.el
+++ b/etc/themes/modus-operandi-theme.el
@@ -1,6 +1,6 @@
 ;;; modus-operandi-theme.el --- Elegant, highly legible theme with a white background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
diff --git a/etc/themes/modus-operandi-tinted-theme.el b/etc/themes/modus-operandi-tinted-theme.el
index c5ddbbe4e9c..17fc6be8d4d 100644
--- a/etc/themes/modus-operandi-tinted-theme.el
+++ b/etc/themes/modus-operandi-tinted-theme.el
@@ -1,6 +1,6 @@
 ;;; modus-operandi-tinted-theme.el --- Elegant, highly legible theme with a light ochre background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
diff --git a/etc/themes/modus-operandi-tritanopia-theme.el b/etc/themes/modus-operandi-tritanopia-theme.el
index dfbdc1e1772..9e4211512ef 100644
--- a/etc/themes/modus-operandi-tritanopia-theme.el
+++ b/etc/themes/modus-operandi-tritanopia-theme.el
@@ -1,6 +1,6 @@
 ;;; modus-operandi-tritanopia-theme.el --- Tritanopia-optimized theme with a white background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
@@ -87,6 +87,7 @@ standard)."
  'light
  'modus-themes-operandi-tritanopia-palette
  'modus-operandi-tritanopia-palette-user
- 'modus-operandi-tritanopia-palette-overrides)
+ 'modus-operandi-tritanopia-palette-overrides
+ 'modus-themes-faces-tritanopia)
 
 ;;; modus-operandi-tritanopia-theme.el ends here
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el
index 3bcc190b174..e61436e1cbc 100644
--- a/etc/themes/modus-themes.el
+++ b/etc/themes/modus-themes.el
@@ -1,11 +1,11 @@
 ;;; modus-themes.el --- Elegant, highly legible and customizable themes -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
-;; Version: 5.1.0
+;; Version: 5.2.0
 ;; Package-Requires: ((emacs "28.1"))
 ;; Keywords: faces, theme, accessibility
 
@@ -37,6 +37,7 @@
 
 
 
+(require 'color)
 (eval-when-compile
   (require 'subr-x)
   (require 'cl-lib))
@@ -623,7 +624,7 @@ Individual theme overrides take precedence over these common
 overrides.
 
 The idea of common overrides is to change semantic color
-mappings, such as to make the cursor red.  Wherea theme-specific
+mappings, such as to make the cursor red.  Whereas theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
@@ -707,6 +708,17 @@ represents."
     (bg-prose-macro unspecified)
     (bg-prose-verbatim unspecified)
 
+    ;; Search mappings
+    (fg-search-current fg-main)
+    (fg-search-lazy fg-main)
+    (fg-search-static fg-main)
+    (fg-search-replace fg-main)
+
+    (fg-search-rx-group-0 fg-main)
+    (fg-search-rx-group-1 fg-main)
+    (fg-search-rx-group-2 fg-main)
+    (fg-search-rx-group-3 fg-main)
+
     ;; Space mappings
 
     (bg-space unspecified)
@@ -1105,7 +1117,7 @@ represents."
      (fg-heading-7 cyan-warmer)
      (fg-heading-8 fg-dim))
    modus-themes-common-palette-mappings)
-    "The entire palette of the `modus-operandi' theme.
+  "The entire palette of the `modus-operandi' theme.
 
 Named colors have the form (COLOR-NAME HEX-VALUE) with the former
 as a symbol and the latter as a string.
@@ -1761,7 +1773,7 @@ exists in the palette and is associated with a HEX-VALUE.")
      (fg-heading-7 cyan)
      (fg-heading-8 fg-dim))
    modus-themes-common-palette-mappings)
-    "The entire palette of the `modus-operandi-deuteranopia' theme.
+  "The entire palette of the `modus-operandi-deuteranopia' theme.
 
 Named colors have the form (COLOR-NAME HEX-VALUE) with the former
 as a symbol and the latter as a string.
@@ -2088,7 +2100,7 @@ exists in the palette and is associated with a HEX-VALUE.")
      (fg-heading-7 cyan-warmer)
      (fg-heading-8 fg-dim))
    modus-themes-common-palette-mappings)
-    "The entire palette of the `modus-operandi-tritanopia' theme.
+  "The entire palette of the `modus-operandi-tritanopia' theme.
 
 Named colors have the form (COLOR-NAME HEX-VALUE) with the former
 as a symbol and the latter as a string.
@@ -2415,7 +2427,7 @@ exists in the palette and is associated with a HEX-VALUE.")
      (fg-heading-7 cyan-faint)
      (fg-heading-8 fg-dim))
    modus-themes-common-palette-mappings)
-    "The entire palette of the `modus-vivendi' theme.
+  "The entire palette of the `modus-vivendi' theme.
 
 Named colors have the form (COLOR-NAME HEX-VALUE) with the former
 as a symbol and the latter as a string.
@@ -2742,7 +2754,7 @@ exists in the palette and is associated with a HEX-VALUE.")
      (fg-heading-7 cyan-faint)
      (fg-heading-8 fg-dim))
    modus-themes-common-palette-mappings)
-    "The entire palette of the `modus-vivendi-tinted' theme.
+  "The entire palette of the `modus-vivendi-tinted' theme.
 
 Named colors have the form (COLOR-NAME HEX-VALUE) with the former
 as a symbol and the latter as a string.
@@ -3400,7 +3412,7 @@ exists in the palette and is associated with a HEX-VALUE.")
      (fg-heading-7 cyan-faint)
      (fg-heading-8 fg-dim))
    modus-themes-common-palette-mappings)
-    "The entire palette of the `modus-vivendi-tritanopia' theme.
+  "The entire palette of the `modus-vivendi-tritanopia' theme.
 
 Named colors have the form (COLOR-NAME HEX-VALUE) with the former
 as a symbol and the latter as a string.
@@ -3771,17 +3783,31 @@ must define theme properties to include those that the macro specifies.
 Also see `modus-themes-get-themes'.")
 
 (defvar modus-themes--activated-themes nil
-  "List of themes that `modus-themes--activate' operated on.")
-
-(defun modus-themes--activate (theme)
-  "Load THEME if it is not defined but do not activate it."
-  ;; NOTE 2025-09-29: We need to do this instead of pushing to the
-  ;; `custom-known-themes' because loading the theme has the desired
-  ;; side effect of adding the relevant `theme-properties' to it.
-  (unless (and (memq theme modus-themes--activated-themes)
-               (custom-theme-p theme))
-    (load-theme theme t t)
-    (add-to-list 'modus-themes--activated-themes theme)))
+  "List of themes that `modus-themes-activate' operated on.")
+
+;;;###autoload
+(defun modus-themes-activate (theme)
+  "Load THEME if neeeded, so that it can be used by other commands."
+  ;; If it is already in the `modus-themes--activated-themes', then we
+  ;; have already processed it.
+  (unless (memq theme modus-themes--activated-themes)
+    (let ((properties (get theme 'theme-properties)))
+      ;; If it has no properties, then we need to load it so that
+      ;; those are reified.
+      (if (null properties)
+          (progn
+            (push theme modus-themes--activated-themes)
+            (load-theme theme t t))
+        (let ((core-palette (plist-get properties :modus-core-palette))
+              (user-palette (plist-get properties :modus-user-palette)))
+          ;; If its core palette is void or nil, then we need to load it.
+          ;; Same if its user palette is void, but it is okay if that
+          ;; one is nil.
+          (unless (and (boundp core-palette)
+                       core-palette
+                       (boundp user-palette))
+            (push theme modus-themes--activated-themes)
+            (load-theme theme t t)))))))
 
 (defun modus-themes--belongs-to-family-p (theme family)
   "Return non-nil if THEME has FAMILY property."
@@ -3789,21 +3815,17 @@ Also see `modus-themes-get-themes'.")
               (theme-family (plist-get properties :family)))
     (eq theme-family family)))
 
-(defun modus-themes-get-all-known-themes (&optional theme-family no-enable)
+(defun modus-themes-get-all-known-themes (&optional theme-family)
   "Return all known Modus themes or derivatives, enabling them if needed.
 With optional THEME-FAMILY, operate only on the themes whose :family
 property is that.  Else consider the Modus themes as well as all their
 derivatives.
 
-With optional NO-ENABLE, do not try to enable the themes.
-
 Also see `modus-themes-sort'."
   (let ((themes (pcase theme-family
                   ('modus-themes modus-themes-items)
-                  ((pred (not null)) modus-themes-registered-items)
+                  ((pred identity) modus-themes-registered-items)
                   (_ (seq-union modus-themes-items modus-themes-registered-items)))))
-    (unless no-enable
-      (mapc #'modus-themes--activate themes))
     (if theme-family
         (seq-filter
          (lambda (theme)
@@ -3852,12 +3874,20 @@ With optional SHOW-ERROR, throw an error instead of returning nil."
      (t
       (error "Themes `%S' is not a symbol or a list of symbols" themes)))))
 
-(defun modus-themes-get-current-theme (&optional no-enable)
-  "Return current enabled Modus theme.
-With optional NO-ENABLE, do not try to enable any themes."
-  (let ((current (car custom-enabled-themes)))
-    (when (memq current (modus-themes-get-all-known-themes nil no-enable))
-      current)))
+(defun modus-themes--modus-theme-p (theme)
+  "Return non-nil if THEME has a :modus-core-palette property."
+  (when-let* ((properties (get theme 'theme-properties))
+              (core (plist-get properties :modus-core-palette)))
+    theme))
+
+(defun modus-themes-get-current-theme ()
+  "Return currently enabled Modus theme.
+More specifically, return the first of the currently enabled Modus
+themes among the `custom-enabled-themes'.
+
+Assume that a Modus theme has a `theme-properties' entry of
+`:modus-core-palette'."
+  (seq-find #'modus-themes--modus-theme-p custom-enabled-themes))
 
 (defun modus-themes--get-theme-palette-subr (theme with-overrides with-user-palette)
   "Get THEME palette without `modus-themes-known-p'.
@@ -3865,7 +3895,9 @@ WITH-OVERRIDES and WITH-USER-PALETTE are described in
 `modus-themes-get-theme-palette'.
 
 If THEME does not have at least a `:modus-core-palette' among its
-`theme-properties', return nil."
+`theme-properties', return nil.
+
+Else return (append OVERRIDES USER CORE)."
   (when-let* ((properties (get theme 'theme-properties))
               (core-palette (symbol-value (plist-get properties :modus-core-palette))))
     (let* ((user-palette (when with-user-palette (symbol-value (plist-get properties :modus-user-palette))))
@@ -3875,24 +3907,20 @@ If THEME does not have at least a `:modus-core-palette' among its
 
 (defun modus-themes-get-theme-palette (&optional theme with-overrides with-user-palette)
   "Return palette value of active `modus-themes-get-themes' THEME.
-If THEME is nil, use the return value of `modus-themes-get-current-theme'.
-With WITH-OVERRIDES, include all overrides in the combined palette.
-With WITH-USER-PALETTE do the same for the user-defined palette
-extension.
-
-If THEME is unknown, return nil."
-  (modus-themes--get-theme-palette-subr
-   (or theme (modus-themes-get-current-theme))
-   with-overrides
-   with-user-palette))
-
-(defun modus-themes--disable-themes ()
-  "Disable themes per `modus-themes-disable-other-themes'."
-  (mapc
-   #'disable-theme
-   (if modus-themes-disable-other-themes
-       custom-enabled-themes
-     (modus-themes-get-themes))))
+If THEME is nil, use the return value of
+`modus-themes-get-current-theme'.  With WITH-OVERRIDES, include all
+overrides in the combined palette.  With WITH-USER-PALETTE do the same
+for the user-defined palette extension.
+
+If THEME is unknown, return nil.  Else return (append OVERRIDES USER CORE)."
+  (modus-themes--get-theme-palette-subr (or theme (modus-themes-get-current-theme)) with-overrides with-user-palette))
+
+(defun modus-themes--disable-themes (themes)
+  "Disable THEMES per `modus-themes-disable-other-themes'."
+  (mapc #'disable-theme
+        (if modus-themes-disable-other-themes
+            themes
+          (seq-filter #'modus-themes--modus-theme-p themes))))
 
 (defun modus-themes-load-theme (theme &optional hook)
   "Load THEME while disabling other themes.
@@ -3904,8 +3932,8 @@ Run the `modus-themes-after-load-theme-hook' as the final step
 after loading the THEME.  If HOOK, then call that instead.
 
 Return THEME."
-  (modus-themes--disable-themes)
   (load-theme theme :no-confirm)
+  (modus-themes--disable-themes (remq theme custom-enabled-themes))
   (run-hooks (or hook 'modus-themes-after-load-theme-hook))
   theme)
 
@@ -3950,7 +3978,7 @@ that item.  Else use the current theme.
 If COLOR is not present in the palette, return the `unspecified'
 symbol, which is safe when used as a face attribute's value."
   (when theme
-    (modus-themes--activate theme))
+    (modus-themes-activate theme))
   (if-let* ((palette (modus-themes-get-theme-palette theme with-overrides :with-user-palette))
             (value (modus-themes--retrieve-palette-value color palette)))
       value
@@ -3964,42 +3992,91 @@ symbol, which is safe when used as a face attribute's value."
   "Minibuffer history of `modus-themes-select-prompt'.")
 
 (defun modus-themes--annotate-theme (theme)
-  "Return completion annotation for THEME."
+  "Return description of THEME ."
   (when-let* ((symbol (intern-soft theme))
-              (doc-string (get symbol 'theme-documentation)))
-    (format " -- %s"
-            (propertize (car (split-string doc-string "\\."))
+              (properties (get symbol 'theme-properties))
+              (doc-string (or (get symbol 'theme-documentation)
+                              (plist-get properties :modus-documentation))))
+    (format " %s"
+            (propertize (concat "-- " (car (split-string doc-string "\\.")))
                         'face 'completions-annotations))))
 
-(defun modus-themes--completion-table (category candidates)
-  "Pass appropriate metadata CATEGORY to completion CANDIDATES."
+(defun modus-themes--group-themes (theme transform)
+  "Group THEME by its background for minibuffer completion.
+If TRANSFORM is non-nil, return THEME as-is."
+  (let ((symbol (intern-soft theme)))
+    (cond
+     (transform
+      theme)
+     ((eq symbol (modus-themes-get-current-theme))
+      "Current")
+     ((when-let* ((properties (get symbol 'theme-properties))
+                  (background (plist-get properties :background-mode)))
+        (capitalize (format "%s" background)))))))
+
+(defun modus-themes--display-sort (themes)
+  "Put the current theme before other THEMES for minibuffer completion."
+  (let* ((current (modus-themes-get-current-theme))
+         (current-theme-p (lambda (theme) (eq (intern-soft theme) current))))
+    (nconc
+     (seq-filter current-theme-p themes)
+     (seq-remove current-theme-p themes))))
+
+(defun modus-themes--completion-table (themes)
+  "Pass appropriate metadata to THEMES for minibuffer completion."
   (lambda (string pred action)
     (if (eq action 'metadata)
-        `(metadata (category . ,category))
-      (complete-with-action action candidates string pred))))
-
-(defun modus-themes--completion-table-candidates ()
-  "Render `modus-themes-get-themes' as a completion table."
-  (modus-themes--completion-table 'theme (modus-themes-get-themes)))
-
-(defun modus-themes-select-prompt (&optional prompt)
+        (list 'metadata
+              (cons 'category 'theme)
+              (cons 'annotation-function #'modus-themes--annotate-theme)
+              (cons 'group-function #'modus-themes--group-themes)
+              (cons 'display-sort-function #'modus-themes--display-sort))
+      (complete-with-action action themes string pred))))
+
+(defun modus-themes-select-prompt (&optional prompt background-mode)
   "Minibuffer prompt to select a Modus theme.
 With optional PROMPT string, use it as the first argument of
-`format-prompt'.  Else use a generic prompt."
-  (let ((completion-extra-properties `(:annotation-function ,#'modus-themes--annotate-theme)))
-    (intern
-     (completing-read
-      (format-prompt (or prompt "Select theme") nil)
-      (modus-themes--completion-table-candidates)
-      nil t nil
-      'modus-themes--select-theme-history))))
+`format-prompt'.  Else use a generic prompt.
+
+With optional BACKGROUND-MODE as either `dark' or `light' limit the
+themes accordingly."
+  (intern
+   (completing-read
+    (format-prompt (or prompt "Select theme") nil)
+    (modus-themes--completion-table
+     (if background-mode
+         (modus-themes-filter-by-background-mode
+          (modus-themes-get-themes)
+          background-mode)
+       (modus-themes-get-themes)))
+    nil t nil
+    'modus-themes--select-theme-history)))
 
 ;;;###autoload
 (defun modus-themes-select (theme)
   "Load a Modus THEME using minibuffer completion.
+With optional prefix argument, prompt to limit the set of themes to
+either dark or light variants.
+
 Run `modus-themes-after-load-theme-hook' after loading the theme.
 Disable other themes per `modus-themes-disable-other-themes'."
-  (interactive (list (modus-themes-select-prompt)))
+  (interactive
+   (list
+    (if current-prefix-arg
+        (modus-themes-select-prompt nil (modus-themes-background-mode-prompt))
+      (modus-themes-select-prompt))))
+  (modus-themes-load-theme theme))
+
+;;;###autoload
+(defun modus-themes-select-dark (theme)
+  "Like `modus-themes-select' for a dark THEME."
+  (interactive (list (modus-themes-select-prompt nil 'dark)))
+  (modus-themes-load-theme theme))
+
+;;;###autoload
+(defun modus-themes-select-light (theme)
+  "Like `modus-themes-select' for a light THEME."
+  (interactive (list (modus-themes-select-prompt nil 'light)))
   (modus-themes-load-theme theme))
 
 ;;;;; Toggle between two themes
@@ -4017,8 +4094,9 @@ Disable other themes per `modus-themes-disable-other-themes'."
   (interactive)
   (if-let* ((themes (modus-themes-known-p modus-themes-to-toggle))
             (one (car themes))
-            (two (cadr themes)))
-      (modus-themes-load-theme (if (eq (car custom-enabled-themes) one) two one))
+            (two (cadr themes))
+            (current (modus-themes-get-current-theme)))
+      (modus-themes-load-theme (if (eq current one) two one))
     (modus-themes-load-theme (modus-themes-select-prompt "No valid theme to toggle; select other"))))
 
 ;;;;; Rotate through a list of themes
@@ -4097,9 +4175,9 @@ THEMES."
 (defun modus-themes-load-random (&optional background-mode)
   "Load a Modus theme at random, excluding the current one.
 
-With optional BACKGROUND-MODE as a prefix argument, prompt to limit the set of
-themes to either dark or light variants.  When called from Lisp, BACKGROUND-MODE
-is either the `dark' or `light' symbol.
+With optional BACKGROUND-MODE as a prefix argument, prompt to limit the
+set of themes to either dark or light variants.  When called from Lisp,
+BACKGROUND-MODE is either the `dark' or `light' symbol.
 
 Run `modus-themes-after-load-theme-hook' after loading a theme."
   (interactive
@@ -4183,7 +4261,7 @@ color mappings instead of the complete palette."
      (list
       (modus-themes-select-prompt prompt)
       current-prefix-arg)))
-  (modus-themes--activate theme)
+  (modus-themes-activate theme)
   (let ((buffer (get-buffer-create (format (if mappings "*%s-list-mappings*" "*%s-list-all*") theme))))
     (with-current-buffer buffer
       (let ((modus-themes-current-preview theme)
@@ -4479,6 +4557,34 @@ FG and BG are the main colors."
      :weight
      (if (and weight (null bold)) weight 'unspecified))))
 
+
+;; NOTE 2025-11-23: In theory we need the `modus-themes--box'
+;; equivalent for this:
+;;
+;;     :underline (:style wave :color unspecified)
+;;
+;; I checked all the relevant faces and feel that users will not be
+;; benefitting form such a style anyway.  What would be the point of a
+;; spell checker that cannot highlight its errors, for example?
+;; Granted, we could have another kind of highlight, but I am here
+;; focusing on the use of this:
+;;
+;;     :underline unspecified
+(defun modus-themes--box (color width style)
+  "Return :box COLOR, WIDTH, STYLE if appropriate.
+If COLOR is unspecified, then return :box unspecified."
+  (cond
+   ((eq color 'unspecified)
+    '(:box unspecified))
+   ((and width style)
+    `(:box (:line-width ,width :color ,color :style ,style)))
+   (width
+    `(:box (:line-width ,width :color ,color)))
+   (style
+    `(:box (:color ,color :style ,style)))
+   (t
+    `(:box ,color))))
+
 
 
 ;;;; Face specifications
@@ -4513,7 +4619,7 @@ FG and BG are the main colors."
     `(modus-themes-button
       ((default :inherit variable-pitch :background ,bg-button-active :foreground ,fg-button-active)
        (((supports :box t))
-        :box (:line-width 1 :color ,border :style released-button))
+        ,@(modus-themes--box border 1 'released-button))
        (t :underline ,border)))
     `(modus-themes-prompt ((,c ,@(modus-themes--prompt fg-prompt bg-prompt))))
     `(modus-themes-reset-soft ((,c :background ,bg-main :foreground ,fg-main
@@ -4528,7 +4634,6 @@ FG and BG are the main colors."
     `(italic ((,c :slant italic)))
     `(cursor ((,c :background ,cursor)))
     `(fringe ((,c :background ,fringe :foreground ,fg-main)))
-    `(menu ((,c :background ,bg-dim :foreground ,fg-main)))
     `(scroll-bar ((,c :background ,fringe :foreground ,border)))
     `(tool-bar ((,c :background ,bg-dim :foreground ,fg-main)))
     `(vertical-border ((,c :foreground ,border)))
@@ -4667,13 +4772,13 @@ FG and BG are the main colors."
     `(ansi-color-white ((,c :background ,bg-term-white :foreground ,fg-term-white)))
     `(ansi-color-yellow ((,c :background ,bg-term-yellow :foreground ,fg-term-yellow)))
 ;;;;; anzu
-    `(anzu-match-1 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-main)))
-    `(anzu-match-2 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-main)))
-    `(anzu-match-3 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-main)))
+    `(anzu-match-1 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-search-rx-group-0)))
+    `(anzu-match-2 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-search-rx-group-1)))
+    `(anzu-match-3 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-search-rx-group-2)))
     `(anzu-mode-line ((,c modus-themes-bold bold)))
     `(anzu-mode-line-no-match ((,c :inherit modus-themes-bold :foreground ,modeline-err)))
-    `(anzu-replace-highlight ((,c :background ,bg-search-replace :foreground ,fg-main)))
-    `(anzu-replace-to ((,c :background ,bg-search-current :foreground ,fg-main)))
+    `(anzu-replace-highlight ((,c :background ,bg-search-replace :foreground ,fg-search-replace)))
+    `(anzu-replace-to ((,c :background ,bg-search-current :foreground ,fg-search-current)))
 ;;;;; auctex and Tex
     `(font-latex-bold-face ((,c :inherit bold)))
     `(font-latex-doctex-documentation-face ((,c :inherit modus-themes-slant :foreground ,docstring)))
@@ -4682,7 +4787,7 @@ FG and BG are the main colors."
     `(font-latex-math-face ((,c :foreground ,constant)))
     `(font-latex-script-char-face ((,c :inherit modus-themes-bold :foreground ,builtin)))
     `(font-latex-sectioning-5-face ((,c :inherit modus-themes-bold :foreground ,fg-alt)))
-    `(font-latex-sedate-face ((,c :inherit mouds-themes-bold :foreground ,keyword)))
+    `(font-latex-sedate-face ((,c :inherit modus-themes-bold :foreground ,keyword)))
     `(font-latex-slide-title-face ((,c :inherit modus-themes-heading-1)))
     `(font-latex-string-face ((,c :foreground ,string)))
     `(font-latex-subscript-face ((,c :height 0.9)))
@@ -4701,11 +4806,11 @@ FG and BG are the main colors."
     `(auto-dim-other-buffers-hide-face ((,c :foreground ,bg-inactive :background ,bg-inactive)))
 ;;;;; avy
     `(avy-background-face ((,c :background ,bg-dim :foreground ,fg-dim :extend t)))
-    `(avy-goto-char-timer-face ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-lazy :foreground ,fg-main)))
-    `(avy-lead-face ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-current :foreground ,fg-main)))
-    `(avy-lead-face-0 ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-current :foreground ,fg-main)))
-    `(avy-lead-face-1 ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-current :foreground ,fg-main)))
-    `(avy-lead-face-2 ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-current :foreground ,fg-main)))
+    `(avy-goto-char-timer-face ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-lazy :foreground ,fg-search-lazy)))
+    `(avy-lead-face ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-current :foreground ,fg-search-current)))
+    `(avy-lead-face-0 ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-current :foreground ,fg-search-current)))
+    `(avy-lead-face-1 ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-current :foreground ,fg-search-current)))
+    `(avy-lead-face-2 ((,c :inherit (bold modus-themes-reset-soft) :background ,bg-search-current :foreground ,fg-search-current)))
 ;;;;; aw (ace-window)
     `(aw-background-face ((,c :foreground "gray50")))
     `(aw-key-face ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
@@ -4744,9 +4849,9 @@ FG and BG are the main colors."
 ;;;;; calendar and diary
     `(calendar-month-header ((,c :inherit modus-themes-bold)))
     `(calendar-today
-      ((default :foreground ,date-common :inverse-video t)
+      ((default :foreground ,date-now :inverse-video t)
        (((supports :box t))
-        :box (:line-width (-1 . -1) :color ,fg-main))))
+        ,@(modus-themes--box date-now '(-1 . -1) nil))))
     `(calendar-weekday-header ((,c :foreground ,date-weekday)))
     `(calendar-weekend-header ((,c :foreground ,date-weekend)))
     `(diary ((,c :foreground ,date-common)))
@@ -4781,15 +4886,15 @@ FG and BG are the main colors."
 ;;;;; centaur-tabs
     `(centaur-tabs-active-bar-face ((,c :background ,blue))) ; special case like `doom-modeline-bar'
     `(centaur-tabs-close-mouse-face ((,c :inherit modus-themes-bold :foreground ,warning :underline t)))
-    `(centaur-tabs-close-selected ((,c :inherit modus-themes-bold :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current)))
-    `(centaur-tabs-close-unselected ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other)))
-    `(centaur-tabs-modified-marker-selected ((,c :inherit modus-themes-bold :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current)))
-    `(centaur-tabs-modified-marker-unselected ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other)))
+    `(centaur-tabs-close-selected ((,c :inherit modus-themes-bold :background ,bg-tab-current ,@(modus-themes--box bg-tab-current -2 nil))))
+    `(centaur-tabs-close-unselected ((,c :inherit modus-themes-bold :background ,bg-tab-other ,@(modus-themes--box bg-tab-other -2 nil))))
+    `(centaur-tabs-modified-marker-selected ((,c :inherit modus-themes-bold :background ,bg-tab-current ,@(modus-themes--box bg-tab-current -2 nil))))
+    `(centaur-tabs-modified-marker-unselected ((,c :background ,bg-tab-other ,@(modus-themes--box bg-tab-other -2 nil))))
     `(centaur-tabs-default ((,c :background ,bg-main)))
-    `(centaur-tabs-selected ((,c :inherit modus-themes-bold :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current)))
-    `(centaur-tabs-selected-modified ((,c :inherit italic :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current)))
-    `(centaur-tabs-unselected ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other)))
-    `(centaur-tabs-unselected-modified ((,c :inherit italic :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other)))
+    `(centaur-tabs-selected ((,c :inherit modus-themes-bold :background ,bg-tab-current ,@(modus-themes--box bg-tab-current -2 nil))))
+    `(centaur-tabs-selected-modified ((,c :inherit modus-themes-slant :background ,bg-tab-current ,@(modus-themes--box bg-tab-current -2 nil))))
+    `(centaur-tabs-unselected ((,c :background ,bg-tab-other ,@(modus-themes--box bg-tab-other -2 nil))))
+    `(centaur-tabs-unselected-modified ((,c :inherit modus-themes-slant :background ,bg-tab-other ,@(modus-themes--box bg-tab-other -2 nil))))
 ;;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log')
     `(change-log-acknowledgment ((,c :foreground ,identifier)))
     `(change-log-conditionals ((,c :foreground ,err)))
@@ -4860,6 +4965,14 @@ FG and BG are the main colors."
     `(compilation-mode-line-fail ((,c :inherit modus-themes-bold :foreground ,modeline-err)))
     `(compilation-mode-line-run ((,c :inherit modus-themes-bold :foreground ,modeline-warning)))
     `(compilation-warning ((,c :inherit modus-themes-bold :foreground ,warning)))
+;;;;; completion-preview
+    `(completion-preview ((,c :foreground ,fg-dim)))
+    ;; We set the following faces to inherit from `completion-preview',
+    ;; as they do by default.  If we ever want them not to inherit from
+    ;; `completion-preview', then we should remember to customize
+    ;; `completion-preview-adapt-background-color' accordingly.
+    `(completion-preview-common ((,c :inherit completion-preview :underline t)))
+    `(completion-preview-exact ((,c :inherit (modus-themes-completion-match-0 completion-preview))))
 ;;;;; completions
     `(completions-annotations ((,c :inherit modus-themes-slant :foreground ,docstring)))
     `(completions-common-part ((,c :inherit modus-themes-completion-match-0)))
@@ -4868,8 +4981,8 @@ FG and BG are the main colors."
 ;;;;; consult
     `(consult-async-split ((,c :foreground ,err)))
     `(consult-file ((,c :inherit modus-themes-bold :foreground ,info)))
-    `(consult-highlight-mark ((,c :background ,bg-search-static :foreground ,fg-main)))
-    `(consult-highlight-match ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(consult-highlight-mark ((,c :background ,bg-search-static :foreground ,fg-search-static)))
+    `(consult-highlight-match ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(consult-imenu-prefix ((,c :foreground ,fg-dim)))
     `(consult-key ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
     `(consult-line-number ((,c :foreground ,fg-dim)))
@@ -4883,8 +4996,8 @@ FG and BG are the main colors."
 ;;;;; corfu-candidate-overlay
     `(corfu-candidate-overlay-face ((,c :foreground ,fg-dim)))
 ;;;;; corfu-quick
-    `(corfu-quick1 ((,c :inherit bold :background ,bg-search-current :foreground ,fg-main)))
-    `(corfu-quick2 ((,c :inherit bold :background ,bg-search-current :foreground ,fg-main)))
+    `(corfu-quick1 ((,c :inherit bold :background ,bg-search-current :foreground ,fg-search-current)))
+    `(corfu-quick2 ((,c :inherit bold :background ,bg-search-current :foreground ,fg-search-current)))
 ;;;;; counsel
     `(counsel-active-mode ((,c :foreground ,keyword)))
     `(counsel-application-name ((,c :foreground ,name)))
@@ -4905,20 +5018,20 @@ FG and BG are the main colors."
 ;;;;; csv-mode
     `(csv-separator-face (( )))
 ;;;;; ctrlf
-    `(ctrlf-highlight-active ((,c :background ,bg-search-current :foreground ,fg-main)))
+    `(ctrlf-highlight-active ((,c :background ,bg-search-current :foreground ,fg-search-current)))
     `(ctrlf-highlight-line ((,c :background ,bg-hl-line :extend t)))
-    `(ctrlf-highlight-passive ((,c :background ,bg-search-lazy :foreground ,fg-main)))
+    `(ctrlf-highlight-passive ((,c :background ,bg-search-lazy :foreground ,fg-search-lazy)))
 ;;;;; custom (M-x customize)
     `(custom-button ((,c :inherit modus-themes-button)))
     `(custom-button-mouse
       ((default :inherit variable-pitch :background ,bg-hover :foreground ,fg-main)
        (((supports :box t))
-        :box (:line-width 1 :color ,border :style released-button))
+        ,@(modus-themes--box border 1 'released-button))
        (t :underline ,border)))
     `(custom-button-pressed
       ((default :inherit variable-pitch :background ,bg-main :foreground ,fg-main)
        (((supports :box t))
-        :box (:line-width 1 :color ,border :style pressed-button))
+        ,@(modus-themes--box border 1 'pressed-button))
        (t :underline ,border)))
     `(custom-changed ((,c :background ,bg-changed)))
     `(custom-comment ((,c :foreground ,comment)))
@@ -4939,7 +5052,7 @@ FG and BG are the main colors."
     `(dashboard-items-face (( ))) ; use the underlying style of all-the-icons
 ;;;;; deadgrep
     `(deadgrep-filename-face ((,c :inherit modus-themes-bold :foreground ,name)))
-    `(deadgrep-match-face ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(deadgrep-match-face ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(deadgrep-meta-face ((,c :foreground ,fg-dim)))
     `(deadgrep-regexp-metachar-face ((,c :inherit modus-themes-bold :foreground ,rx-construct)))
     `(deadgrep-search-term-face ((,c :foreground ,info)))
@@ -5145,9 +5258,9 @@ FG and BG are the main colors."
     `(eglot-diagnostic-tag-unnecessary-face ((,c :underline (:style wave :color ,underline-note))))
 ;;;;; el-search
     `(el-search-highlight-in-prompt-face ((,c :inherit modus-themes-slant)))
-    `(el-search-match ((,c :background ,bg-search-current :foreground ,fg-main)))
-    `(el-search-other-match ((,c :background ,bg-search-lazy :foreground ,fg-main)))
-    `(el-search-occur-match ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(el-search-match ((,c :background ,bg-search-current :foreground ,fg-search-current)))
+    `(el-search-other-match ((,c :background ,bg-search-lazy :foreground ,fg-search-lazy)))
+    `(el-search-occur-match ((,c :background ,bg-search-static :foreground ,fg-search-static)))
 ;;;;; eldoc
     ;; NOTE: see https://github.com/purcell/package-lint/issues/187
     (list 'eldoc-highlight-function-argument `((,c :inherit modus-themes-bold :background ,bg-active-argument :foreground ,fg-active-argument)))
@@ -5237,7 +5350,7 @@ FG and BG are the main colors."
     `(ement-room-mention ((,c :background ,bg-hover :foreground ,fg-main)))
     `(ement-room-name ((,c :inherit modus-themes-bold)))
     `(ement-room-reactions ((,c :foreground ,fg-dim)))
-    `(ement-room-read-receipt-marker ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(ement-room-read-receipt-marker ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(ement-room-self ((,c :inherit modus-themes-bold :foreground ,accent-1)))
     `(ement-room-self-message ((,c :foreground ,fg-alt)))
     `(ement-room-timestamp ((,c :foreground ,fg-dim)))
@@ -5268,7 +5381,7 @@ FG and BG are the main colors."
     `(erc-bold-face ((,c :inherit bold)))
     `(erc-button ((,c :background ,bg-link :foreground ,fg-link :underline ,underline-link)))
     `(erc-command-indicator-face ((,c :inherit modus-themes-bold :foreground ,accent-3)))
-    `(erc-current-nick-face ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(erc-current-nick-face ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(erc-dangerous-host-face ((,c :foreground ,err)))
     `(erc-direct-msg-face ((,c :foreground ,fg-dim)))
     `(erc-error-face ((,c :foreground ,err)))
@@ -5315,10 +5428,10 @@ FG and BG are the main colors."
 ;;;;; evil-mode
     `(evil-ex-commands ((,c :inherit modus-themes-bold :foreground ,keyword)))
     `(evil-ex-info ((,c :inherit modus-themes-bold :foreground ,type)))
-    `(evil-ex-lazy-highlight ((,c :background ,bg-search-lazy :foreground ,fg-main)))
-    `(evil-ex-search ((,c :background ,bg-search-current :foreground ,fg-main)))
-    `(evil-ex-substitute-matches ((,c :background ,bg-search-replace :foreground ,fg-main)))
-    `(evil-ex-substitute-replacement ((,c :background ,bg-search-current :foreground ,fg-main)))
+    `(evil-ex-lazy-highlight ((,c :background ,bg-search-lazy :foreground ,fg-search-lazy)))
+    `(evil-ex-search ((,c :background ,bg-search-current :foreground ,fg-search-current)))
+    `(evil-ex-substitute-matches ((,c :background ,bg-search-replace :foreground ,fg-search-replace)))
+    `(evil-ex-substitute-replacement ((,c :background ,bg-search-current :foreground ,fg-search-current)))
 ;;;;; eww
     `(eww-invalid-certificate ((,c :foreground ,err)))
     `(eww-valid-certificate ((,c :foreground ,info)))
@@ -5341,7 +5454,7 @@ FG and BG are the main colors."
     `(flycheck-color-mode-line-error-face ((,c :background ,bg-prominent-err :foreground ,fg-prominent-err)))
     `(flycheck-color-mode-line-info-face ((,c :background ,bg-prominent-note :foreground ,fg-prominent-note)))
     `(flycheck-color-mode-line-running-face ((,c :inherit modus-themes-slant)))
-    `(flycheck-color-mode-line-info-face ((,c :background ,bg-prominent-warning :foreground ,fg-prominent-warning)))
+    `(flycheck-color-mode-line-warning-face ((,c :background ,bg-prominent-warning :foreground ,fg-prominent-warning)))
 ;;;;; flycheck-indicator
     `(flycheck-indicator-disabled ((,c :inherit modus-themes-slant :foreground ,fg-dim)))
     `(flycheck-indicator-error ((,c :foreground ,err)))
@@ -5354,12 +5467,15 @@ FG and BG are the main colors."
     `(flymake-error ((,c :underline (:style wave :color ,underline-err))))
     `(flymake-error-echo ((,c :foreground ,err)))
     `(flymake-error-echo-at-eol ((,c :inherit modus-themes-slant :foreground ,err :height 0.85 :box ,border)))
+    `(flymake-error-fringe ((,c :background ,bg-prominent-err :foreground ,fg-prominent-err)))
     `(flymake-note ((,c :underline (:style wave :color ,underline-note))))
     `(flymake-note-echo ((,c :foreground ,info)))
     `(flymake-note-echo-at-eol ((,c :inherit modus-themes-slant :foreground ,info :height 0.85 :box ,border)))
+    `(flymake-note-fringe ((,c :background ,bg-prominent-note :foreground ,fg-prominent-note)))
     `(flymake-warning ((,c :underline (:style wave :color ,underline-warning))))
     `(flymake-warning-echo ((,c :foreground ,warning)))
     `(flymake-warning-echo-at-eol ((,c :inherit modus-themes-slant :foreground ,warning :height 0.85 :box ,border)))
+    `(flymake-warning-fringe ((,c :background ,bg-prominent-warning :foreground ,fg-prominent-warning)))
 ;;;;; flyspell
     `(flyspell-duplicate ((,c :underline (:style wave :color ,underline-warning))))
     `(flyspell-incorrect ((,c :underline (:style wave :color ,underline-err))))
@@ -5453,7 +5569,7 @@ FG and BG are the main colors."
     `(git-timemachine-minibuffer-author-face ((,c :foreground ,name)))
     `(git-timemachine-minibuffer-detail-face ((,c :foreground ,fg-main)))
 ;;;;; gnus
-    `(gnus-button ((,c :background ,bg-link :foreground ,fg-link :underline ,underline-link)))
+    `(gnus-button ((,c :underline ,border)))
     `(gnus-cite-1 ((,c :foreground ,mail-cite-0)))
     `(gnus-cite-2 ((,c :foreground ,mail-cite-1)))
     `(gnus-cite-3 ((,c :foreground ,mail-cite-2)))
@@ -5473,13 +5589,13 @@ FG and BG are the main colors."
     `(gnus-emphasis-underline-bold ((,c :inherit gnus-emphasis-bold :underline t)))
     `(gnus-emphasis-underline-bold-italic ((,c :inherit gnus-emphasis-bold-italic :underline t)))
     `(gnus-emphasis-underline-italic ((,c :inherit gnus-emphasis-italic :underline t)))
-    `(gnus-group-mail-1 ((,c :inherit bold :foreground ,magenta-warmer)))
-    `(gnus-group-mail-1-empty ((,c :foreground ,magenta-warmer)))
-    `(gnus-group-mail-2 ((,c :inherit modus-themes-bold :foreground ,magenta-warmer)))
-    `(gnus-group-mail-2-empty ((,c :foreground ,magenta)))
-    `(gnus-group-mail-3 ((,c :inherit modus-themes-bold :foreground ,magenta)))
-    `(gnus-group-mail-3-empty ((,c :foreground ,magenta-cooler)))
-    `(gnus-group-mail-low ((,c :inherit modus-themes-bold :foreground ,magenta-cooler)))
+    `(gnus-group-mail-1 ((,c :inherit bold :foreground ,accent-0)))
+    `(gnus-group-mail-1-empty ((,c :foreground ,accent-0)))
+    `(gnus-group-mail-2 ((,c :inherit modus-themes-bold :foreground ,accent-1)))
+    `(gnus-group-mail-2-empty ((,c :foreground ,accent-1)))
+    `(gnus-group-mail-3 ((,c :inherit modus-themes-bold :foreground ,accent-2)))
+    `(gnus-group-mail-3-empty ((,c :foreground ,accent-2)))
+    `(gnus-group-mail-low ((,c :inherit modus-themes-bold :foreground ,fg-dim)))
     `(gnus-group-mail-low-empty ((,c :foreground ,fg-dim)))
     `(gnus-group-news-1 ((,c :inherit modus-themes-bold :foreground ,green)))
     `(gnus-group-news-1-empty ((,c :foreground ,green)))
@@ -5557,11 +5673,11 @@ FG and BG are the main colors."
 ;;;;; highlight-numbers
     `(highlight-numbers-number ((,c :foreground ,constant)))
 ;;;;; highlight-thing
-    `(highlight-thing ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(highlight-thing ((,c :background ,bg-search-static :foreground ,fg-search-static)))
 ;;;;; hl-fill-column
     `(hl-fill-column-face ((,c :background ,bg-active)))
 ;;;;; hl-todo
-    `(hl-todo ((,c :inherit modus-themes-slant :foreground ,prose-todo)))
+    `(hl-todo ((,c :inherit (modus-themes-bold modus-themes-slant) :foreground ,prose-todo)))
 ;;;;; howm
     `(action-lock-face ((,c :background ,bg-link :foreground ,fg-link :underline ,underline-link)))
     `(howm-mode-keyword-face (( )))
@@ -5579,7 +5695,7 @@ FG and BG are the main colors."
     `(howm-reminder-tomorrow-face ((,c :inherit modus-themes-bold :foreground ,date-scheduled)))
     `(howm-simulate-todo-mode-line-face ((,c :inherit modus-themes-bold)))
     `(howm-view-empty-face (( )))
-    `(howm-view-hilit-face ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(howm-view-hilit-face ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(howm-view-name-face ((,c :inherit modus-themes-bold)))
     `(iigrep-counts-face1 ((,c :foreground ,rainbow-1)))
     `(iigrep-counts-face2 ((,c :foreground ,rainbow-2)))
@@ -5595,8 +5711,13 @@ FG and BG are the main colors."
 ;;;;; hyperbole
     `(hbut-item-face ((,c :foreground ,info)))
     `(hbut-face ((,c :inherit modus-themes-button)))
-    `(hbut-flash ((,c :background ,bg-search-replace)))
+    `(hbut-flash ((,c :background ,bg-search-replace :foreground ,fg-search-replace)))
     `(ibut-face ((,c :background ,bg-link-symbolic :foreground ,fg-link-symbolic :underline ,underline-link-symbolic)))
+;;;;; ibuffer
+    `(ibuffer-deletion ((,c :inherit bold :background ,bg-mark-delete :foreground ,fg-mark-delete)))
+    `(ibuffer-filter-group-name ((,c :inherit bold)))
+    `(ibuffer-marked ((,c :inherit bold :background ,bg-mark-select :foreground ,fg-mark-select)))
+    `(ibuffer-title ((,c :inherit bold)))
 ;;;;; icomplete
     `(icomplete-first-match ((,c :inherit modus-themes-completion-match-0)))
     `(icomplete-vertical-selected-prefix-indicator-face ((,c :inherit modus-themes-bold :foreground ,keybind)))
@@ -5610,8 +5731,8 @@ FG and BG are the main colors."
     `(ido-subdir ((,c :foreground ,keyword)))
     `(ido-virtual ((,c :foreground ,warning)))
 ;;;;; iedit
-    `(iedit-occurrence ((,c :background ,bg-search-lazy :foreground ,fg-main)))
-    `(iedit-read-only-occurrence ((,c :background ,bg-search-current :foreground ,fg-main)))
+    `(iedit-occurrence ((,c :background ,bg-search-lazy :foreground ,fg-search-lazy)))
+    `(iedit-read-only-occurrence ((,c :background ,bg-search-current :foreground ,fg-search-current)))
 ;;;;; iflipb
     `(iflipb-current-buffer-face ((,c :inherit modus-themes-bold :foreground ,name)))
     `(iflipb-other-buffer-face ((,c :foreground ,fg-dim)))
@@ -5633,7 +5754,7 @@ FG and BG are the main colors."
     `(Info-quoted ((,c :inherit modus-themes-fixed-pitch :background ,bg-prose-verbatim :foreground ,fg-prose-verbatim))) ; the capitalization is canonical
     `(info-header-node ((,c :inherit modus-themes-bold :foreground ,fg-dim)))
     `(info-header-xref ((,c :foreground ,fg-link)))
-    `(info-index-match ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(info-index-match ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(info-menu-header ((,c :inherit modus-themes-heading-5)))
     `(info-menu-star ((,c :foreground ,err)))
     `(info-node ((,c :inherit modus-themes-bold)))
@@ -5676,20 +5797,20 @@ FG and BG are the main colors."
 ;;;;; ioccur
     `(ioccur-cursor ((,c :foreground ,fg-main)))
     `(ioccur-invalid-regexp ((,c :foreground ,err)))
-    `(ioccur-match-face ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(ioccur-match-face ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(ioccur-match-overlay-face ((,c :background ,bg-inactive :extend t)))
     `(ioccur-num-line-face ((,c :foreground ,fg-dim)))
     `(ioccur-overlay-face ((,c :background ,bg-hl-line :extend t)))
-    `(ioccur-regexp-face ((,c :background ,bg-search-current :foreground ,fg-main)))
+    `(ioccur-regexp-face ((,c :background ,bg-search-current :foreground ,fg-search-current)))
     `(ioccur-title-face ((,c :inherit modus-themes-bold :foreground ,name)))
 ;;;;; isearch, occur, and the like
-    `(isearch ((,c :background ,bg-search-current :foreground ,fg-main)))
+    `(isearch ((,c :background ,bg-search-current :foreground ,fg-search-current)))
     `(isearch-fail ((,c :background ,bg-prominent-err :foreground ,fg-prominent-err)))
-    `(isearch-group-1 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-main)))
-    `(isearch-group-2 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-main)))
-    `(lazy-highlight ((,c :background ,bg-search-lazy :foreground ,fg-main)))
-    `(match ((,c :background ,bg-search-static :foreground ,fg-main)))
-    `(query-replace ((,c :background ,bg-search-replace :foreground ,fg-main)))
+    `(isearch-group-1 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-search-rx-group-0)))
+    `(isearch-group-2 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-search-rx-group-1)))
+    `(lazy-highlight ((,c :background ,bg-search-lazy :foreground ,fg-search-lazy)))
+    `(match ((,c :background ,bg-search-static :foreground ,fg-search-static)))
+    `(query-replace ((,c :background ,bg-search-replace :foreground ,fg-search-replace)))
 ;;;;; ivy
     `(ivy-action ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
     `(ivy-confirm-face ((,c :foreground ,info)))
@@ -5801,7 +5922,7 @@ FG and BG are the main colors."
     `(line-number-minor-tick ((,c :inherit ,(if modus-themes-mixed-fonts '(fixed-pitch default) 'default) :background ,bg-line-number-inactive :foreground ,accent-1)))
 ;;;;; lsp
     `(lsp-details-face ((,c :height 0.9 :foreground ,fg-dim)))
-    `(lsp-face-rename ((,c :background ,bg-search-replace :foreground ,fg-main)))
+    `(lsp-face-rename ((,c :background ,bg-search-replace :foreground ,fg-search-replace)))
     `(lsp-headerline-breadcrumb-separator-face ((,c :foreground ,fg-dim)))
     `(lsp-headerline-breadcrumb-path-face ((,c :foreground ,string)))
     `(lsp-headerline-breadcrumb-path-error-face ((,c :underline (:style wave :color ,underline-err))))
@@ -5829,11 +5950,11 @@ FG and BG are the main colors."
     `(lsp-ui-peek-list ((,c :background ,bg-dim)))
     `(lsp-ui-peek-filename ((,c :inherit modus-themes-bold :foreground ,name)))
     `(lsp-ui-peek-line-number ((,c :foreground ,fg-dim)))
-    `(lsp-ui-peek-highlight ((,c :background ,bg-dim :box (:line-width -1 :color ,border))))
+    `(lsp-ui-peek-highlight ((,c :background ,bg-dim ,@(modus-themes--box border -1 nil))))
     `(lsp-ui-peek-header ((,c :inherit modus-themes-bold)))
     `(lsp-ui-peek-selection ((,c :background ,bg-region :foreground ,fg-region)))
-    `(lsp-ui-sideline-symbol ((,c :foreground ,fg-dim :box (:line-width -1 :color ,border))))
-    `(lsp-ui-sideline-current-symbol ((,c :inherit modus-themes-bold :foreground ,fg-main :box (:line-width -1 :color ,border))))
+    `(lsp-ui-sideline-symbol ((,c :foreground ,fg-dim ,@(modus-themes--box border -1 nil))))
+    `(lsp-ui-sideline-current-symbol ((,c :inherit modus-themes-bold :foreground ,fg-main ,@(modus-themes--box border -1 nil))))
     `(lsp-ui-sideline-code-action ((,c :foreground ,modeline-warning)))
     `(lsp-ui-sideline-symbol-info ((,c :inherit modus-themes-slant)))
 ;;;;; magit
@@ -5932,7 +6053,7 @@ FG and BG are the main colors."
     `(marginalia-char ((,c :foreground ,accent-2)))
     `(marginalia-date ((,c :foreground ,date-common)))
     `(marginalia-documentation ((,c :inherit modus-themes-slant :foreground ,docstring)))
-    `(marginalia-file-name (( )))
+    `(marginalia-file-name ((,c :foreground ,fg-dim)))
     `(marginalia-file-owner ((,c :foreground ,fg-dim)))
     `(marginalia-file-priv-dir ((,c :foreground ,accent-0)))
     `(marginalia-file-priv-exec ((,c :foreground ,accent-1)))
@@ -6040,28 +6161,28 @@ FG and BG are the main colors."
                 :background ,bg-mode-line-active
                 :foreground ,fg-mode-line-active)
        (((supports :box t))
-        :box ,border-mode-line-active)
+        ,@(modus-themes--box border-mode-line-active nil nil))
        (t :underline ,border-mode-line-active)))
     `(mode-line-active
       ((default :inherit modus-themes-ui-variable-pitch
                 :background ,bg-mode-line-active
                 :foreground ,fg-mode-line-active)
        (((supports :box t))
-        :box ,border-mode-line-active)
+        ,@(modus-themes--box border-mode-line-active nil nil))
        (t :underline ,border-mode-line-active)))
     `(mode-line-buffer-id ((,c :inherit bold)))
     `(mode-line-emphasis ((,c :inherit italic :foreground ,modeline-info)))
     `(mode-line-highlight
       ((default :background ,bg-hover :foreground ,fg-main)
        (((supports :box t))
-        :box ,fg-main)
+        ,@(modus-themes--box fg-main nil nil))
        (t :underline ,fg-main)))
     `(mode-line-inactive
       ((default :inherit modus-themes-ui-variable-pitch
                 :background ,bg-mode-line-inactive
                 :foreground ,fg-mode-line-inactive)
        (((supports :box t))
-        :box ,border-mode-line-inactive)
+        ,@(modus-themes--box border-mode-line-inactive nil nil))
        (t :underline ,border-mode-line-inactive)))
 ;;;;; mood-line
     `(mood-line-modified ((,c :inherit modus-themes-slant)))
@@ -6178,7 +6299,7 @@ FG and BG are the main colors."
     `(neo-vc-missing-face ((,c :foreground ,err)))
     `(neo-vc-needs-merge-face ((,c :inherit modus-themes-slant)))
     `(neo-vc-needs-update-face ((,c :inherit underline)))
-    `(neo-vc-removed-face ((,c :strike-through t)))
+    `(neo-vc-removed-face ((,c :underline (:style wave :color ,underline-err) :foreground ,err)))
     `(neo-vc-unlocked-changes-face ((,c :foreground ,info)))
     `(neo-vc-up-to-date-face (( )))
     `(neo-vc-user-face ((,c :foreground ,warning)))
@@ -6201,8 +6322,8 @@ FG and BG are the main colors."
     `(notmuch-search-non-matching-authors ((,c :foreground ,fg-dim)))
     `(notmuch-search-subject ((,c :foreground ,fg-main)))
     `(notmuch-search-unread-face ((,c :inherit bold)))
-    `(notmuch-tag-added ((,c :underline ,info)))
-    `(notmuch-tag-deleted ((,c :strike-through ,err)))
+    `(notmuch-tag-added ((,c :underline (:style wave :color ,underline-note) :foreground ,info)))
+    `(notmuch-tag-deleted ((,c :underline (:style wave :color ,underline-err) :foreground ,err)))
     `(notmuch-tag-face ((,c :foreground ,accent-0)))
     `(notmuch-tag-flagged ((,c :foreground ,keyword)))
     `(notmuch-tag-unread ((,c :foreground ,accent-1)))
@@ -6287,15 +6408,15 @@ FG and BG are the main colors."
     `(org-date-selected
       ((default :foreground ,date-common :inverse-video t)
        (((supports :box t))
-        :box (:line-width (-1 . -1) :color ,fg-main))))
+        ,@(modus-themes--box fg-main '(-1 . -1) nil))))
     ;; NOTE 2024-03-17: Normally we do not want to add this padding
     ;; with the :box, but I do it here because the keys are otherwise
     ;; very hard to read.  The square brackets around them are not
     ;; colored, which is what is causing the problem.
     `(org-dispatcher-highlight
-      ((default :background ,bg-mark-select :foreground ,fg-main)
+      ((default :inherit bold :background ,bg-mark-select :foreground ,fg-mark-select)
        (((supports :box t))
-        :box (:line-width 2 :color ,bg-mark-select))
+        ,@(modus-themes--box bg-mark-select 2 nil))
        (t :underline ,border)))
     `(org-document-info ((,c :foreground ,prose-metadata-value)))
     `(org-document-info-keyword ((,c :inherit modus-themes-fixed-pitch :foreground ,prose-metadata)))
@@ -6346,15 +6467,19 @@ FG and BG are the main colors."
     `(org-verse ((,c :inherit modus-themes-fixed-pitch :background ,bg-prose-block-contents :extend t)))
     `(org-warning ((,c :foreground ,warning)))
 ;;;;; org-habit
-    ;; NOTE 2025-10-24: All foregrounds here are a special case.
-    `(org-habit-alert-face ((,c :background ,bg-graph-yellow-0 :foreground ,(readable-foreground-color bg-graph-yellow-0))))
-    `(org-habit-alert-future-face ((,c :background ,bg-graph-yellow-1 :foreground ,(readable-foreground-color bg-graph-yellow-1))))
-    `(org-habit-clear-face ((,c :background ,bg-graph-blue-0 :foreground ,(readable-foreground-color bg-graph-blue-0))))
-    `(org-habit-clear-future-face ((,c :background ,bg-graph-blue-1 :foreground ,(readable-foreground-color bg-graph-blue-1))))
-    `(org-habit-overdue-face ((,c :background ,bg-graph-red-0 :foreground ,(readable-foreground-color bg-graph-red-0))))
-    `(org-habit-overdue-future-face ((,c :background ,bg-graph-red-1 :foreground ,(readable-foreground-color bg-graph-red-1))))
-    `(org-habit-ready-face ((,c :background ,bg-graph-green-0 :foreground ,(readable-foreground-color bg-graph-green-0))))
-    `(org-habit-ready-future-face ((,c :background ,bg-graph-green-1 :foreground ,(readable-foreground-color bg-graph-green-1))))
+    ;; NOTE 2025-11-12: We used to have `readable-foreground-color'
+    ;; for the foreground values of these faces, but that function
+    ;; breaks the theme if it is loaded in the early-init.el.  Maybe
+    ;; we can find a better solution.  I do not want to introduce new
+    ;; palette entries or a new function just for these faces though.
+    `(org-habit-alert-face ((,c :background ,bg-graph-yellow-0)))
+    `(org-habit-alert-future-face ((,c :background ,bg-graph-yellow-1)))
+    `(org-habit-clear-face ((,c :background ,bg-graph-blue-0)))
+    `(org-habit-clear-future-face ((,c :background ,bg-graph-blue-1)))
+    `(org-habit-overdue-face ((,c :background ,bg-graph-red-0)))
+    `(org-habit-overdue-future-face ((,c :background ,bg-graph-red-1)))
+    `(org-habit-ready-face ((,c :background ,bg-graph-green-0)))
+    `(org-habit-ready-future-face ((,c :background ,bg-graph-green-1)))
 ;;;;; org-journal
     `(org-journal-calendar-entry-face ((,c :inherit modus-themes-slant :foreground ,date-common)))
     `(org-journal-calendar-scheduled-face ((,c :inherit modus-themes-slant :foreground ,date-scheduled-subtle)))
@@ -6454,7 +6579,7 @@ FG and BG are the main colors."
     `(proced-user (( )))
 ;;;;; popup
     `(popup-face ((,c :background ,bg-inactive :foreground ,fg-main)))
-    `(popup-isearch-match ((,c :background ,bg-search-current :foreground ,fg-main)))
+    `(popup-isearch-match ((,c :background ,bg-search-current :foreground ,fg-search-current)))
     `(popup-menu-mouse-face ((,c :background ,bg-hover :foreground ,fg-main)))
     `(popup-menu-selection-face ((,c :inherit modus-themes-completion-selected)))
     `(popup-scroll-bar-background-face ((,c :background ,bg-active)))
@@ -6548,10 +6673,10 @@ FG and BG are the main colors."
     `(recursion-indicator-general ((,c :foreground ,modeline-err)))
     `(recursion-indicator-minibuffer ((,c :foreground ,modeline-info)))
 ;;;;; regexp-builder (re-builder)
-    `(reb-match-0 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-main)))
-    `(reb-match-1 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-main)))
-    `(reb-match-2 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-main)))
-    `(reb-match-3 ((,c :background ,bg-search-rx-group-3 :foreground ,fg-main)))
+    `(reb-match-0 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-search-rx-group-0)))
+    `(reb-match-1 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-search-rx-group-1)))
+    `(reb-match-2 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-search-rx-group-2)))
+    `(reb-match-3 ((,c :background ,bg-search-rx-group-3 :foreground ,fg-search-rx-group-3)))
     `(reb-regexp-grouping-backslash ((,c :inherit modus-themes-bold :foreground ,rx-backslash)))
     `(reb-regexp-grouping-construct ((,c :inherit modus-themes-bold :foreground ,rx-construct)))
 ;;;;; rg (rg.el)
@@ -6562,7 +6687,7 @@ FG and BG are the main colors."
     `(rg-filename-face ((,c :inherit modus-themes-bold :foreground ,name)))
     `(rg-line-number-face ((,c :foreground ,fg-dim)))
     `(rg-literal-face ((,c :foreground ,constant)))
-    `(rg-match-face ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(rg-match-face ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(rg-regexp-face ((,c :foreground ,name)))
     `(rg-toggle-off-face ((,c :inherit modus-themes-bold :foreground ,fg-dim)))
     `(rg-toggle-on-face ((,c :foreground ,info)))
@@ -6571,7 +6696,7 @@ FG and BG are the main colors."
     `(ripgrep-context-face ((,c :foreground ,fg-dim)))
     `(ripgrep-error-face ((,c :foreground ,err)))
     `(ripgrep-hit-face ((,c :foreground ,info)))
-    `(ripgrep-match-face ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(ripgrep-match-face ((,c :background ,bg-search-static :foreground ,fg-search-static)))
 ;;;;; rmail
     `(rmail-header-name ((,c :inherit bold)))
     `(rmail-highlight ((,c :inherit bold :foreground ,mail-other)))
@@ -6623,7 +6748,7 @@ FG and BG are the main colors."
     `(shr-h4 ((,c :inherit modus-themes-heading-4)))
     `(shr-h5 ((,c :inherit modus-themes-heading-5)))
     `(shr-h6 ((,c :inherit modus-themes-heading-6)))
-    `(shr-mark ((,c :background ,bg-search-static :foreground ,fg-main)))
+    `(shr-mark ((,c :background ,bg-search-static :foreground ,fg-search-static)))
     `(shr-selected-link ((,c :inherit bold :background ,bg-mark-select :foreground ,fg-mark-select)))
 ;;;;; side-notes
     `(side-notes ((,c :background ,bg-dim :foreground ,fg-dim)))
@@ -6655,7 +6780,6 @@ FG and BG are the main colors."
     `(sly-error-face ((,c :underline (:style wave :color ,underline-err))))
     `(sly-mode-line ((,c :inherit italic :foreground ,modeline-info)))
     `(sly-mrepl-output-face ((,c :foreground ,string)))
-    `(sly-mrepl-output-face ((,c :foreground ,string)))
     `(sly-mrepl-prompt-face ((,c :inherit modus-themes-prompt)))
     `(sly-note-face ((,c :underline (:style wave :color ,underline-note))))
     `(sly-stickers-placed-face ((,c :background ,bg-inactive)))
@@ -6732,11 +6856,11 @@ FG and BG are the main colors."
     `(symbol-overlay-face-1 ((,c :background ,bg-blue-intense :foreground ,fg-main)))
     `(symbol-overlay-face-2 ((,c :background ,bg-magenta-intense :foreground ,fg-main)))
     `(symbol-overlay-face-3 ((,c :background ,bg-yellow-intense :foreground ,fg-main)))
-    `(symbol-overlay-face-4 ((,c :background ,bg-magenta-intense :foreground ,fg-main)))
+    `(symbol-overlay-face-4 ((,c :background ,bg-cyan-intense :foreground ,fg-main)))
     `(symbol-overlay-face-5 ((,c :background ,bg-red-intense :foreground ,fg-main)))
-    `(symbol-overlay-face-6 ((,c :background ,bg-red-intense :foreground ,fg-main)))
-    `(symbol-overlay-face-7 ((,c :background ,bg-cyan-intense :foreground ,fg-main)))
-    `(symbol-overlay-face-8 ((,c :background ,bg-cyan-intense :foreground ,fg-main)))
+    `(symbol-overlay-face-6 ((,c :background ,bg-green-intense :foreground ,fg-main)))
+    `(symbol-overlay-face-7 ((,c :background ,bg-red-subtle :foreground ,fg-main)))
+    `(symbol-overlay-face-8 ((,c :background ,bg-cyan-subtle :foreground ,fg-main)))
 ;;;;; syslog-mode
     `(syslog-debug ((,c :inherit modus-themes-slant)))
     `(syslog-error ((,c :foreground ,err)))
@@ -6749,20 +6873,20 @@ FG and BG are the main colors."
     `(syslog-warn ((,c :foreground ,warning)))
 ;;;;; tab-bar-mode
     `(tab-bar ((,c :inherit modus-themes-ui-variable-pitch :background ,bg-tab-bar)))
-    `(tab-bar-tab-group-current ((,c :inherit modus-themes-bold :background ,bg-tab-current :box (:line-width -2 :color ,bg-tab-current) :foreground ,fg-alt)))
-    `(tab-bar-tab-group-inactive ((,c :background ,bg-tab-bar :box (:line-width -2 :color ,bg-tab-bar) :foreground ,fg-alt)))
-    `(tab-bar-tab ((,c :inherit modus-themes-bold :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current)))
+    `(tab-bar-tab-group-current ((,c :inherit modus-themes-bold :background ,bg-tab-current :foreground ,fg-alt ,@(modus-themes--box bg-tab-current -2 nil))))
+    `(tab-bar-tab-group-inactive ((,c :background ,bg-tab-bar :foreground ,fg-alt ,@(modus-themes--box bg-tab-bar -2 nil))))
+    `(tab-bar-tab ((,c :inherit modus-themes-bold :background ,bg-tab-current ,@(modus-themes--box bg-tab-current -2 nil))))
     `(tab-bar-tab-highlight ((,c :background ,bg-hover :foreground ,fg-main :box t)))
-    `(tab-bar-tab-inactive ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other)))
-    `(tab-bar-tab-ungrouped ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other)))
+    `(tab-bar-tab-inactive ((,c :background ,bg-tab-other ,@(modus-themes--box bg-tab-other -2 nil))))
+    `(tab-bar-tab-ungrouped ((,c :background ,bg-tab-other ,@(modus-themes--box bg-tab-other -2 nil))))
 ;;;;; tab-line-mode
     `(tab-line ((,c :inherit modus-themes-ui-variable-pitch :background ,bg-tab-bar :height 0.95)))
     `(tab-line-close-highlight ((,c :foreground ,err)))
     `(tab-line-highlight ((,c :background ,bg-hover :foreground ,fg-main)))
     `(tab-line-tab (( )))
-    `(tab-line-tab-current ((,c :inherit modus-themes-bold :box (:line-width -2 :color ,bg-tab-current) :background ,bg-tab-current)))
-    `(tab-line-tab-inactive ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other)))
-    `(tab-line-tab-inactive-alternate ((,c :box (:line-width -2 :color ,bg-tab-other) :background ,bg-tab-other :foreground ,fg-alt)))
+    `(tab-line-tab-current ((,c :inherit modus-themes-bold :background ,bg-tab-current ,@(modus-themes--box bg-tab-current -2 nil))))
+    `(tab-line-tab-inactive ((,c :background ,bg-tab-other ,@(modus-themes--box bg-tab-other -2 nil))))
+    `(tab-line-tab-inactive-alternate ((,c :background ,bg-tab-other :foreground ,fg-alt ,@(modus-themes--box bg-tab-other -2 nil))))
     `(tab-line-tab-modified ((,c :foreground ,warning)))
 ;;;;; table (built-in table.el)
     `(table-cell ((,c :background ,bg-dim)))
@@ -6824,38 +6948,29 @@ FG and BG are the main colors."
     `(tmr-tabulated-start-time ((,c :foreground ,date-common)))
 ;;;;; transient
     `(transient-active-infix ((,c :background ,bg-hover :foreground ,fg-main)))
-    `(transient-amaranth ((,c :inherit bold :foreground ,yellow-warmer)))
     ;; Placate the compiler for what is a spurious warning.  We also
     ;; have to do this with `eldoc-highlight-function-argument'.
     (list 'transient-argument `((,c :inherit modus-themes-bold :background ,bg-active-argument :foreground ,fg-active-argument)))
-    `(transient-blue ((,c :inherit bold :foreground ,blue)))
     `(transient-disabled-suffix ((,c :inherit bold :background ,bg-mark-delete :foreground ,fg-mark-delete)))
     `(transient-enabled-suffix ((,c :inherit bold :background ,bg-mark-select :foreground ,fg-mark-select)))
     `(transient-heading ((,c :inherit bold :foreground ,fg-main)))
     `(transient-inactive-argument ((,c :foreground ,fg-dim)))
     `(transient-inactive-value ((,c :foreground ,fg-dim)))
-    ;; NOTE 2023-12-09 10:30:09 +0200: The new user option
-    ;; `transient-semantic-coloring' is enabled by default.  This is
-    ;; not good for us, because we are making it harder for users who
-    ;; need accessible colors to use the transient interfaces.  I
-    ;; could set that user option to nil, but I think it is less
-    ;; intrusive to enforce uniformity among the relevant faces.
-    ;; Those who want semantic coloring can modify these faces.
+    `(transient-inapt-argument ((,c :inherit bold :foreground ,fg-dim)))
+    `(transient-inapt-suffix ((,c :inherit italic :foreground ,fg-dim)))
     `(transient-key ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
-    `(transient-key-exit ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
-    `(transient-key-noop ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind :strike-through t)))
-    `(transient-key-recurse ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
-    `(transient-key-return ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
-    `(transient-key-stack ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
-    `(transient-key-stay ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,keybind)))
+    ;; NOTE 2025-11-19: With regard to `transient-semantic-coloring',
+    ;; also see `modus-themes-faces-deuteranopia' and `modus-themes-faces-tritanopia'.
+    `(transient-key-exit ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,red-warmer)))
+    `(transient-key-noop ((,c :inherit modus-themes-fixed-pitch :foreground ,fg-dim)))
+    `(transient-key-recurse ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,fg-main)))
+    `(transient-key-return ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,yellow)))
+    `(transient-key-stack ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,blue-cooler)))
+    `(transient-key-stay ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,green-cooler)))
     `(transient-mismatched-key ((,c :inherit underline)))
     `(transient-nonstandard-key ((,c :inherit underline)))
-    `(transient-pink ((,c :inherit bold :foreground ,magenta)))
-    `(transient-purple ((,c :inherit bold :foreground ,magenta-cooler)))
-    `(transient-red ((,c :inherit bold :foreground ,red-faint)))
-    `(transient-teal ((,c :inherit bold :foreground ,cyan-cooler)))
     `(transient-unreachable ((,c :foreground ,fg-dim)))
-    `(transient-unreachable-key ((,c :foreground ,fg-dim)))
+    `(transient-unreachable-key ((,c :inherit modus-themes-fixed-pitch :foreground ,fg-dim)))
     `(transient-value ((,c :inherit modus-themes-bold :background ,bg-active-value :foreground ,fg-active-value)))
 ;;;;; trashed
     `(trashed-deleted ((,c :inherit bold :background ,bg-mark-delete :foreground ,fg-mark-delete)))
@@ -6942,45 +7057,45 @@ FG and BG are the main colors."
     `(vc-dir-status-edited ((,c :inherit modus-themes-slant)))
     `(vc-dir-status-ignored ((,c :foreground ,fg-dim)))
     `(vc-dir-status-up-to-date ((,c :foreground ,info)))
-    `(vc-dir-status-warning ((,c :foreground ,err)))
+    `(vc-dir-status-warning ((,c :foreground ,warning)))
     `(vc-conflict-state ((,c :foreground ,err)))
     `(vc-edited-state ((,c :inherit modus-themes-slant)))
     `(vc-git-log-edit-summary-max-warning ((,c :foreground ,err)))
     `(vc-git-log-edit-summary-target-warning ((,c :foreground ,warning)))
     `(vc-locally-added-state ((,c :inherit modus-themes-slant)))
     `(vc-locked-state ((,c :foreground ,info)))
-    `(vc-missing-state ((,c :foreground ,err)))
+    `(vc-missing-state ((,c :underline (:style wave :color ,underline-warning) :foreground ,warning)))
     `(vc-needs-update-state ((,c :foreground ,err)))
-    `(vc-removed-state ((,c :foreground ,err)))
+    `(vc-removed-state ((,c :underline (:style wave :color ,underline-err) :foreground ,err)))
     `(vc-state-base (( )))
     `(vc-up-to-date-state (( )))
 ;;;;; vertico
     `(vertico-current ((,c :inherit modus-themes-completion-selected)))
 ;;;;; vertico-quick
-    `(vertico-quick1 ((,c :inherit bold :background ,bg-search-current :foreground ,fg-main)))
-    `(vertico-quick2 ((,c :inherit bold :background ,bg-search-current :foreground ,fg-main)))
+    `(vertico-quick1 ((,c :inherit bold :background ,bg-search-current :foreground ,fg-search-current)))
+    `(vertico-quick2 ((,c :inherit bold :background ,bg-search-current :foreground ,fg-search-current)))
 ;;;;; vimish-fold
     `(vimish-fold-fringe ((,c :foreground ,info)))
     `(vimish-fold-mouse-face ((,c :background ,bg-hover :foreground ,fg-main)))
     `(vimish-fold-overlay ((,c :background ,bg-inactive)))
 ;;;;; viper
-    `(viper-search ((,c :background ,bg-search-current :foreground ,fg-main)))
-    `(viper-replace-overlay ((,c :background ,bg-search-replace :foreground ,fg-main)))
+    `(viper-search ((,c :background ,bg-search-current :foreground ,fg-search-current)))
+    `(viper-replace-overlay ((,c :background ,bg-search-replace :foreground ,fg-search-replace)))
     `(viper-minibuffer-emacs (( )))
     `(viper-minibuffer-insert (( )))
     `(viper-minibuffer-vi (( )))
 ;;;;; visible-mark
-    `(visible-mark-active ((,c :background ,bg-search-static :foreground ,fg-main)))
-    `(visible-mark-face1 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-main)))
-    `(visible-mark-face2 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-main)))
-    `(visible-mark-forward-face1 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-main)))
-    `(visible-mark-forward-face2 ((,c :background ,bg-search-rx-group-3 :foreground ,fg-main)))
+    `(visible-mark-active ((,c :background ,bg-search-static :foreground ,fg-search-static)))
+    `(visible-mark-face1 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-search-rx-group-0)))
+    `(visible-mark-face2 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-search-rx-group-1)))
+    `(visible-mark-forward-face1 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-search-rx-group-2)))
+    `(visible-mark-forward-face2 ((,c :background ,bg-search-rx-group-3 :foreground ,fg-search-rx-group-3)))
 ;;;;; visual-regexp
-    `(vr/group-0 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-main)))
-    `(vr/group-1 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-main)))
-    `(vr/group-2 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-main)))
-    `(vr/match-0 ((,c :background ,bg-search-current :foreground ,fg-main)))
-    `(vr/match-1 ((,c :background ,bg-search-lazy :foreground ,fg-main)))
+    `(vr/group-0 ((,c :background ,bg-search-rx-group-0 :foreground ,fg-search-rx-group-0)))
+    `(vr/group-1 ((,c :background ,bg-search-rx-group-1 :foreground ,fg-search-rx-group-1)))
+    `(vr/group-2 ((,c :background ,bg-search-rx-group-2 :foreground ,fg-search-rx-group-2)))
+    `(vr/match-0 ((,c :background ,bg-search-current :foreground ,fg-search-current)))
+    `(vr/match-1 ((,c :background ,bg-search-lazy :foreground ,fg-search-lazy)))
     `(vr/match-separator-face ((,c :inherit bold :background ,bg-active)))
 ;;;;; vterm
     `(vterm-color-black ((,c :background ,bg-term-black :foreground ,fg-term-black)))
@@ -7135,6 +7250,8 @@ FG and BG are the main colors."
     `(xah-elisp-cap-variable ((,c :foreground ,preprocessor)))
     `(xah-elisp-command-face ((,c :inherit modus-themes-bold :foreground ,type)))
     `(xah-elisp-dollar-symbol ((,c :foreground ,variable)))
+;;;;; xref
+    `(xref-file-header ((,c :foreground ,name)))
 ;;;;; yaml-mode
     `(yaml-tab-face ((,c :background ,bg-space-err)))
 ;;;;; yasnippet
@@ -7154,6 +7271,26 @@ FG and BG are the main colors."
     `(ztreep-node-face ((,c :foreground ,accent-0))))
   "Face specs for use with `modus-themes-theme'.")
 
+(defconst modus-themes-faces-deuteranopia
+  '(
+    `(transient-key-exit ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,yellow-warmer)))
+    `(transient-key-noop ((,c :inherit modus-themes-fixed-pitch :foreground ,fg-dim)))
+    `(transient-key-recurse ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,fg-main)))
+    `(transient-key-return ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,yellow-cooler)))
+    `(transient-key-stack ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,blue-cooler)))
+    `(transient-key-stay ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,cyan-faint))))
+  "Faces that must be used by themes that are optimized for deuteranopia.")
+
+(defconst modus-themes-faces-tritanopia
+  '(
+    `(transient-key-exit ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,red-warmer)))
+    `(transient-key-noop ((,c :inherit modus-themes-fixed-pitch :foreground ,fg-dim)))
+    `(transient-key-recurse ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,fg-main)))
+    `(transient-key-return ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,magenta)))
+    `(transient-key-stack ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,cyan)))
+    `(transient-key-stay ((,c :inherit (bold modus-themes-fixed-pitch) :foreground ,cyan-faint))))
+  "Faces that must be used by themes that are optimized for tritanopia.")
+
 (defconst modus-themes-custom-variables
   '(
 ;;;; ansi-colors
@@ -7243,7 +7380,7 @@ To simply register the theme, use `modus-themes-register'."
    description
    (list :kind 'color-scheme :background-mode background-mode :family family
          :modus-core-palette core-palette :modus-user-palette user-palette
-         :modus-overrides-palette overrides-palette)))
+         :modus-overrides-palette overrides-palette :modus-documentation description)))
 
 (defun modus-themes-register (name)
   "Add NAME theme to `modus-themes-registered-items'.
@@ -7264,7 +7401,7 @@ are symbols of variables which define palettes commensurate with
 The optional CUSTOM-FACES and CUSTOM-VARIABLES are joined together with
 the `modus-themes-faces' and `modus-themes-custom-variables',
 respectively.  A derivative theme defining those is thus overriding what
-the Modus themess have by default.
+the Modus themes have by default.
 
 Consult the manual for details on how to build a theme on top of the
 `modus-themes': Info node `(modus-themes) Build on top of the Modus themes'."
@@ -7280,7 +7417,9 @@ Consult the manual for details on how to build a theme on top of the
       (modus-themes-declare
        name family
        description background-mode
-       core-palette user-palette overrides-palette))
+       core-palette user-palette overrides-palette)
+      (unless (eq family 'modus-themes)
+        (modus-themes-register name)))
     (let ((palette (modus-themes--get-theme-palette-subr name :with-overrides :with-user-palette)))
       (eval
        `(let* ((c '((class color) (min-colors 256)))
@@ -7302,6 +7441,16 @@ Consult the manual for details on how to build a theme on top of the
 
 ;;;; Use theme colors
 
+(defun modus-themes--with-colors-get-palette (theme)
+  "Get THEME palette for `modus-themes-with-colors'.
+Return (list CORE USER OVERRIDES) palettes."
+  (when-let* ((properties (get theme 'theme-properties))
+              (core-palette (symbol-value (plist-get properties :modus-core-palette))))
+    (let* ((user-palette (symbol-value (plist-get properties :modus-user-palette)))
+           (overrides-palette (symbol-value (plist-get properties :modus-overrides-palette)))
+           (all-overrides (append overrides-palette modus-themes-common-palette-overrides)))
+      (list core-palette user-palette all-overrides))))
+
 (defun modus-themes--with-colors-resolve-palette-sort (colors)
   "Sort all COLORS in the theme's palette.
 Put all named colors before semantic color mappings.  A named color is a
@@ -7310,32 +7459,36 @@ whose value is another symbol, which ultimately resolves to a string or
 `unspecified'."
   (let ((named nil)
         (semantic nil))
-    (dolist (color colors)
-      (if (stringp (cadr color))
-          (push color named)
-        (push color semantic)))
-    (seq-uniq
-     (nconc (nreverse named) (nreverse semantic))
-     (lambda (elt1 elt2)
-       (eq (car elt1) (car elt2))))))
-
-(defun modus-themes-with-colors-subr (expressions)
-  "Do the work of `modus-themes-with-colors' for EXPRESSIONS."
+    (dolist (group colors)
+      (dolist (color group)
+        (if (stringp (cadr color))
+            (push color named)
+          (push color semantic))))
+    (let* ((unique-fn (lambda (sequence)
+                        (seq-uniq sequence
+                                  (lambda (elt1 elt2)
+                                    (eq (car elt1) (car elt2))))))
+           (named-unique (funcall unique-fn named))
+           (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* ((theme (modus-themes-get-current-theme :no-enable)))
+      (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)
-                 ,@(modus-themes--with-colors-resolve-palette-sort
-                    (modus-themes--get-theme-palette-subr theme :with-overrides :with-user-palette)))
-            ,@expressions)
-         :lexical))
+                 ,@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 ',body))
+  `(modus-themes-with-colors-subr (lambda () ,@body)))
 
 ;;;; Declare all the Modus themes
 
@@ -7383,8 +7536,9 @@ accordingly."
 ;;;; Let derivative themes create commands to load only their themes
 
 (defvar modus-themes-define-derivative-command-known-suffixes
-  '( toggle rotate select load-random load-random-dark
-     load-random-light list-colors list-colors-current)
+  '( toggle rotate select select-dark select-light
+     load-random load-random-dark load-random-light
+     list-colors list-colors-current)
   "Command suffixes accepted by `modus-themes-define-derivative-command'.")
 
 (defmacro modus-themes-define-derivative-command (family suffix)
@@ -7396,13 +7550,312 @@ defined command's symbol is FAMILY-SUFFIX, like `modus-themes-rotate'."
     (error "Cannot define command with unknown suffix `%s'" suffix))
   (let ((modus-command (intern (format "modus-themes-%s" suffix))))
     `(defun ,(intern (format "%s-%s" family suffix)) ()
-       ,(format "Like `%s' but only consider members of the `%s'" modus-command family)
+       ,(format "Like `%s' but only for the `%s'" modus-command family)
        (interactive)
        (cl-letf (((symbol-function 'modus-themes-get-themes)
                   (lambda ()
                     (modus-themes-get-all-known-themes ',family))))
          (call-interactively ',modus-command)))))
 
+;;;; Generate a palette given the base colors
+
+;; NOTE 2025-11-25: This is a copy of `color-blend' from Emacs 31.  We
+;; should remove this in the future.
+(defun modus-themes-blend (a b &optional alpha)
+  "Blend the two colors A and B in linear space with ALPHA.
+A and B should be lists (RED GREEN BLUE), where each element is
+between 0.0 and 1.0, inclusive.  ALPHA controls the influence A
+has on the result and should be between 0.0 and 1.0, inclusive.
+
+For instance:
+
+   (modus-themes-blend \\='(1 0.5 1) \\='(0 0 0) 0.75)
+      => (0.75 0.375 0.75)"
+  (setq alpha (or alpha 0.5))
+  (let (blend)
+    (dotimes (i 3)
+      (push (+ (* (nth i a) alpha) (* (nth i b) (- 1 alpha))) blend))
+    (nreverse blend)))
+
+(defun modus-themes--color-six-digits (color)
+  "Reduce representation of hexadecimal RGB COLOR to six digits."
+  (let ((color-no-hash (substring color 1)))
+    (if (= (length color-no-hash) 6)
+        color
+      (let* ((triplets (seq-split color-no-hash 4))
+             (triplets-shortened (mapcar
+                                  (lambda (string)
+                                    (substring string 0 2))
+                                  triplets)))
+        (concat "#" (string-join triplets-shortened))))))
+
+(defun modus-themes-generate-color-blend (color blended-with alpha)
+  "Return hexadecimal RGB of COLOR with BLENDED-WITH given ALPHA.
+BLENDED-WITH is commensurate with COLOR.  ALPHA is between 0.0 and 1.0,
+inclusive."
+  (let* ((blend-rgb (modus-themes-blend (color-name-to-rgb color) (color-name-to-rgb blended-with) alpha))
+         (blend-hex (apply #'color-rgb-to-hex blend-rgb)))
+    (modus-themes--color-six-digits blend-hex)))
+
+(defun modus-themes-generate-color-warmer (color alpha)
+  "Return warmer COLOR by ALPHA, per `modus-themes-generate-color-blend'."
+  (modus-themes-generate-color-blend color "#ff0000" alpha))
+
+(defun modus-themes-generate-color-cooler (color alpha)
+  "Return cooler COLOR by ALPHA, per `modus-themes-generate-color-blend'."
+  (modus-themes-generate-color-blend color "#0000ff" alpha))
+
+;; NOTE 2025-11-24: I originally wrote a variation of this for my Doric themes.
+(defun modus-themes-generate-gradient (color percent)
+  "Adjust value of COLOR by PERCENT."
+  (pcase-let* ((`(,r ,g ,b) (color-name-to-rgb color))
+               (color-luminance-dark-limit 0.5)
+               (gradient (funcall (if (color-dark-p (list r g b))
+                                      #'color-lighten-name
+                                    #'color-darken-name)
+                                  color
+                                  percent)))
+    (modus-themes--color-six-digits gradient)))
+
+;; NOTE 2025-11-25: I used to rely on `color-distance', thinking that
+;; it would do the right thing here:
+;;
+;;     (> (color-distance color "#ff0000") (color-distance color "#0000ff"))
+;;
+;; But my understanding of "warm" versus "cool" is simple, so better
+;; do it my way.
+(defun modus-themes-color-warm-p (color)
+  "Return non-nil if COLOR is warm.
+A warm color has more contribution from the red channel of light than
+the blue one."
+  (pcase-let ((`(,r ,_ ,b) (color-name-to-rgb color)))
+    (> r b)))
+
+(defun modus-themes-color-is-warm-or-cool-p (color)
+  "Return `warm' or `cool' for COLOR depending on its value."
+  (if (modus-themes-color-warm-p color)
+      'warm
+    'cool))
+
+(defun modus-themes-generate-color-warmer-or-cooler (color alpha &optional preference)
+  "Return COLOR variant by ALPHA and PREFERENCE.
+PREFERENCE is either `cool' or `warm'.  An unknown PREFERENCE means
+`cool'.  Without PREFERENCE, rely on the return value of
+`modus-themes-color-is-warm-or-cool-p'."
+  (let ((kind (or preference (modus-themes-color-is-warm-or-cool-p color))))
+    (funcall
+     (if (eq kind 'warm)
+         #'modus-themes-generate-color-warmer
+       'modus-themes-generate-color-cooler)
+     color
+     alpha)))
+
+;;;###autoload
+(defun modus-themes-generate-palette (base-colors &optional cool-or-warm-preference core-palette mappings)
+  "Generate a palette given the BASE-COLORS.
+BASE-COLORS consists of lists in the form (NAME VALUE).  NAME is at
+least a symbol of `bg-main' or `fg-main', while VALUE is a string
+representing a color either by name like in `list-colors-display' or
+hexadecimal RGB of the form #123456.  See the value of a core Modus
+palette, like `modus-themes-operandi-palette' for all current NAME
+symbols.
+
+BASE-COLORS is used to derive a palette.  Any entry whose name is
+already present in BASE-COLORS is not derived but taken as-is.  The rest
+are generated automatically.  The generated palette can be used as-is by
+a derivative theme (per `modus-themes-theme') or as a starting point for
+further refinements.
+
+With optional COOL-OR-WARM-PREFERENCE as a symbol of either `cool' or
+`warm' make relevant color choices for derivative values.  If
+COOL-OR-WARM-PREFERENCE is nil, derive the implied preference from the
+value of the `bg-main' color in BASE-COLORS.  If the value of `bg-main'
+satisfies `color-gray-p', then fall back to `cool'.  For our purposes,
+`cool' means that the color is closer to pure blue than pure red, while
+`warm' is the opposite.
+
+With optional CORE-PALETTE use it to fill in any of the remaining
+entries.  This can be a symbol like `modus-themes-operandi-palette'.  Do
+not try to enforce a core palette among those defined in modus-themes.el
+and let the user assume responsibility for any incompatibilities.  If
+CORE-PALETTE is nil, then infer a suitable palette based on whether the
+`bg-main' value in BASE-COLORS is light or dark and then the
+COOL-OR-WARM-PREFERENCE.  This inferred palette will be
+`modus-themes-operandi-palette' for a light `bg-main' and
+`modus-themes-vivendi-palette' for a dark `bg-main'.  The `cool' or
+`warm' shall yield the tinted variants of those palettes, namely,
+`modus-themes-operandi-tinted-palette' and
+`modus-themes-vivendi-tinted-palette'.
+
+With optional MAPPINGS use them instead of trying to derive new ones.
+If MAPPINGS is nil, generate some essential color mappings and let the
+rest come from CORE-PALETTE."
+  (when (seq-some
+         (lambda (entry)
+           (not (stringp (cadr entry))))
+         base-colors)
+    (error "Base colors can only be references to string color values, not symbols"))
+  (when (seq-some
+         (lambda (entry)
+           (stringp (cadr entry)))
+         mappings)
+    (error "Mappings can only be references to named colors, not color values"))
+  (let ((bg-main (alist-get 'bg-main base-colors))
+        (fg-main (alist-get 'fg-main base-colors)))
+    (unless (and bg-main fg-main)
+      (error "The palette must define at least a bg-main and fg-main entry with their values"))
+    (let* ((bg-main (car bg-main))
+           (bg-main-dark-p (color-dark-p (color-name-to-rgb bg-main)))
+           (fg-main (car fg-main))
+           (six-colors (seq-filter
+                        (lambda (color)
+                          (memq (car color) '(red green yellow blue magenta cyan)))
+                        base-colors))
+           (prefers-cool-p (cond
+                            (cool-or-warm-preference (eq cool-or-warm-preference 'cool))
+                            (t (eq (modus-themes-color-is-warm-or-cool-p bg-main) 'cool))))
+           (derived-colors nil)
+           (derived-mappings nil)
+           (push-derived-value-fn (lambda (name value)
+                                    (unless (assq name base-colors)
+                                      (push (list name value) derived-colors))))
+           (push-mapping-fn (lambda (name value)
+                              (unless (assq name mappings)
+                                (push (list name value) derived-mappings)))))
+      ;; Base entries
+      (funcall push-derived-value-fn 'bg-dim (modus-themes-generate-gradient bg-main 5))
+      (funcall push-derived-value-fn 'bg-active (modus-themes-generate-gradient bg-main 10))
+      (funcall push-derived-value-fn 'bg-inactive (modus-themes-generate-gradient bg-main 8))
+      (funcall push-derived-value-fn 'border (modus-themes-generate-gradient bg-main 20))
+      (funcall push-derived-value-fn 'fg-dim (modus-themes-generate-gradient fg-main 20))
+      (funcall push-derived-value-fn 'fg-alt (modus-themes-generate-color-warmer-or-cooler (modus-themes-generate-gradient fg-main 10) 0.8 prefers-cool-p))
+      ;; Primary and secondary colors
+      (pcase-dolist (`(,name ,value) six-colors)
+        (funcall push-derived-value-fn (intern (format "%s-warmer" name)) (modus-themes-generate-gradient (modus-themes-generate-color-warmer value 0.9) (if bg-main-dark-p 20 -20)))
+        (funcall push-derived-value-fn (intern (format "%s-cooler" name)) (modus-themes-generate-gradient (modus-themes-generate-color-cooler value 0.9) (if bg-main-dark-p 20 -20)))
+        (funcall push-derived-value-fn (intern (format "%s-faint" name)) (modus-themes-generate-gradient value (if bg-main-dark-p 10 -10)))
+        (funcall push-derived-value-fn (intern (format "%s-intense" name)) (modus-themes-generate-gradient value (if bg-main-dark-p -5 5)))
+        ;; TODO 2025-12-06: We should have a function here that adjusts the value also up to a
+        ;; maximum distance from bg-main.  Basically, we want to avoid the scenario where a given
+        ;; base value produces something that is virtually indistinguishable from bg-main.
+        (funcall push-derived-value-fn (intern (format "bg-%s-intense" name)) (modus-themes-generate-gradient value (if bg-main-dark-p -40 40)))
+        (funcall push-derived-value-fn (intern (format "bg-%s-subtle" name)) (modus-themes-generate-gradient value (if bg-main-dark-p -60 60)))
+        (funcall push-derived-value-fn (intern (format "bg-%s-nuanced" name)) (modus-themes-generate-gradient value (if bg-main-dark-p -80 80))))
+      ;; Mappings
+      (funcall push-mapping-fn 'bg-completion (if prefers-cool-p 'bg-cyan-subtle 'bg-yellow-subtle))
+      (funcall push-mapping-fn 'bg-hover (if prefers-cool-p 'bg-green-intense 'bg-magenta-intense))
+      (funcall push-mapping-fn 'bg-hover-secondary (if prefers-cool-p 'bg-green-subtle 'bg-magenta-subtle))
+      (funcall push-mapping-fn 'bg-hl-line (if prefers-cool-p 'bg-cyan-nuanced 'bg-yellow-nuanced))
+      (funcall push-mapping-fn 'bg-paren-match (if prefers-cool-p 'bg-green-intense 'bg-yellow-subtle))
+      (funcall push-mapping-fn 'bg-paren-expression (if prefers-cool-p 'bg-green-nuanced 'bg-yellow-nuanced))
+      (funcall push-mapping-fn 'bg-region 'bg-active)
+      (funcall push-mapping-fn 'fg-region 'fg-main)
+
+      (funcall push-mapping-fn 'bg-mode-line-active 'bg-active)
+      (funcall push-mapping-fn 'fg-mode-line-active 'fg-main)
+      (funcall push-mapping-fn 'border-mode-line-active 'border)
+      (funcall push-mapping-fn 'bg-mode-line-inactive 'bg-inactive)
+      (funcall push-mapping-fn 'fg-mode-line-inactive 'fg-dim)
+      (funcall push-mapping-fn 'border-mode-line-inactive 'border)
+
+      (funcall push-mapping-fn 'modeline-err 'red-faint)
+      (funcall push-mapping-fn 'modeline-warning 'yellow-faint)
+      (funcall push-mapping-fn 'modeline-info 'blue-faint)
+
+      (funcall push-mapping-fn 'bg-search-current 'bg-yellow-subtle)
+      (funcall push-mapping-fn 'bg-search-lazy 'bg-magenta-subtle)
+      (funcall push-mapping-fn 'bg-search-replace 'bg-red-subtle)
+      (funcall push-mapping-fn 'bg-search-rx-group-0 'bg-blue-subtle)
+      (funcall push-mapping-fn 'bg-search-rx-group-1 'bg-green-subtle)
+      (funcall push-mapping-fn 'bg-search-rx-group-2 'bg-red-subtle)
+      (funcall push-mapping-fn 'bg-search-rx-group-3 'bg-magenta-subtle)
+
+      (funcall push-mapping-fn 'fg-search-current 'yellow-warmer)
+      (funcall push-mapping-fn 'fg-search-lazy 'magenta-cooler)
+      (funcall push-mapping-fn 'fg-search-replace 'red-cooler)
+      (funcall push-mapping-fn 'fg-search-rx-group-0 'blue-warmer)
+      (funcall push-mapping-fn 'fg-search-rx-group-1 'green-warmer)
+      (funcall push-mapping-fn 'fg-search-rx-group-2 'red-cooler)
+      (funcall push-mapping-fn 'fg-search-rx-group-3 'magenta-cooler)
+
+      (funcall push-mapping-fn 'bg-prominent-err 'unspecified)
+      (funcall push-mapping-fn 'bg-prominent-warning 'unspecified)
+      (funcall push-mapping-fn 'bg-prominent-note 'unspecified)
+      (funcall push-mapping-fn 'fg-prominent-err 'red-intense)
+      (funcall push-mapping-fn 'fg-prominent-warning 'yellow-intense)
+      (funcall push-mapping-fn 'fg-prominent-note 'green-intense)
+
+      (funcall push-mapping-fn 'bg-active-argument (if prefers-cool-p 'bg-cyan-subtle 'bg-yellow-subtle))
+      (funcall push-mapping-fn 'fg-active-argument (if prefers-cool-p 'cyan-cooler 'yellow-warmer))
+      (funcall push-mapping-fn 'bg-active-value (if prefers-cool-p 'bg-magenta-subtle 'bg-blue-subtle))
+      (funcall push-mapping-fn 'fg-active-value (if prefers-cool-p 'magenta-cooler 'blue-warmer))
+
+      (funcall push-mapping-fn 'bg-tab-bar 'bg-dim)
+      (funcall push-mapping-fn 'bg-tab-current 'bg-main)
+      (funcall push-mapping-fn 'bg-tab-other 'bg-inactive)
+
+      (funcall push-mapping-fn 'bg-added 'bg-green-subtle)
+      (funcall push-mapping-fn 'bg-added-faint 'bg-green-nuanced)
+      (funcall push-mapping-fn 'bg-added-refine 'bg-green-intense)
+      (funcall push-mapping-fn 'fg-added 'green-faint)
+      (funcall push-mapping-fn 'fg-added-intense 'green-intense)
+
+      (funcall push-mapping-fn 'bg-changed 'bg-yellow-subtle)
+      (funcall push-mapping-fn 'bg-changed-faint 'bg-yellow-nuanced)
+      (funcall push-mapping-fn 'bg-changed-refine 'bg-yellow-intense)
+      (funcall push-mapping-fn 'fg-changed 'yellow-faint)
+      (funcall push-mapping-fn 'fg-changed-intense 'yellow-intense)
+
+      (funcall push-mapping-fn 'bg-removed 'bg-red-subtle)
+      (funcall push-mapping-fn 'bg-removed-faint 'bg-red-nuanced)
+      (funcall push-mapping-fn 'bg-removed-refine 'bg-red-intense)
+      (funcall push-mapping-fn 'fg-removed 'red-faint)
+      (funcall push-mapping-fn 'fg-removed-intense 'red-intense)
+
+      (funcall push-mapping-fn 'fg-heading-0 'fg-alt)
+      (funcall push-mapping-fn 'fg-heading-1 'fg-main)
+      (funcall push-mapping-fn 'fg-heading-2 (if prefers-cool-p 'cyan 'yellow))
+      (funcall push-mapping-fn 'fg-heading-3 (if prefers-cool-p 'green 'magenta))
+      (funcall push-mapping-fn 'fg-heading-4 (if prefers-cool-p 'blue 'red))
+      (funcall push-mapping-fn 'fg-heading-5 (if prefers-cool-p 'yellow 'cyan))
+      (funcall push-mapping-fn 'fg-heading-6 (if prefers-cool-p 'magenta 'green))
+      (funcall push-mapping-fn 'fg-heading-7 (if prefers-cool-p 'red 'blue))
+      (funcall push-mapping-fn 'fg-heading-8 'fg-dim)
+
+      (funcall push-mapping-fn 'bg-term-black (if bg-main-dark-p 'bg-main 'fg-main))
+      (funcall push-mapping-fn 'bg-term-black-bright (if bg-main-dark-p 'bg-active 'fg-dim))
+      (funcall push-mapping-fn 'fg-term-black (if bg-main-dark-p 'bg-main 'fg-main))
+      (funcall push-mapping-fn 'fg-term-black-bright (if bg-main-dark-p 'bg-active 'fg-dim))
+
+      (funcall push-mapping-fn 'bg-term-white (if bg-main-dark-p 'fg-dim 'bg-active))
+      (funcall push-mapping-fn 'bg-term-white-bright (if bg-main-dark-p 'fg-main 'bg-main))
+      (funcall push-mapping-fn 'fg-term-white (if bg-main-dark-p 'fg-dim 'bg-active))
+      (funcall push-mapping-fn 'fg-term-white-bright (if bg-main-dark-p 'fg-main 'bg-main))
+
+      (let* ((new-colors (append base-colors derived-colors))
+             (new-mappings (append mappings derived-mappings))
+             ;; We have to add one of the core palettes to make sure
+             ;; there are no missing entries.  We will then remove
+             ;; duplicates.
+             (core (or core-palette
+                       (if bg-main-dark-p
+                           (if prefers-cool-p modus-themes-vivendi-palette modus-themes-vivendi-tinted-palette)
+                         (if prefers-cool-p modus-themes-operandi-palette modus-themes-operandi-tinted-palette))))
+             (combined-new-palette (append new-colors new-mappings core))
+             (no-duplicates (seq-uniq
+                             combined-new-palette
+                             (lambda (element1 element2)
+                               (eq (car element1) (car element2)))))
+             (named-values (seq-filter
+                            (lambda (entry)
+                              (stringp (cadr entry)))
+                            no-duplicates))
+             (mapping-values (seq-filter
+                              (lambda (entry)
+                                (symbolp (cadr entry)))
+                              no-duplicates)))
+        (append named-values mapping-values)))))
+
 ;;;; Add themes from package to path
 
 ;;;###autoload
diff --git a/etc/themes/modus-vivendi-deuteranopia-theme.el b/etc/themes/modus-vivendi-deuteranopia-theme.el
index 5706676863d..5b8c2395d1f 100644
--- a/etc/themes/modus-vivendi-deuteranopia-theme.el
+++ b/etc/themes/modus-vivendi-deuteranopia-theme.el
@@ -1,6 +1,6 @@
 ;;; modus-vivendi-deuteranopia-theme.el --- Deuteranopia-optimized theme with a black background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
@@ -87,6 +87,7 @@ standard)."
  'dark
  'modus-themes-vivendi-deuteranopia-palette
  'modus-vivendi-deuteranopia-palette-user
- 'modus-vivendi-deuteranopia-palette-overrides)
+ 'modus-vivendi-deuteranopia-palette-overrides
+ 'modus-themes-faces-deuteranopia)
 
 ;;; modus-vivendi-deuteranopia-theme.el ends here
diff --git a/etc/themes/modus-vivendi-theme.el b/etc/themes/modus-vivendi-theme.el
index 27380f661ce..155f699d56f 100644
--- a/etc/themes/modus-vivendi-theme.el
+++ b/etc/themes/modus-vivendi-theme.el
@@ -1,6 +1,6 @@
 ;;; modus-vivendi-theme.el --- Elegant, highly legible theme with a black background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
diff --git a/etc/themes/modus-vivendi-tinted-theme.el b/etc/themes/modus-vivendi-tinted-theme.el
index f0927902642..df744485476 100644
--- a/etc/themes/modus-vivendi-tinted-theme.el
+++ b/etc/themes/modus-vivendi-tinted-theme.el
@@ -1,6 +1,6 @@
 ;;; modus-vivendi-tinted-theme.el --- Elegant, highly legible theme with a night sky background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
diff --git a/etc/themes/modus-vivendi-tritanopia-theme.el b/etc/themes/modus-vivendi-tritanopia-theme.el
index aeecdeaf9be..e4fb11cfff5 100644
--- a/etc/themes/modus-vivendi-tritanopia-theme.el
+++ b/etc/themes/modus-vivendi-tritanopia-theme.el
@@ -1,6 +1,6 @@
 ;;; modus-vivendi-tritanopia-theme.el --- Tritanopia-optimized theme with a black background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
@@ -87,6 +87,7 @@ standard)."
  'dark
  'modus-themes-vivendi-tritanopia-palette
  'modus-vivendi-tritanopia-palette-user
- 'modus-vivendi-tritanopia-palette-overrides)
+ 'modus-vivendi-tritanopia-palette-overrides
+ 'modus-themes-faces-tritanopia)
 
 ;;; modus-vivendi-tritanopia-theme.el ends here
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index d0fa2dff49f..ac00c9fc5a7 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -1,6 +1,6 @@
 ;;; tango-dark-theme.el --- Tango-based custom theme for faces  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2010-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2026 Free Software Foundation, Inc.
 
 ;; Authors: Chong Yidong <cyd@stupidchicken>
 ;;          Jan Moringen <jan.moringen@uni-bielefeld.de>
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index 9b276466d95..b6c4b95add9 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -1,6 +1,6 @@
 ;;; tango-theme.el --- Tango-based custom theme for faces  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2010-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2026 Free Software Foundation, Inc.
 
 ;; Authors: Chong Yidong <cyd@stupidchicken>
 ;;          Jan Moringen <jan.moringen@uni-bielefeld.de>
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index fda7bc8563f..6dfe2570a2b 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -1,6 +1,6 @@
 ;;; tsdh-dark-theme.el --- Tassilo's dark custom theme  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el
index 27e9423f4ef..16dff21899c 100644
--- a/etc/themes/tsdh-light-theme.el
+++ b/etc/themes/tsdh-light-theme.el
@@ -1,6 +1,6 @@
 ;;; tsdh-light-theme.el --- Tassilo's light custom theme  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 20256f3933b..dc6876afd1e 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -1,6 +1,6 @@
 ;;; wheatgrass-theme.el --- custom theme for faces  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2010-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2026 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/themes/whiteboard-theme.el b/etc/themes/whiteboard-theme.el
index 6f447246c60..0a7ce48ea3c 100644
--- a/etc/themes/whiteboard-theme.el
+++ b/etc/themes/whiteboard-theme.el
@@ -1,6 +1,6 @@
 ;;; whiteboard-theme.el --- Custom theme for faces  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; Author: Scott Frazer <frazer.scott@gmail.com>
 
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
index 23c904f7219..0ffe88fd191 100644
--- a/etc/themes/wombat-theme.el
+++ b/etc/themes/wombat-theme.el
@@ -1,6 +1,6 @@
 ;;; wombat-theme.el --- Custom face theme for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
 
 ;; Author: Kristoffer Grönlund <krig@koru.se>
 
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL
index c330713c1b3..9cdc0575c17 100644
--- a/etc/tutorials/TUTORIAL
+++ b/etc/tutorials/TUTORIAL
@@ -1131,7 +1131,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg
index 4fe3abc3e7e..76e638e1d41 100644
--- a/etc/tutorials/TUTORIAL.bg
+++ b/etc/tutorials/TUTORIAL.bg
@@ -1162,7 +1162,7 @@ Dired ви позволява да гледате списъка от файло
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index 11c06f79cd2..6549f7bbce1 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -1026,7 +1026,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
@@ -1055,7 +1055,7 @@ using, writing, and sharing free software!
 
 本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝：
 
-   Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation,
+   Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation,
    Inc.
 
    本文件为 GNU Emacs 的一部分。
diff --git a/etc/tutorials/TUTORIAL.cs b/etc/tutorials/TUTORIAL.cs
index 125131b2776..480aabd0f1c 100644
--- a/etc/tutorials/TUTORIAL.cs
+++ b/etc/tutorials/TUTORIAL.cs
@@ -1146,7 +1146,7 @@ je šířena se svolením distribuovat kopie za jistých podmínek
 (pozn. překl. oficiální verze licence není v českém překladu k
 dispozici):
 
-  Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de
index d0a734b36f8..995a3165be5 100644
--- a/etc/tutorials/TUTORIAL.de
+++ b/etc/tutorials/TUTORIAL.de
@@ -1488,7 +1488,7 @@ Beachten Sie bitte, dass im Zweifelsfalle das englische Original
 dieser Urheberrechtsnotiz gültig ist (zu finden in der Datei
 TUTORIAL).
 
-   Copyright (C) 1985, 1996-1997, 2001-2025 Free Software Foundation,
+   Copyright (C) 1985, 1996-1997, 2001-2026 Free Software Foundation,
    Inc.
 
    Diese Datei ist ein Bestandteil von GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.el_GR b/etc/tutorials/TUTORIAL.el_GR
index 5ce54d7ab20..97eeabd0eac 100644
--- a/etc/tutorials/TUTORIAL.el_GR
+++ b/etc/tutorials/TUTORIAL.el_GR
@@ -1239,7 +1239,7 @@ list-packages.  Στη σχετική λίστα, μπορείς να εγκατ
 πνευματικά δικαιώματα και δίνεται με την άδεια διανομής αντιγράφων υπό
 κάποιους όρους.
 
-  Πνευματικά Δικαιώματα (C) 1985, 1996, 1998, 2001-2025 Free Software
+  Πνευματικά Δικαιώματα (C) 1985, 1996, 1998, 2001-2026 Free Software
   Foundation, Inc.
 
   Αυτό το αρχείο είναι μέρος του GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo
index fb2d00d32d8..a7b5c81039c 100644
--- a/etc/tutorials/TUTORIAL.eo
+++ b/etc/tutorials/TUTORIAL.eo
@@ -1081,7 +1081,7 @@ la dosiero verkita de Stuart Cracraft por la originala Emakso.
 kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj
 kondiĉoj estas observataj:
 
-   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2025 Free Software
+   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2026 Free Software
    Foundation, Inc.
 
    Ĉi tiu dosiero estas parto de "GNU Emacs".
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es
index d7ff5fcf6db..60e6f98c920 100644
--- a/etc/tutorials/TUTORIAL.es
+++ b/etc/tutorials/TUTORIAL.es
@@ -1204,7 +1204,7 @@ Por favor, en caso de duda, solo es válido el original en inglés de la
 siguiente nota de derechos de reproducción (que puede encontrar en el
 archivo TUTORIAL).
 
-Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation, Inc.
 
    Se permite a cualquiera hacer o distribuir copias literales de este
    documento como se recibe, en cualquier medio, siempre que la nota
diff --git a/etc/tutorials/TUTORIAL.fa b/etc/tutorials/TUTORIAL.fa
index 085ecedd2f6..f0d99ab748f 100644
--- a/etc/tutorials/TUTORIAL.fa
+++ b/etc/tutorials/TUTORIAL.fa
@@ -1131,7 +1131,7 @@ Stuart Cracraft  سر چشمه گرفت.
 این نسخه از آموزش بخشی از GNU Emacs است. دارای حق چاپ است
 و با مجوز برای توزیع کپی در شرایط خاص همراه است:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2022, 2024-2025 Free Software
+  Copyright (C) 1985, 1996, 1998, 2001-2022, 2024-2026 Free Software
   Foundation, Inc.
 
   This file is part of GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr
index f3a7f09f12b..1d94f3b9911 100644
--- a/etc/tutorials/TUTORIAL.fr
+++ b/etc/tutorials/TUTORIAL.fr
@@ -240,7 +240,7 @@ de M-v.
 
 Si vous utilisez un environnement graphique, comme X11 ou MS-Windows,
 il devrait y avoir une zone rectangulaire appelée barre de défilement,
-ou « scrollbar » sur le bord gauche de la fenêtre d'Emacs. Vous pouvez
+ou « scrollbar » sur le bord droit de la fenêtre d'Emacs. Vous pouvez
 faire défiler le texte en cliquant avec la souris dans cette barre de
 défilement.
 
@@ -1202,7 +1202,7 @@ Cette version du didacticiel, comme GNU Emacs, est placée sous
 droit d'auteur, et vous pouvez en distribuer des copies sous certaines
 conditions :
 
-Copyright (C) 1985, 1996, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 2001-2026 Free Software Foundation, Inc.
 
    Chacun peut créer ou distribuer des copies de ce document tel qu'il
    l'a reçu, sur n'importe quel support, pourvu que la note de
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index 97d181fa548..4f9d2ddd70d 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1015,7 +1015,7 @@ find-file.
 גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים
 וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן:
 
-                       Copyright (C) 2010-2025 Free Software Foundation, Inc.
+                       Copyright (C) 2010-2026 Free Software Foundation, Inc.
 
 ‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי
 הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free
diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it
index 405a1c6b340..82e1c36158a 100644
--- a/etc/tutorials/TUTORIAL.it
+++ b/etc/tutorials/TUTORIAL.it
@@ -1219,7 +1219,7 @@ distribuito con il permesso di farne copie a determinate condizioni:
    indicativo, restando comunque inteso il fatto che è quella
    originale a fare fede.
 
-Copyright (C) 2003-2025 Free Software Foundation, Inc.
+Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
    È permesso a chiunque copiare e distribuire attraverso ogni mezzo
    copie fedeli di questo documento così come viene ricevuto, a
diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja
index c6a0a29464d..d940a920a5f 100644
--- a/etc/tutorials/TUTORIAL.ja
+++ b/etc/tutorials/TUTORIAL.ja
@@ -1062,7 +1062,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko
index 2212ff6f43a..6793d83c172 100644
--- a/etc/tutorials/TUTORIAL.ko
+++ b/etc/tutorials/TUTORIAL.ko
@@ -980,7 +980,7 @@ C-x C-s와 (META쇠나 EDIT쇠 혹은 교체쇠가 있으면) <ESC>v와 같은 �
 GNU 이맥스와 같이 이 지침서 판은 저작권이 있으며 특정한 조건을 만족할
 때에 복사본을 배포할 수 있는 허가를 갖고 나온 것이다:
 
-Copyright (C) 1985, 1996, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 2001-2026 Free Software Foundation, Inc.
 
    이 문서는 이 저작권 공고와 허용 공고가 그대로 유지되고, 배포자가
    수취자에게 이 공고에 따라 허용되는 것처럼 또 재분배하는 것을
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl
index 0a320825545..51d90a2b287 100644
--- a/etc/tutorials/TUTORIAL.nl
+++ b/etc/tutorials/TUTORIAL.nl
@@ -1209,7 +1209,7 @@ Deze versie van de inleiding is onderdeel van GNU Emacs.  Het valt
 onder copyright.  Je mag deze inleiding verspreiden onder bepaalde
 voorwaarden:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation,
   Inc.
 
   Dit bestand is onderdeel van GNU Emacs.
@@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities:
 This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.pl b/etc/tutorials/TUTORIAL.pl
index 27cae08b4bb..41b77c083ef 100644
--- a/etc/tutorials/TUTORIAL.pl
+++ b/etc/tutorials/TUTORIAL.pl
@@ -1203,7 +1203,7 @@ z pomocą Ryszarda Kubiaka i Janusza S. Bienia <jsbien@mail.uw.edu.pl>.
 Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem
 autorskim, ale wolno ją kopiować pod następującymi warunkami:
 
-Copyright (C) 1985, 1994, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1994, 2001-2026 Free Software Foundation, Inc.
 
 Zezwala się na wykonywanie lub rozpowszechnianie
 wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym
diff --git a/etc/tutorials/TUTORIAL.pt_BR b/etc/tutorials/TUTORIAL.pt_BR
index 65bd08ecc00..576f4f0a3c6 100644
--- a/etc/tutorials/TUTORIAL.pt_BR
+++ b/etc/tutorials/TUTORIAL.pt_BR
@@ -1056,7 +1056,7 @@ Essa versão do tutorial foi originalmente traduzida por Marcelo Toledo
 <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem
 com uma permissão de distribuição de cópias nas seguintes condições:
 
-Copyright (C) 2004-2025 Free Software Foundation, Inc.
+Copyright (C) 2004-2026 Free Software Foundation, Inc.
 
    Permissão é garantida a qualquer um para fazer ou distribuir cópias
    integrais deste documento como recebido, em qualquer meio, deixando
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro
index 422048211fe..8716b5ebfc1 100644
--- a/etc/tutorials/TUTORIAL.ro
+++ b/etc/tutorials/TUTORIAL.ro
@@ -4,7 +4,7 @@ Mulţumiri Aidei Hulubei <aida@chang.pub.ro> pentru corecturi şi sugestii.
 
 Această versiune a fost produsă plecând de la versiunea în limba
 engleză, care este
-Copyright (c) 1985, 2013-2025 Free Software Foundation, Inc.
+Copyright (c) 1985, 2013-2026 Free Software Foundation, Inc.
 
 Citiţi acum versiunea românească a tutorialului de Emacs.
 
@@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 2013-2025 Free Software Foundation, Inc.
+Copyright (c) 1985, 2013-2026 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/tutorials/TUTORIAL.ru b/etc/tutorials/TUTORIAL.ru
index 556e9868393..d011ce8239c 100644
--- a/etc/tutorials/TUTORIAL.ru
+++ b/etc/tutorials/TUTORIAL.ru
@@ -1105,7 +1105,7 @@ Dired позволяет вам отображать список файлов �
 (copyrighted) и приходит с ограничениями распространения копий со
 следующими соглашениями:
 
-Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/tutorials/TUTORIAL.sk b/etc/tutorials/TUTORIAL.sk
index 2bec07f42de..9022eb52b12 100644
--- a/etc/tutorials/TUTORIAL.sk
+++ b/etc/tutorials/TUTORIAL.sk
@@ -1074,7 +1074,7 @@ tútorialom napísaným Stuartom Cracraftom pre pôvodný Emacs.
 Táto verzia tútorialu je, podobne ako GNU Emacs, chránená copyrightom
 a je šírená s povolením distribuovať kópie za istých podmienok:
 
-Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation, Inc.
 
    Každému je zaručené právo vytvárať a distribuovať presné kópie tohto
    dokumentu tak, ako ho dostal, na akomkoľvek médiu, s tým, že bude
diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl
index 466490e7da6..3c5435ce1a8 100644
--- a/etc/tutorials/TUTORIAL.sl
+++ b/etc/tutorials/TUTORIAL.sl
@@ -1119,7 +1119,7 @@ Emacs. V slovenščino ga je prevedel Primož Peterlin.
 To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo
 razmnoževanje in razširjanje je dovoljeno pod naslednjimi pogoji:
 
-Copyright © 1985, 1996, 1998, 2001-2025 Free Software Foundation, Inc.
+Copyright © 1985, 1996, 1998, 2001-2026 Free Software Foundation, Inc.
 
   Ta datoteka je del paketa GNU Emacs.
 
diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv
index e5f6a480d4d..35cde5d92da 100644
--- a/etc/tutorials/TUTORIAL.sv
+++ b/etc/tutorials/TUTORIAL.sv
@@ -1153,7 +1153,7 @@ Lidell översatte den till svenska.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th
index aa9f07fe5f8..e9b8052b8c3 100644
--- a/etc/tutorials/TUTORIAL.th
+++ b/etc/tutorials/TUTORIAL.th
@@ -964,7 +964,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 2001-2026 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators
index e81e6c665f4..2b1444b13b8 100644
--- a/etc/tutorials/TUTORIAL.translators
+++ b/etc/tutorials/TUTORIAL.translators
@@ -39,6 +39,7 @@ Maintainer: Mohsen BANAN <emacs@mohsen.1.banan.byname.net>
 * TUTORIAL.fr:
 Author:     Éric Jacoboni <jaco@teaser.fr>
 Maintainer: Éric Jacoboni <jaco@teaser.fr>
+            Bastien Guerry <bzg@gnu.org>
 
 * TUTORIAL.he
 Author:     Eli Zaretskii <eliz@gnu.org>
diff --git a/etc/tutorials/TUTORIAL.uk b/etc/tutorials/TUTORIAL.uk
index d54914ff0ef..ee5fab46201 100644
--- a/etc/tutorials/TUTORIAL.uk
+++ b/etc/tutorials/TUTORIAL.uk
@@ -1126,7 +1126,7 @@ list-packages.  З'явиться екран, за допомогою якого
 Ця версія посібника — складник GNU Emacs.  Її захищено авторським
 правом.  Розповсюджувати копії дозволено за певних умов:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation,
   Inc.  (Фонд вільного програмного забезпечення, Inc.)
 
   Цей файл — складник GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh
index c70e95ad5bd..90a2dc38411 100644
--- a/etc/tutorials/TUTORIAL.zh
+++ b/etc/tutorials/TUTORIAL.zh
@@ -1049,7 +1049,7 @@ issue here>」。
 這個版本的快速指南和 GNU Emacs 一樣都是版權化的，並且允許在某些條件下
 散佈其拷貝：
 
-Copyright (C) 1985, 1996, 1998, 2001-2025 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2026 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/w32-feature.el b/etc/w32-feature.el
index e75c8d726d2..8850cc51f1d 100644
--- a/etc/w32-feature.el
+++ b/etc/w32-feature.el
@@ -1,6 +1,6 @@
 ;;; w32-feature.el --- Check Availability of Emacs Features  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2020-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2020-2026 Free Software Foundation, Inc.
 
 ;; Author: Phillip Lord <phillip.lord@russet.org.uk>
 
diff --git a/etc/yow.lines b/etc/yow.lines
deleted file mode 100644
index 7ed0c97d978..00000000000
--- a/etc/yow.lines
+++ /dev/null