diff --git a/ChangeLog b/ChangeLog
index 5f9433b4..9ebf1632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,22 @@
-2026-06-20  Mats Lidell  <matsl@gnu.org>
+2026-06-25  Bob Weiner  <rsw@gnu.org>
 
-* test/hibtypes-tests.el: Add !!FIXME comments to highlight the ibtypes
-    where tests should be added.
+* test/hywiki-tests.el (hywiki-tests--command): Fix interactive call
+    which was missing wikiword argument.
+
+* hywiki.el (hywiki-add-command, hywiki-display-command): Generalize
+    to handle the arguments of any Emacs command or Hyperbole actype.
+    Now a referent can be any type of Hyperbole button action.
+  test/hywiki-tests.el (hywiki-tests--add-command): Update to handle
+    above changes.
+
+* hywiki.el (hywiki-referent-menu): Extend 'Create' doc string to explain
+    how to get a prompt for a referent type rather than just linking
+    to a HyWiki page.
+  man/hyperbole.texi (HyWiki Menu): Extend 'Create' doc and document all
+    potentially prompted for HyWikiWord referent types.
+
+* hmouse-drv.el (hkey-help): When on a HyWikiWord, include attributes
+    'referent-type' and 'referent-value' in help display.
 
 2026-06-24  Bob Weiner  <rsw@gnu.org>
 
@@ -17,6 +32,9 @@
 
 2026-06-20  Mats Lidell  <matsl@gnu.org>
 
+* test/hibtypes-tests.el: Add !!FIXME comments to highlight the ibtypes
+    where tests should be added.
+
 * test/hibtypes-tests.el (ibtypes::ilink-ibut-in-other-file)
     (ibtypes::ilink-error-case-missing-button)
     (ibtypes::elink-ebut-in-other-file): Add tests.
@@ -10482,7 +10500,7 @@ name with 'name' and 'name-key'.
     with 'hpath:symlink-referent'.
                (smart-symlink-expand): Remove this function.
 
-* hbut.el (ibut:to-text): Fix so does not move point if lbl-key end up nil.
+* hbut.el (ibut:to-text): Fix so does not move point if lbl-key ends up nil.
 
 2023-01-28  Bob Weiner  <rsw@gnu.org>
 
diff --git a/README.md.html b/README.md.html
index 1be051fb..ffb911f0 100644
--- a/README.md.html
+++ b/README.md.html
@@ -5,8 +5,8 @@
 look <a href="stable/hyperbole.html">here</a>.]</p>
 <p>[We work on Hyperbole as a gift to the Emacs community and request
 you send us a thank you or a testimonial describing your usage if you
-like Hyperbole to <a
-href="mailto:rsw@gnu.org"><span>rsw@gnu.org</span></a>].</p>
+like Hyperbole to <a href="mailto:rsw@gnu.org"><a
+href="mailto:rsw@gnu.org">rsw@gnu.org</a></a>].</p>
 <ul>
 <li><a
 href="#gnu-hyperbole-902pre---the-everyday-hypertextual-information-manager">GNU
diff --git a/hbut.el b/hbut.el
index c244ed14..ec46e78d 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    18-Sep-91 at 02:57:09
-;; Last-Mod:     14-Jun-26 at 15:13:00 by Bob Weiner
+;; Last-Mod:     24-Jun-26 at 19:47:03 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -450,7 +450,7 @@ button is found in the current buffer."
 
     ;; Error when on a read-only part of a buffer's text
     (when (plist-member (text-properties-at (point)) 'read-only)
-      (hypb:error "(ebut:operate): Point must not be on a read-only Org element"))
+      (hypb:error "(ebut:operate): Point must not be on a read-only text section"))
     ;; Error when on an implicit button
     (when (or (eq (hattr:get 'hbut:current 'categ) 'implicit)
 	      (string-prefix-p "ibtypes::" (symbol-name (hattr:get 'hbut:current 'categ))))
@@ -2543,7 +2543,7 @@ Summary of operations based on inputs (name arg from \\='hbut:current attrs):
 
     ;; Error when on a read-only part of a buffer's text
     (when (plist-member (text-properties-at (point)) 'read-only)
-      (hypb:error "(ibut:operate): Point must not be on a read-only Org element"))
+      (hypb:error "(ibut:operate): Point must not be on a read-only text section"))
     ;; Error when on an explicit button
     (when (eq (hattr:get 'hbut:current 'categ) 'explicit)
       (hypb:error "(ibut:operate): Point must not be on an explicit button: %s"
diff --git a/hmouse-drv.el b/hmouse-drv.el
index b52ad809..d88703f1 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    04-Feb-90
-;; Last-Mod:     28-Sep-25 at 12:22:16 by Bob Weiner
+;; Last-Mod:     25-Jun-26 at 08:53:26 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1177,7 +1177,17 @@ documentation is found."
 			     (categ (hattr:get 'hbut:current 'categ))
 			     (attributes (nthcdr 2 (hattr:list 'hbut:current)))
 			     (but-def-symbol (htype:def-symbol
-					      (if (eq categ 'explicit) actype categ))))
+					      (if (eq categ 'explicit) actype categ)))
+                             (wikiword-referent
+                              (when (eq (htype:def-symbol actype) 'link-to-wikiword)
+                                (hywiki-get-referent
+                                 (hattr:get 'hbut:current 'lbl-key)))))
+
+                        (when wikiword-referent
+                          (hattr:set 'hbut:current 'referent-type
+                                     (car wikiword-referent))
+                          (hattr:set 'hbut:current 'referent-value
+                                     (cdr wikiword-referent)))
 
 			(princ (format "%s %s SPECIFICS:\n"
 				       (or but-def-symbol
diff --git a/hui-mini.el b/hui-mini.el
index 63379ba8..816249c0 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    15-Oct-91 at 20:13:17
-;; Last-Mod:     22-Mar-26 at 23:15:20 by Bob Weiner
+;; Last-Mod:     25-Jun-26 at 09:52:07 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1064,7 +1064,10 @@ support underlined faces as well."
 	   '("BacklinkConsult" hywiki-consult-backlink
 	     "Use Consult to select a backlink (reference) to a prompted for HyWikiWord."))
 	 '("Create"         hywiki-word-create-and-display
-	    "Create and display a new or existing HyWikiWord referent, prompting with any existing referent names.")
+	    "Create and display a new or existing HyWikiWord referent, prompting with any existing referent names.
+With either `hywiki-referent-prompt-flag' set or optional prefix ARG,
+prompt for and choose a typed referent, otherwise, create and/or display
+a HyWiki page.  See `hywiki-referent-menu' for valid referent types.")
 	 '("DiredHyWiki"    hywiki-directory-edit
 	   "Display and edit HyWiki directory.")
 	 '("EditPage"       hywiki-find-page
diff --git a/hui.el b/hui.el
index 73f58163..7c5ee01f 100644
--- a/hui.el
+++ b/hui.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Sep-91 at 21:42:03
-;; Last-Mod:     19-Jun-26 at 00:26:54 by Bob Weiner
+;; Last-Mod:     25-Jun-26 at 09:58:50 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1655,7 +1655,7 @@ Trigger an error if DEFAULT-ACTYPE is invalid."
     (with-current-buffer but-buf
       (when buffer-read-only
 	(setq err
-	      (format "(%s) Read-only error in Hyperbole button buffer '%s'.  Use {%s} to enable edits."
+	      (format "(%s) Read-only error in buffer '%s'.  Use {%s} to enable edits."
 		      func-name (buffer-name but-buf) (hmouse-read-only-toggle-key)))))
     (when err
       (pop-to-buffer but-buf)
diff --git a/hywiki.el b/hywiki.el
index 36a891ba..f45873b9 100644
--- a/hywiki.el
+++ b/hywiki.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    21-Apr-24 at 22:41:13
-;; Last-Mod:     18-Jun-26 at 09:15:55 by Bob Weiner
+;; Last-Mod:     25-Jun-26 at 13:00:30 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -327,7 +327,7 @@ included in the list, `hywiki-include-special-modes'."
 
 (defcustom hywiki-include-special-modes
   '(elfeed-search-mode elfeed-show-mode eww-mode kotl-mode)
-  "List of `special' major modes to include in HyWikiWord highlighting and recognition.
+  "List of `special' major modes with HyWikiWord highlighting and recognition.
 By default, all special modes, like Dired, are excluded.  A major mode
 included here will override its inclusion in `hywiki-exclude-major-modes'."
   :type '(list symbol)
@@ -1089,7 +1089,7 @@ After successfully finding a referent, run `hywiki-display-referent-hook'."
   (delq nil
 	(list
 	 '("HyWiki Add>")
-	 (when (fboundp #'activities-new)
+         (when (fboundp #'activities-new)
 	   '("Activity"   (hywiki-add-activity hkey-value)
 	     "Add a HyWikiWord that activates a saved activity from the Activities package."))
 	 '("Bookmark"     (hywiki-add-bookmark hkey-value)
@@ -1127,7 +1127,8 @@ After successfully finding a referent, run `hywiki-display-referent-hook'."
 	 '("orgRoamNode"  (hywiki-add-org-roam-node hkey-value)
 	   "Add a HyWikiWord that displays an Org Roam node given its title.")
 	 '("Sexp"         (hywiki-add-sexpression hkey-value)
-	   "Add a HyWikiWord that evaluates an Elisp sexpression.")))
+	   "Add a HyWikiWord that evaluates an Elisp sexpression.")
+	 ))
   "Menu of HyWikiWord custom referent types of the form:
 \(LABEL-STRING ACTION-SEXP DOC-STR)."
   :set  (lambda (var value) (set-default var value))
@@ -1158,8 +1159,8 @@ an error is triggered."
 
 (defun hywiki-create-referent (wikiword &optional message-flag)
   "Prompt for, add to HyWiki lookups and return a WIKIWORD custom referent.
-With optional prefix arg MESSAGE-FLAG non-nil, display a minibuffer message
-with the referent."
+With optional prefix arg MESSAGE-FLAG non-nil or when called interactively,
+display a minibuffer message with the referent."
   (interactive (list nil current-prefix-arg))
   (unless (stringp wikiword)
     (setq wikiword (hywiki-word-read-new "Create/Edit HyWikiWord: ")))
@@ -1201,7 +1202,7 @@ use `hywiki-active-in-current-buffer-p' for that."
                 (not (apply #'derived-mode-p hywiki-exclude-major-modes))))))
 
 (defun hywiki-add-activity (wikiword)
-  "Make WIKIWORD resume a prompted for activity.
+  "Make WIKIWORD resume a prompted for, existing activity.
 
 If WIKIWORD is invalid, trigger a `user-error' if called interactively
 or return nil if not.
@@ -1249,10 +1250,10 @@ calling this function."
     (bookmark-jump bookmark)))
 
 (defun hywiki-add-command (wikiword)
-  "Set a custom command symbol for WIKIWORD and return it.
-Command is the symbol used in the definition expression, which
-may be an Emacs command or a Hyperbole action type.  When invoked,
-it receives the single argument of WIKIWORD.
+  "Make WIKIWORD invoke a prompted for command with arguments and return it.
+Interactively, use any existing HyWikiWord at point or read an existing or
+valid new one.  Command is the symbol used in the definition expression,
+which may be an Emacs command or a Hyperbole action type.
 
 If WIKIWORD is invalid, trigger a `user-error' if called interactively
 or return nil if not.
@@ -1263,13 +1264,25 @@ Use `hywiki-get-referent' to determine whether WIKIWORD exists prior to
 calling this function."
   (interactive (list (or (hywiki-word-at)
 			 (hywiki-word-read-new "Add/Edit HyWikiWord: "))))
-  (let ((command (hui:actype nil (format "Command for %s: " wikiword))))
-    (hywiki-add-referent wikiword (cons 'command command))))
+  (when (string-empty-p wikiword)
+    (error "(hywiki-add-command): No HyWikiWord specified"))
+
+  (let* ((command (hui:actype nil (format "Command for %s: " wikiword)))
+	 (args (hargs:actype-get command)))
+    (hywiki-add-referent wikiword
+                         (if (equal args (list wikiword))
+                             (cons 'command command)
+                           (cons 'command (cons command args))))))
 
 (defun hywiki-display-command (wikiword command)
-  (if (fboundp command)
-      (actype:act command wikiword)
-    (error "(hywiki-display-command): Unbound referent command, '%s'" command)))
+  (cond ((consp command)
+         ;; arbitrary list of arguments
+         (apply 'actype:act command))
+        ((symbolp command)
+         ;; single arg of wikiword is sent to command
+         (actype:act command wikiword))
+        (t (error "(hywiki-display-command): Unbound referent command, '%s'"
+                  command))))
 
 (defun hywiki-add-find (wikiword)
   "Make WIKIWORD grep across `hywiki-directory' for matches to itself.
@@ -1523,13 +1536,14 @@ Use `hywiki-get-referent' to determine whether a HyWiki page exists."
       (user-error "(hywiki-add-page): Invalid HyWikiWord: '%s'; must be capitalized, all alpha" page-name))))
 
 ;;;###autoload
-(defun hywiki-word-create (wikiword &optional arg)
+(defun hywiki-word-create (wikiword &optional ref-type-flag)
   "Create a HyWiki referent for WIKIWORD and return it; don't display it.
 This replaces any existing referent the WIKIWORD may have.
 
-With either `hywiki-referent-prompt-flag' set or optional prefix ARG,
-prompt for and choose a typed referent, otherwise, create and/or display
-a HyWiki page.  See `hywiki-referent-menu' for valid referent types.
+With either `hywiki-referent-prompt-flag' set or optional prefix
+REF-TYPE-FLAG, prompt for and choose a typed referent, otherwise, create
+and/or display a HyWiki page.  See `hywiki-referent-menu' for valid referent
+types.
 
 Use `hywiki-get-referent' to test for and retrieve an existing HyWikiWord
 referent."
@@ -1542,7 +1556,7 @@ referent."
 				      "referent"
 				    "page"))))
 		     current-prefix-arg))
-  (if (or arg hywiki-referent-prompt-flag)
+  (if (or ref-type-flag hywiki-referent-prompt-flag)
       (hywiki-create-referent wikiword t)
     (hywiki-create-page wikiword t)))
 
diff --git a/man/hyperbole.html b/man/hyperbole.html
index 9cb5697c..532f8e97 100644
--- a/man/hyperbole.html
+++ b/man/hyperbole.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <!-- This manual is for GNU Hyperbole
-(Edition 9.0.2pre, Published March 23, 2026).
+(Edition 9.0.2pre, Published June 25, 2026).
 
 Copyright © 1989-2026  Free Software Foundation, Inc.
 
@@ -386,7 +386,7 @@ <h1 class="top" id="GNU-Hyperbole"><span>GNU Hyperbole<a class="copiable-link" h
 
 <PRE>
 Edition 9.0.2pre
-Printed March 23, 2026.
+Printed June 25, 2026.
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -2948,6 +2948,55 @@ <h4 class="subsection" id="Implicit-Button-Types-1"><span>4.3.1 Implicit Button
 <dd><p>When on a HyWikiWord with an existing page, display its page and
 optional section.
 </p>
+<a class="index-entry-id" id="index-ibtypes-ilink"></a>
+<a class="index-entry-id" id="index-implicit-button-link"></a>
+<a class="index-entry-id" id="index-link-to-implicit-button"></a>
+<a class="index-entry-id" id="index-ilink"></a>
+<a class="anchor" id="ilink"></a></dd>
+<dt><code class="code">link-to-ibut &lt;ilink&gt;</code></dt>
+<dd><p>At point, activate a link to an implicit button within the current
+buffer.  This executes the linked to implicit button&rsquo;s action in the
+context of the current buffer.
+</p>
+<p>Recognizes the format &rsquo;&lt;ilink:&rsquo; button_label [&rsquo;:&rsquo; button_file_path] &rsquo;&gt;&rsquo;,
+where button_file_path is given only when the link is to another file,
+e.g. &lt;ilink: my series of keys: ${hyperb:dir}/HYPB&gt;.
+</p>
+<a class="index-entry-id" id="index-ibtypes-glink"></a>
+<a class="index-entry-id" id="index-global-button-link"></a>
+<a class="index-entry-id" id="index-link-to-global-button"></a>
+<a class="index-entry-id" id="index-glink"></a>
+<a class="anchor" id="glink"></a></dd>
+<dt><code class="code">link-to-gbut &lt;glink&gt;</code></dt>
+<dd><p>At point, activate a link to a global button.  This executes the
+linked to global button&rsquo;s action in the context of the current buffer.
+</p>
+<p>Recognizes the format &rsquo;&lt;glink:&rsquo; button_label &rsquo;&gt;&rsquo;, e.g. &lt;glink: open todos&gt;.
+</p>
+<a class="index-entry-id" id="index-ibtypes-elink"></a>
+<a class="index-entry-id" id="index-explicit-button-link"></a>
+<a class="index-entry-id" id="index-link-to-explicit-button"></a>
+<a class="index-entry-id" id="index-elink"></a>
+<a class="anchor" id="elink"></a></dd>
+<dt><code class="code">link-to-ebut &lt;elink&gt;</code></dt>
+<dd><p>At point, activate a link to an explicit button within the current
+buffer.  This executes the linked to explicit button&rsquo;s action in the
+context of the current buffer.
+</p>
+<p>Recognizes the format &rsquo;&lt;elink:&rsquo; button_label [&rsquo;:&rsquo; button_file_path] &rsquo;&gt;&rsquo;,
+where : button_file_path is given only when the link is to another file,
+e.g. &lt;elink: project-list: ~/projs&gt;.&quot;
+</p>
+<a class="index-entry-id" id="index-ibtypes-klink"></a>
+<a class="index-entry-id" id="index-klink"></a>
+<a class="index-entry-id" id="index-koutline-link"></a>
+<a class="index-entry-id" id="index-kcell-link"></a>
+<a class="anchor" id="klink"></a></dd>
+<dt><code class="code">klink</code></dt>
+<dd><p>Follow a link delimited by &lt;&gt; to a koutline cell.
+See the documentation for <code class="code">actypes::link-to-kotl</code> for valid link
+specifiers.
+</p>
 <a class="index-entry-id" id="index-ibtypes-action"></a>
 <a class="index-entry-id" id="index-action-button"></a>
 <a class="index-entry-id" id="index-action-implicit-button"></a>
@@ -3118,55 +3167,6 @@ <h4 class="subsection" id="Implicit-Button-Types-1"><span>4.3.1 Implicit Button
 Line and column can also include a leading and optional character, L
 for line and C for column.
 </p>
-<a class="index-entry-id" id="index-ibtypes-ilink"></a>
-<a class="index-entry-id" id="index-implicit-button-link"></a>
-<a class="index-entry-id" id="index-link-to-implicit-button"></a>
-<a class="index-entry-id" id="index-ilink"></a>
-<a class="anchor" id="ilink"></a></dd>
-<dt><code class="code">link-to-ibut &lt;ilink&gt;</code></dt>
-<dd><p>At point, activate a link to an implicit button within the current
-buffer.  This executes the linked to implicit button&rsquo;s action in the
-context of the current buffer.
-</p>
-<p>Recognizes the format &rsquo;&lt;ilink:&rsquo; button_label [&rsquo;:&rsquo; button_file_path] &rsquo;&gt;&rsquo;,
-where button_file_path is given only when the link is to another file,
-e.g. &lt;ilink: my series of keys: ${hyperb:dir}/HYPB&gt;.
-</p>
-<a class="index-entry-id" id="index-ibtypes-glink"></a>
-<a class="index-entry-id" id="index-global-button-link"></a>
-<a class="index-entry-id" id="index-link-to-global-button"></a>
-<a class="index-entry-id" id="index-glink"></a>
-<a class="anchor" id="glink"></a></dd>
-<dt><code class="code">link-to-gbut &lt;glink&gt;</code></dt>
-<dd><p>At point, activate a link to a global button.  This executes the
-linked to global button&rsquo;s action in the context of the current buffer.
-</p>
-<p>Recognizes the format &rsquo;&lt;glink:&rsquo; button_label &rsquo;&gt;&rsquo;, e.g. &lt;glink: open todos&gt;.
-</p>
-<a class="index-entry-id" id="index-ibtypes-elink"></a>
-<a class="index-entry-id" id="index-explicit-button-link"></a>
-<a class="index-entry-id" id="index-link-to-explicit-button"></a>
-<a class="index-entry-id" id="index-elink"></a>
-<a class="anchor" id="elink"></a></dd>
-<dt><code class="code">link-to-ebut &lt;elink&gt;</code></dt>
-<dd><p>At point, activate a link to an explicit button within the current
-buffer.  This executes the linked to explicit button&rsquo;s action in the
-context of the current buffer.
-</p>
-<p>Recognizes the format &rsquo;&lt;elink:&rsquo; button_label [&rsquo;:&rsquo; button_file_path] &rsquo;&gt;&rsquo;,
-where : button_file_path is given only when the link is to another file,
-e.g. &lt;elink: project-list: ~/projs&gt;.&quot;
-</p>
-<a class="index-entry-id" id="index-ibtypes-klink"></a>
-<a class="index-entry-id" id="index-klink"></a>
-<a class="index-entry-id" id="index-koutline-link"></a>
-<a class="index-entry-id" id="index-kcell-link"></a>
-<a class="anchor" id="klink"></a></dd>
-<dt><code class="code">klink</code></dt>
-<dd><p>Follow a link delimited by &lt;&gt; to a koutline cell.
-See the documentation for <code class="code">actypes::link-to-kotl</code> for valid link
-specifiers.
-</p>
 <a class="index-entry-id" id="index-ibtypes-man_002dapropos"></a>
 <a class="index-entry-id" id="index-UNIX-manual"></a>
 <a class="index-entry-id" id="index-man-pages"></a>
@@ -4748,7 +4748,8 @@ <h2 class="chapter" id="Menus-1"><span>5 Menus<a class="copiable-link" href="#Me
 look like this:
 </p>
 <div class="example smallexample">
-<pre class="example-preformatted">Hy&gt;  Act Butfile/ Cust/ Doc/ Ebut/ Find/ Gbut/ HyWiki/ Ibut/ Kotl/ Msg/ Rolo/ Screen/ Win/ historY
+<pre class="example-preformatted">Hy&gt;  Act Butfile/ Cust/ Doc/ Ebut/ Find/ Gbut/ HyWiki/ Ibut/ Kotl/ Msg/ Rolo/ Screen/
+     Win/ historY
 </pre></div>
 
 <a class="index-entry-id" id="index-submenus"></a>
@@ -5250,7 +5251,8 @@ <h3 class="section" id="HyWiki-Menu-1"><span>6.3 HyWiki Menu<a class="copiable-l
 It looks like this:
 </p>
 <div class="example smallexample">
-<pre class="example-preformatted">HyWiki&gt;  Act BacklinkConsult Create DiredHyWiki EditPage FindReferent GrepConsult Help Info Link ModeSet/ Org-M-RET/ Publish TagFind
+<pre class="example-preformatted">HyWiki&gt;  Act BacklinkConsult Create DiredHyWiki EditPage FindReferent GrepConsult
+         Help Info Link ModeSet/ Org-M-RET/ Publish TagFind
 </pre></div>
 
 <p>The BacklinkConsult and GrepConsult and items appear only when the Consult
@@ -5273,10 +5275,66 @@ <h3 class="section" id="HyWiki-Menu-1"><span>6.3 HyWiki Menu<a class="copiable-l
 consult grep over its HyWiki backlink references, selecting one.
 </p>
 </dd>
-<dt><a id="index-HyWiki-create-a-page"></a><span>Create<a class="copiable-link" href="#index-HyWiki-create-a-page"> &para;</a></span></dt>
-<dd><p>Create and display a new HyWiki page.  Shows existing page names to
-aid in new naming.
+<dt><a class="index-entry-id" id="index-HyWikiWord-types"></a>
+<a class="index-entry-id" id="index-hywiki_002dreferent_002dmenu"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-Activity"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-Bookmark"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-Command"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-Find"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-Gbut"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-HyRolo"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-InfoIndex"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-Keys"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-pathLink"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-infoNode"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-OrgID"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-Page"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-orgRoamNode"></a>
+<a class="index-entry-id" id="index-HyWiki-referent-type_002c-Sexp"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dactivity"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dbookmark"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dcommand"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dfind"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dglobal_002dbutton"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dhyrolo"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dinfo_002dindex"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dkey_002dseries"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dpath_002dlink"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dinfo_002dnode"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dorg_002did"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dpage"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dorg_002droam_002dnode"></a>
+<a class="index-entry-id" id="index-hywiki_002dadd_002dsexpression"></a>
+<a id="index-HyWikiWord-creation"></a><span>Create<a class="copiable-link" href="#index-HyWikiWord-creation"> &para;</a></span></dt>
+<dd><p>Create and display a new or existing HyWikiWord referent, prompting
+with any existing referent names.  With either
+<code class="code">hywiki-referent-prompt-flag</code> set or optional prefix ARG, prompt
+for and choose a typed referent; otherwise, create and/or display a
+HyWiki page.  The following table details the potentially prompted for
+referent types, as given by <code class="code">hywiki-referent-menu</code>, with the
+&ldquo;HyWiki Add&gt;&rdquo; prompt (Activity appears only if the <code class="code">activities</code>
+package is loaded):
 </p>
+<div class="example">
+<div class="group"><pre class="example-preformatted">Menu Item       Command                  Description
+===================================================================
+Activity        hywiki-add-activity      Activate a saved Activity
+Bookmark        hywiki-add-bookmark      Jump to an Emacs bookmark
+Command         hywiki-add-command       Run a Hypb action or cmd
+Find            hywiki-add-find          Grep through hywiki dir
+Gbut            hywiki-add-global-button Activate a global button
+HyRolo          hywiki-add-hyrolo        Search <code class="code">hyrolo-file-list</code>
+InfoIndex       hywiki-add-info-index    Display an Info index item
+Keys            hywiki-add-key-series    Execute a series of keys
+pathLink        hywiki-add-path-link     Display a path and opt pos
+infoNode        hywiki-add-info-node     Display an Info doc node
+OrgID           hywiki-add-org-id        Display a sect for Org ID
+Page            hywiki-add-page          Display a HyWiki page#sect
+orgRoamNode     hywiki-add-org-roam-node Display an Org Roam node
+Sexp            hywiki-add-sexpression   Evaluate an Elisp sexp
+===================================================================
+</pre></div></div>
+
 </dd>
 <dt><a class="index-entry-id" id="index-action_002dkey_002dmodeline_002dbuffer_002did_002dfunction"></a>
 <a class="index-entry-id" id="index-dired-1"></a>
@@ -5346,8 +5404,6 @@ <h3 class="section" id="HyWiki-Menu-1"><span>6.3 HyWiki Menu<a class="copiable-l
 
 </dd>
 <dt><a class="index-entry-id" id="index-HyWiki_002c-C_002dh-h-h-o"></a>
-<a class="index-entry-id" id="index-C_002dh-h-h-c-1"></a>
-<a class="index-entry-id" id="index-HyWiki_002c-C_002dh-h-h-c"></a>
 <a class="index-entry-id" id="index-menu-item_002c-HyWiki_002fOrg_002dM_002dRET"></a>
 <a class="index-entry-id" id="index-menu-item_002c-HyWiki_002fOrg_002dM_002dRET_002fHyperbole_002dButtons_002dOnly"></a>
 <a class="index-entry-id" id="index-customize-Org-M_002dRET-1"></a>
@@ -7450,7 +7506,8 @@ <h3 class="section" id="Rolo-Menu"><span>10.2 Rolo Menu<a class="copiable-link"
 so.
 </p>
 <div class="example smallexample">
-<pre class="example-preformatted">Rolo&gt;  Add  ConsultFind  Display  Edit  FileFind  Info  Kill  Mail  Order  RegexFind  StringFind  TagFind  WordFind  Yank
+<pre class="example-preformatted">Rolo&gt;  Add  ConsultFind  Display  Edit  FileFind  Info  Kill  Mail  Order
+       RegexFind  StringFind  TagFind  WordFind  Yank
 </pre></div>
 
 <a class="index-entry-id" id="index-Rolo-menu"></a>
@@ -7492,7 +7549,7 @@ <h3 class="section" id="Rolo-Menu"><span>10.2 Rolo Menu<a class="copiable-link"
 <div class="group"><pre class="example-preformatted">Menu Item       Command                 Description
 =====================================================================
 Add             hyrolo-add              Add a hyrolo entry
-ConsultFind     hyrolo-consult-grep     Interactively narrow grep matches
+ConsultFind     hyrolo-consult-grep     Interactive grep matches
 Display         hyrolo-display-matches  Display last matches again
 Edit            hyrolo-edit             Edit an existing hyrolo entry
 FileFind        hyrolo-find-file        Edit a <code class="code">hyrolo-file-list</code> file
@@ -7505,7 +7562,7 @@ <h3 class="section" id="Rolo-Menu"><span>10.2 Rolo Menu<a class="copiable-link"
 StringFind      hyrolo-fgrep            Find all entries containing
                                           a string (or logical
                                           expression)
-TagFind         hyrolo-tags-view        Find HyWiki Org tags
+TagFind         hyrolo-tags-view        Find hyrolo Org tags
 WordFind        hyrolo-word             Find all entries containing
                                           a string of whole words
 Yank            hyrolo-yank             Insert the first matching
@@ -7513,8 +7570,8 @@ <h3 class="section" id="Rolo-Menu"><span>10.2 Rolo Menu<a class="copiable-link"
 =====================================================================
 </pre></div></div>
 
-<p>The &rsquo;File&rsquo; menu item displays and edits the first file listed in
-<code class="code">hyrolo-file-list</code> unless given a prefix argument, in which case
+<p>The &rsquo;FileFind&rsquo; menu item displays and edits the first file listed in
+<code class="code">hyrolo-file-list</code>, unless given a prefix argument, in which case
 it prompts with completion for the file to edit.
 </p>
 <p>A prefix argument used with any of the above menu items that have &rsquo;Find&rsquo;
@@ -7834,19 +7891,23 @@ <h3 class="section" id="HyRolo-Keys-1"><span>10.4 HyRolo Keys<a class="copiable-
 </div>
 <h3 class="section" id="HyRolo-Settings-1"><span>10.5 HyRolo Settings<a class="copiable-link" href="#HyRolo-Settings-1"> &para;</a></span></h3>
 
+<a class="index-entry-id" id="index-hyrolo_002ddefault_002dfile"></a>
 <a class="index-entry-id" id="index-hyrolo_002dfile_002dlist-1"></a>
 <a class="index-entry-id" id="index-rolo_002c-personal"></a>
 <p>The files used in any rolo search are given by the
-<code class="code">hyrolo-file-list</code> variable, whose default value is typically
-<code class="code">&quot;~/.rolo.otl&quot;</code>, in which case, searches scan only your personal
-rolo file.  But you can customize this to include files with variables
-in them, wildcard patterns and directories, as explained below.  Any
+<code class="code">hyrolo-file-list</code> variable, whose default first value is
+specified by the variable, <code class="code">hyrolo-default-file</code>.  Its standard
+value is <code class="code">&quot;~/.rolo.org&quot;</code>, unless the older <code class="code">~/.rolo.otl</code>
+exists when Hyperbole is loaded, in which case it is used.  You can
+customize <code class="code">hyrolo-file-list</code> to include files with variables in
+them, wildcard patterns and directories, as explained below.  Any
 paths added to this list should be absolute.
 </p>
 <p>If you include file wildcards in paths for this variable and
-<code class="code">find-file-wildcards</code> is non-nil (the default), then any files
-matching the pattern (which can include [char-matches] or * wildcards
-and regular text) when the variable is set will be included in HyRolo
+<code class="code">find-file-wildcards</code> is non-nil (the default), then any existing
+files matching the pattern (which can include square bracketed
+[character matches], optional characters followed by ?, or *
+wildcards) when the variable is set will be included in future HyRolo
 searches.  For more on wildcards, see <a data-manual="emacs" href="https://www.gnu.org/software/emacs/manual/html_mono/emacs.html#Wildcards">Wildcards</a> in <cite class="cite">the GNU
 Emacs Manual</cite>.
 </p>
@@ -7858,9 +7919,9 @@ <h3 class="section" id="HyRolo-Settings-1"><span>10.5 HyRolo Settings<a class="c
 </p>
 <p>If you include an existing directory (invalid ones are ignored) in
 your <code class="code">hyrolo-file-list</code>, HyRolo will expand it recursively across
-all of its files that match <code class="code">hyrolo-file-suffix-regexp</code>.  By
-default, this is Org files (.org), Emacs outlines (.otl), Koutlines
-(.kotl), or Markdown files (.md).  See <samp class="file">hpath.el#hpath:expand-list</samp>.
+all of its files that match <code class="code">hyrolo-file-suffix-regexp</code>.  This
+matches to Org files (.org), Emacs outlines (.otl), Koutlines (.kotl),
+and Markdown files (.md).  See <samp class="file">hpath.el#hpath:expand-list</samp>.
 </p>
 <p>Once expanded, if a file in the list does not exist or is not
 readable, it is dropped.  Paths are searched in the order in which
@@ -7886,12 +7947,12 @@ <h3 class="section" id="HyRolo-Settings-1"><span>10.5 HyRolo Settings<a class="c
 <a class="index-entry-id" id="index-BBDB"></a>
 <a class="index-entry-id" id="index-Big-Brother-DataBase"></a>
 <p>If you use the Big Brother DataBase (BBDB) Emacs package to capture
-email addresses and store contact information, the rolo automatically
+email addresses and store contact information, HyRolo automatically
 works with it.  If the BBDB package is loaded before HyRolo, then your
 <code class="code">bbdb-file</code> of contacts is added as the second entry in
-<code class="code">hyrolo-file-list</code> and will be searched automatically for any matches by
-the rolo find commands.  Presently there is no support for editing
-BBDB entries, just finding them.
+<code class="code">hyrolo-file-list</code> and will be searched automatically for any
+matches by the rolo find commands.  Presently there is no support for
+editing BBDB entries, just finding them.
 </p>
 <p>For finding matches within only BBDB, there are the commands
 <code class="code">hyrolo-bbdb-fgrep</code> (string finding) and <code class="code">hyrolo-bbdb-grep</code>
@@ -7900,15 +7961,15 @@ <h3 class="section" id="HyRolo-Settings-1"><span>10.5 HyRolo Settings<a class="c
 <a class="index-entry-id" id="index-contacts_002c-Google"></a>
 <a class="index-entry-id" id="index-Google-Contacts"></a>
 <a class="index-entry-id" id="index-Gmail-Contacts"></a>
-<p>If you use Google/Gmail Contacts, you can configure the HyRolo to
-query your Google Contacts for matches.  First you must download and
-install the external <samp class="file">google-contacts</samp> package using the Emacs
-Package Manager.  Then you must install the non-Emacs GNU Privacy
-Guard (GPG) package from <a class="uref" href="https://gnupg.org">https://gnupg.org</a> so that
-the <samp class="file">gpg</samp> or <samp class="file">gpg2</samp> executable is in your command-line
-search path.  Once these are in place, either restart Emacs or
-use <kbd class="kbd">{M-x hyrolo-initialize-file-list <kbd class="key">RET</kbd>}</kbd> to add Google
-Contacts to your searches.
+<p>If you use Google/Gmail Contacts, you can configure HyRolo to query
+your Google Contacts for matches.  First you must download and install
+the external <samp class="file">google-contacts</samp> package using the Emacs Package
+Manager.  Then you must install the non-Emacs GNU Privacy Guard (GPG)
+package from <a class="uref" href="https://gnupg.org">https://gnupg.org</a> so that the <samp class="file">gpg</samp> or
+<samp class="file">gpg2</samp> executable is in your command-line search path.  Once
+these are in place, either restart Emacs or use <kbd class="kbd">{M-x
+hyrolo-initialize-file-list <kbd class="key">RET</kbd>}</kbd> to add Google Contacts to your
+searches.
 </p>
 <p>When you next do a search, you will be prompted for your Google
 Contacts password and may also have to enter an authorization code
@@ -9974,6 +10035,7 @@ <h4 class="subsection" id="Referent-Display-1"><span>B.2.1 Referent Display<a cl
 Internal Custom Display       hpath:internal-display-alist
 External Display              hpath:external-display-alist
 Internal Standard Display     hpath:display-where
+=====================================================================
 </pre></div>
 
 <p>Continue reading the next sections for information on how referents
@@ -10560,7 +10622,7 @@ <h3 class="section" id="Default-Hyperbole-Bindings-1"><span>C.2 Default Hyperbol
 <li> in a Koutline klink, copies the klink;
 </li><li> in a Koutline cell, outside any klink, copies a klink reference to the current cell;
 </li><li> on a Hyperbole button, copies the text of the button excluding delimiters;
-</li><li> at the start of a paired delimiter, copy the text including the delimiters.
+</li><li> on a thing (not at whitespace), copy the text of the thing including any delimiters.
 </li></ol>
 
 </dd>
@@ -10612,7 +10674,7 @@ <h3 class="section" id="Default-Hyperbole-Bindings-1"><span>C.2 Default Hyperbol
 </div>
 <h3 class="section" id="Testing-1"><span>C.3 Testing<a class="copiable-link" href="#Testing-1"> &para;</a></span></h3>
 
-<p>Hyperbole includes over 200 automated test cases in the <samp class="file">test/</samp>
+<p>Hyperbole includes over 660 automated test cases in the <samp class="file">test/</samp>
 subdirectory.  You can run all of them by moving to the Hyperbole home
 directory in a Posix shell and run <code class="code">make test-all</code> or <code class="code">make
 test</code> to run just non-interactive tests.  If any tests fail, you can
@@ -11000,9 +11062,10 @@ <h2 class="appendix" id="Koutliner-Keys-1"><span>Appendix D Koutliner Keys<a cla
 kill it.  With COPY-P any other non-nil value, return region as a
 string without affecting the kill ring.
 </p>
-<p>If called interactively and there is no active region, copy any
-delimited selectable thing at point; see the documentation for
-<code class="code">hui:delimited-selectable-thing</code>.
+<p>If called interactively, <code class="code">transient-mark-mode</code> is non-nil,
+there is no active region, and point is not on a whitespace character,
+then kill/copy the selectable thing at point including any delimiters;
+see <code class="code">hui:selectable-thing-and-bounds</code>.
 </p>
 <p>If the buffer is read-only and COPY-P is nil, the region will not be
 deleted but it will be copied to the kill ring and then an error will be
@@ -14131,7 +14194,6 @@ <h2 class="unnumbered" id="Key-Index-1"><span>Key Index<a class="copiable-link"
 <tr><td></td><td class="printindex-index-entry"><a href="#index-C_002dh-h-g-l"><code>C-h h g l</code></a></td><td class="printindex-index-section"><a href="#Global-Buttons">Global Buttons</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-C_002dh-h-h-a"><code>C-h h h a</code></a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-C_002dh-h-h-c"><code>C-h h h c</code></a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-C_002dh-h-h-c-1"><code>C-h h h c</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-C_002dh-h-h-m"><code>C-h h h m</code></a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-C_002dh-h-h-o"><code>C-h h h o</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-C_002dh-h-h-o-a"><code>C-h h h o a</code></a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
@@ -14205,7 +14267,6 @@ <h2 class="unnumbered" id="Key-Index-1"><span>Key Index<a class="copiable-link"
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyControl_002c-see-screen"><code>HyControl, see screen</code></a></td><td class="printindex-index-section"><a href="#HyControl">HyControl</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyControl_002c-see-screen-1"><code>HyControl, see screen</code></a></td><td class="printindex-index-section"><a href="#HyControl">HyControl</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyRolo_002c-see-rolo"><code>HyRolo, see rolo</code></a></td><td class="printindex-index-section"><a href="#HyRolo-Keys">HyRolo Keys</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki_002c-C_002dh-h-h-c"><code>HyWiki, C-h h h c</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki_002c-C_002dh-h-h-o"><code>HyWiki, C-h h h o</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Key-Index_ky_letter-I">I</th></tr>
@@ -14874,6 +14935,7 @@ <h2 class="unnumbered" id="Function_002c-Variable-and-File-Index"><span>Function
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hyrolo_002dconsult_002dgrep"><code>hyrolo-consult-grep</code></a></td><td class="printindex-index-section"><a href="#HyRolo-Menu">HyRolo Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hyrolo_002ddate_002dformat">hyrolo-date-format</a></td><td class="printindex-index-section"><a href="#HyRolo-Concepts">HyRolo Concepts</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hyrolo_002ddate_002dformat-1">hyrolo-date-format</a></td><td class="printindex-index-section"><a href="#HyRolo-Keys">HyRolo Keys</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hyrolo_002ddefault_002dfile">hyrolo-default-file</a></td><td class="printindex-index-section"><a href="#HyRolo-Settings">HyRolo Settings</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hyrolo_002ddisplay_002dformat_002dfunction">hyrolo-display-format-function</a></td><td class="printindex-index-section"><a href="#HyRolo-Settings">HyRolo Settings</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hyrolo_002ddisplay_002dhook">hyrolo-display-hook</a></td><td class="printindex-index-section"><a href="#Hook-Variables">Hook Variables</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hyrolo_002ddisplay_002dmatches"><code>hyrolo-display-matches</code></a></td><td class="printindex-index-section"><a href="#HyRolo-Menu">HyRolo Menu</a></td></tr>
@@ -14913,6 +14975,20 @@ <h2 class="unnumbered" id="Function_002c-Variable-and-File-Index"><span>Function
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywconfig_002dyank_002dpop"><code>hywconfig-yank-pop</code></a></td><td class="printindex-index-section"><a href="#Window-Configurations">Window Configurations</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywconfig_002dyank_002dpop-1"><code>hywconfig-yank-pop</code></a></td><td class="printindex-index-section"><a href="#Window-Configurations">Window Configurations</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dactive_002din_002dcurrent_002dbuffer_002dp"><code>hywiki-active-in-current-buffer-p</code></a></td><td class="printindex-index-section"><a href="#Implicit-Button-Types">Implicit Button Types</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dactivity"><code>hywiki-add-activity</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dbookmark"><code>hywiki-add-bookmark</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dcommand"><code>hywiki-add-command</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dfind"><code>hywiki-add-find</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dglobal_002dbutton"><code>hywiki-add-global-button</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dhyrolo"><code>hywiki-add-hyrolo</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dinfo_002dindex"><code>hywiki-add-info-index</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dinfo_002dnode"><code>hywiki-add-info-node</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dkey_002dseries"><code>hywiki-add-key-series</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dorg_002did"><code>hywiki-add-org-id</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dorg_002droam_002dnode"><code>hywiki-add-org-roam-node</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dpage"><code>hywiki-add-page</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dpath_002dlink"><code>hywiki-add-path-link</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dadd_002dsexpression"><code>hywiki-add-sexpression</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dconsult_002dbacklink"><code>hywiki-consult-backlink</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dconsult_002dgrep"><code>hywiki-consult-grep</code></a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002ddirectory">hywiki-directory</a></td><td class="printindex-index-section"><a href="#HyWiki">HyWiki</a></td></tr>
@@ -14929,6 +15005,7 @@ <h2 class="unnumbered" id="Function_002c-Variable-and-File-Index"><span>Function
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dorg_002dpublishing_002ddirectory">hywiki-org-publishing-directory</a></td><td class="printindex-index-section"><a href="#Publish-HyWiki">Publish HyWiki</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dorg_002dpublishing_002dfunction">hywiki-org-publishing-function</a></td><td class="printindex-index-section"><a href="#Publish-HyWiki">Publish HyWiki</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dpublish_002dto_002dhtml"><code>hywiki-publish-to-html</code></a></td><td class="printindex-index-section"><a href="#Publish-HyWiki">Publish HyWiki</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hywiki_002dreferent_002dmenu">hywiki-referent-menu</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Function-Index_fn_letter-I">I</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-ibtype_003acreate"><code>ibtype:create</code></a></td><td class="printindex-index-section"><a href="#Programmatic-Implicit-Button-Types">Programmatic Implicit Button Types</a></td></tr>
@@ -15857,7 +15934,6 @@ <h2 class="unnumbered" id="Concept-Index-1"><span>Concept Index<a class="copiabl
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki">HyWiki</a></td><td class="printindex-index-section"><a href="#HyWiki">HyWiki</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-Action-Key">HyWiki Action Key</a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-activate-link">HyWiki activate link</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-create-a-page">HyWiki create a page</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-dired">HyWiki dired</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-documentation">HyWiki documentation</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-edit-pages">HyWiki edit pages</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
@@ -15876,6 +15952,20 @@ <h2 class="unnumbered" id="Concept-Index-1"><span>Concept Index<a class="copiabl
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-publish-to-web">HyWiki publish to web</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-publishing-directory">HyWiki publishing directory</a></td><td class="printindex-index-section"><a href="#Publish-HyWiki">Publish HyWiki</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-publishing-function">HyWiki publishing function</a></td><td class="printindex-index-section"><a href="#Publish-HyWiki">Publish HyWiki</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-Activity">HyWiki referent type, Activity</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-Bookmark">HyWiki referent type, Bookmark</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-Command">HyWiki referent type, Command</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-Find">HyWiki referent type, Find</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-Gbut">HyWiki referent type, Gbut</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-HyRolo">HyWiki referent type, HyRolo</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-InfoIndex">HyWiki referent type, InfoIndex</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-infoNode">HyWiki referent type, infoNode</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-Keys">HyWiki referent type, Keys</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-OrgID">HyWiki referent type, OrgID</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-orgRoamNode">HyWiki referent type, orgRoamNode</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-Page">HyWiki referent type, Page</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-pathLink">HyWiki referent type, pathLink</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-referent-type_002c-Sexp">HyWiki referent type, Sexp</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-search-for-Org-tags">HyWiki search for Org tags</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-section-link">HyWiki section link</a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWiki-treemacs">HyWiki treemacs</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
@@ -15887,9 +15977,11 @@ <h2 class="unnumbered" id="Concept-Index-1"><span>Concept Index<a class="copiabl
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord-attribute-help">HyWikiWord attribute help</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord-contexts">HyWikiWord contexts</a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord-create">HyWikiWord create</a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord-creation">HyWikiWord creation</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord-highlighting">HyWikiWord highlighting</a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord-interactive-backlink-grep">HyWikiWord interactive backlink grep</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord-link">HyWikiWord link</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord-types">HyWikiWord types</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWord_002c-outside-the-wiki">HyWikiWord, outside the wiki</a></td><td class="printindex-index-section"><a href="#HyWikiWords">HyWikiWords</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-HyWikiWords-outside-hywiki_002ddirectory">HyWikiWords outside hywiki-directory</a></td><td class="printindex-index-section"><a href="#HyWiki-Menu">HyWiki Menu</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
diff --git a/man/hyperbole.info b/man/hyperbole.info
index 172156c6..36ca5483 100644
Binary files a/man/hyperbole.info and b/man/hyperbole.info differ
diff --git a/man/hyperbole.pdf b/man/hyperbole.pdf
index d3e02183..c69a9d85 100644
Binary files a/man/hyperbole.pdf and b/man/hyperbole.pdf differ
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index 922cdf5e..01a8cdc5 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -7,7 +7,7 @@
 @c Author:       Bob Weiner
 @c
 @c Orig-Date:     6-Nov-91 at 11:18:03
-@c Last-Mod:     12-Jun-26 at 13:53:14 by Bob Weiner
+@c Last-Mod:     25-Jun-26 at 13:36:38 by Bob Weiner
 
 @c %**start of header (This is for running Texinfo on a region.)
 @setfilename hyperbole.info
@@ -30,7 +30,7 @@
 @set txicodequoteundirected
 @set txicodequotebacktick
 
-@set UPDATED June 12, 2026
+@set UPDATED June 25, 2026
 @set UPDATED-MONTH June 2026
 @set EDITION 9.0.2pre
 @set VERSION 9.0.2pre
@@ -171,7 +171,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
 
 <PRE>
 Edition 9.0.2pre
-Printed June 12, 2026.
+Printed June 25, 2026.
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -213,7 +213,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 @example
 Edition 9.0.2pre
-June 12, 2026 @c AUTO-REPLACE-ON-SAVE
+June 25, 2026 @c AUTO-REPLACE-ON-SAVE
 
 
   Published by the Free Software Foundation, Inc.
@@ -4188,13 +4188,13 @@ menubar.  Here is the Hyperbole Menubar Menu and its Find submenu.
 
 @float Image,image:Hyperbole Menu
 @caption{Hyperbole Menubar Menu}
-@image{im/menu-hyperbole,5in,,Hyperbole Menu}
+@image{im/menu-hyperbole,2.5in,,Hyperbole Menu}
 @end float
 @page
 
 @float Image,image:Find Menu
 @caption{Find Menubar Menu}
-@image{im/menu-find,5in,,Find Menu}
+@image{im/menu-find,2.5in,,Find Menu}
 @end float
 @sp 1
 
@@ -4233,7 +4233,8 @@ look like this:
 
 @smallexample
 @noindent
-Hy>  Act Butfile/ Cust/ Doc/ Ebut/ Find/ Gbut/ HyWiki/ Ibut/ Kotl/ Msg/ Rolo/ Screen/ Win/ historY
+Hy>  Act Butfile/ Cust/ Doc/ Ebut/ Find/ Gbut/ HyWiki/ Ibut/ Kotl/ Msg/ Rolo/ Screen/
+     Win/ historY
 @end smallexample
 
 @cindex submenus
@@ -4522,7 +4523,7 @@ directory for export to the web.
 
 @float Image,image:HyWiki Page
 @caption{HyWiki Page}
-@image{im/hywiki-page,3.5in,,HyWiki Page}
+@image{im/hywiki-page,6in,,HyWiki Page}
 @end float
 @sp 1
 
@@ -4726,7 +4727,8 @@ It looks like this:
 
 @smallexample
 @noindent
-HyWiki>  Act BacklinkConsult Create DiredHyWiki EditPage FindReferent GrepConsult Help Info Link ModeSet/ Org-M-RET/ Publish TagFind
+HyWiki>  Act BacklinkConsult Create DiredHyWiki EditPage FindReferent GrepConsult
+         Help Info Link ModeSet/ Org-M-RET/ Publish TagFind
 @end smallexample
 
 @noindent
@@ -4751,10 +4753,69 @@ Activate HyWikiWord link at point.
 Use @code{hywiki-consult-backlink} to prompt for a HyWikiWord and then
 consult grep over its HyWiki backlink references, selecting one.
 
-@cindex HyWiki create a page
+@cindex HyWikiWord creation
+@cindex HyWikiWord types
+@vindex hywiki-referent-menu
+@cindex HyWiki referent type, Activity
+@cindex HyWiki referent type, Bookmark
+@cindex HyWiki referent type, Command
+@cindex HyWiki referent type, Find
+@cindex HyWiki referent type, Gbut
+@cindex HyWiki referent type, HyRolo
+@cindex HyWiki referent type, InfoIndex
+@cindex HyWiki referent type, Keys
+@cindex HyWiki referent type, pathLink
+@cindex HyWiki referent type, infoNode
+@cindex HyWiki referent type, OrgID
+@cindex HyWiki referent type, Page
+@cindex HyWiki referent type, orgRoamNode
+@cindex HyWiki referent type, Sexp
+@findex hywiki-add-activity
+@findex hywiki-add-bookmark
+@findex hywiki-add-command
+@findex hywiki-add-find
+@findex hywiki-add-global-button
+@findex hywiki-add-hyrolo
+@findex hywiki-add-info-index
+@findex hywiki-add-key-series
+@findex hywiki-add-path-link
+@findex hywiki-add-info-node
+@findex hywiki-add-org-id
+@findex hywiki-add-page
+@findex hywiki-add-org-roam-node
+@findex hywiki-add-sexpression
 @item Create
-Create and display a new HyWiki page.  Shows existing page names to
-aid in new naming.
+Create and display a new or existing HyWikiWord referent, prompting
+with any existing referent names.  With either
+@code{hywiki-referent-prompt-flag} set or optional prefix ARG, prompt
+for and choose a typed referent; otherwise, create and/or display a
+HyWiki page.  The following table details the potentially prompted for
+referent types, as given by @code{hywiki-referent-menu}, with the
+``HyWiki Add>'' prompt (Activity appears only if the @code{activities}
+package is loaded):
+
+@exampleindent 0
+@example
+@group
+Menu Item       Command                  Description
+===================================================================
+Activity        hywiki-add-activity      Activate a saved Activity
+Bookmark        hywiki-add-bookmark      Jump to an Emacs bookmark
+Command         hywiki-add-command       Run a Hypb action or cmd
+Find            hywiki-add-find          Grep through hywiki dir
+Gbut            hywiki-add-global-button Activate a global button
+HyRolo          hywiki-add-hyrolo        Search @code{hyrolo-file-list}
+InfoIndex       hywiki-add-info-index    Display an Info index item
+Keys            hywiki-add-key-series    Execute a series of keys
+pathLink        hywiki-add-path-link     Display a path and opt pos
+infoNode        hywiki-add-info-node     Display an Info doc node
+OrgID           hywiki-add-org-id        Display a sect for Org ID
+Page            hywiki-add-page          Display a HyWiki page#sect
+orgRoamNode     hywiki-add-org-roam-node Display an Org Roam node
+Sexp            hywiki-add-sexpression   Evaluate an Elisp sexp
+===================================================================
+@end group
+@end example
 
 @vindex hywiki-directory
 @vindex action-key-modeline-buffer-id-function
@@ -4823,8 +4884,6 @@ Disable highlighting HyWikiWord references everywhere.  The
 
 @kindex C-h h h o
 @kindex HyWiki, C-h h h o
-@kindex C-h h h c
-@kindex HyWiki, C-h h h c
 @cindex menu item, HyWiki/Org-M-RET
 @cindex menu item, HyWiki/Org-M-RET/Hyperbole-Buttons-Only
 @cindex customize Org M-RET
@@ -5484,7 +5543,7 @@ read the following sections explaining commands.
 
 @float Image,image:Koutline Menu
 @caption{Koutline Menu}
-@image{im/menu-koutline,6in,,Koutline Menu}
+@image{im/menu-koutline,3.5in,,Koutline Menu}
 @end float
 @sp 1
 
@@ -6702,7 +6761,8 @@ so.
 
 @smallexample
 @noindent
-Rolo>  Add  ConsultFind  Display  Edit  FileFind  Info  Kill  Mail  Order  RegexFind  StringFind  TagFind  WordFind  Yank
+Rolo>  Add  ConsultFind  Display  Edit  FileFind  Info  Kill  Mail  Order
+       RegexFind  StringFind  TagFind  WordFind  Yank
 @end smallexample
 
 @cindex Rolo menu
@@ -6745,7 +6805,7 @@ pattern narrowing):
 Menu Item       Command                 Description
 =====================================================================
 Add             hyrolo-add              Add a hyrolo entry
-ConsultFind     hyrolo-consult-grep     Interactively narrow grep matches
+ConsultFind     hyrolo-consult-grep     Interactive grep matches
 Display         hyrolo-display-matches  Display last matches again
 Edit            hyrolo-edit             Edit an existing hyrolo entry
 FileFind        hyrolo-find-file        Edit a @code{hyrolo-file-list} file
@@ -6758,7 +6818,7 @@ RegexFind       hyrolo-grep             Find all entries containing
 StringFind      hyrolo-fgrep            Find all entries containing
                                           a string (or logical
                                           expression)
-TagFind         hyrolo-tags-view        Find HyWiki Org tags
+TagFind         hyrolo-tags-view        Find hyrolo Org tags
 WordFind        hyrolo-word             Find all entries containing
                                           a string of whole words
 Yank            hyrolo-yank             Insert the first matching
@@ -6767,7 +6827,7 @@ Yank            hyrolo-yank             Insert the first matching
 @end group
 @end example
 
-The 'File' menu item displays and edits the first file listed in
+The 'FileFind' menu item displays and edits the first file listed in
 @code{hyrolo-file-list}, unless given a prefix argument, in which case
 it prompts with completion for the file to edit.
 
@@ -8993,6 +9053,7 @@ Internal Image Display        hpath:native-image-suffixes
 Internal Custom Display       hpath:internal-display-alist
 External Display              hpath:external-display-alist
 Internal Standard Display     hpath:display-where
+=====================================================================
 @end example
 
 @noindent
diff --git a/test/hui-tests.el b/test/hui-tests.el
index 7cd0a08a..c1bd1427 100644
--- a/test/hui-tests.el
+++ b/test/hui-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    30-Jan-21 at 12:00:00
-;; Last-Mod:      6-Jun-26 at 01:57:18 by Bob Weiner
+;; Last-Mod:     25-Jun-26 at 09:59:14 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -990,7 +990,7 @@ With point on label suggest that ibut for rename."
        (progn
          (should (equal (car err) 'error))
          (should (string-match
-                  "(func) Read-only error in Hyperbole button buffer"
+                  "(func) Read-only error in buffer"
                   (cadr err))))))))
 
 (ert-deftest hui--gbut-link-directly-ibut ()
diff --git a/test/hywiki-tests.el b/test/hywiki-tests.el
index 6b33c0d0..fafe77ae 100644
--- a/test/hywiki-tests.el
+++ b/test/hywiki-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell
 ;;
 ;; Orig-Date:    18-May-24 at 23:59:48
-;; Last-Mod:      9-Jun-26 at 16:26:28 by Mats Lidell
+;; Last-Mod:     25-Jun-26 at 13:00:41 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1149,10 +1149,15 @@ Note special meaning of `hywiki-allow-plurals-flag'."
   "Verify `hywiki-add-command'."
   (hywiki-tests--preserve-hywiki-mode
     (let ((wikiword "WikiWord"))
-      (hy-test-helpers:ert-simulate-keys "hpath:find\r"
+      (hy-test-helpers:ert-simulate-keys "hpath:find\r/tmp/a.txt\r"
 	(hywiki-add-command wikiword)
-	(should (equal '(command . hpath:find)
-		       (hywiki-get-referent wikiword)))))))
+        (let* ((referent (hywiki-get-referent wikiword))
+               (action (cdr referent))
+               (cmd (if (consp action)
+                        (car action)
+                      action)))
+          (should (equal (car referent) 'command))
+          (should (equal cmd 'hpath:find)))))))
 
 (ert-deftest hywiki-tests--add-find ()
   "Verify `hywiki-add-find'."
@@ -1329,7 +1334,7 @@ Note special meaning of `hywiki-allow-plurals-flag'."
 ;; Command
 (defun hywiki-tests--command (wikiword)
   "Verify WIKIWORD is WikiReferent."
-  (interactive)
+  (interactive (list "WikiReferent"))
   (should (string= "WikiReferent" wikiword)))
 
 (ert-deftest hywiki-tests--save-referent-command ()