diff --git a/options.xhtml b/options.xhtml
index 9f7b3ecb..f1b494b8 100644
--- a/options.xhtml
+++ b/options.xhtml
@@ -3091,7 +3091,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Whether to enable Himalaya for this email account.</p>
+<p>Whether to enable the email client Himalaya CLI for this email account.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 boolean</p>
@@ -3102,53 +3102,6 @@ boolean</p>
 <p><span class="emphasis"><em>Example:</em></span>
 <code class="literal">true</code></p>
 
-<p><span class="emphasis"><em>Declared by:</em></span></p>
-<table border="0" summary="Simple list" class="simplelist">
-<tr><td>
-<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/programs/himalaya.nix" target="_top">
-&lt;home-manager/modules/programs/himalaya.nix&gt;
-</a></code>
-</td></tr>
-</table>
-</dd>
-<dt>
- <span class="term">
- <a id="opt-accounts.email.accounts._name_.himalaya.backend"></a><a class="term" href="options.xhtml#opt-accounts.email.accounts._name_.himalaya.backend"><code class="option">accounts.email.accounts.&lt;name&gt;.himalaya.backend</code>
-  </a>
- </span>
-</dt>
-<dd>
-<p>Specifying <code class="option">accounts.email.accounts.*.himalaya.backend</code> is deprecated,
-set <code class="option">accounts.email.accounts.*.himalaya.settings.backend</code> instead.</p>
-
-<p><span class="emphasis"><em>Type:</em></span>
-null or string</p>
-
-<p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">null</code></p>
-
-<p><span class="emphasis"><em>Declared by:</em></span></p>
-<table border="0" summary="Simple list" class="simplelist">
-<tr><td>
-<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/programs/himalaya.nix" target="_top">
-&lt;home-manager/modules/programs/himalaya.nix&gt;
-</a></code>
-</td></tr>
-</table>
-</dd>
-<dt>
- <span class="term">
- <a id="opt-accounts.email.accounts._name_.himalaya.sender"></a><a class="term" href="options.xhtml#opt-accounts.email.accounts._name_.himalaya.sender"><code class="option">accounts.email.accounts.&lt;name&gt;.himalaya.sender</code>
-  </a>
- </span>
-</dt>
-<dd>
-<p>Specifying <code class="option">accounts.email.accounts.*.himalaya.sender</code> is deprecated,
-set {option}‘accounts.email.accounts.*.himalaya.settings.sender’ instead.</p>
-
-<p><span class="emphasis"><em>Type:</em></span>
-null or string</p>
-
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
 <tr><td>
@@ -3165,8 +3118,8 @@ null or string</p>
  </span>
 </dt>
 <dd>
-<p>Himalaya configuration for this email account.
-See <a class="link" href="https://pimalaya.org/himalaya/cli/configuration/account.html"  target="_top">https://pimalaya.org/himalaya/cli/configuration/account.html</a> for supported values.</p>
+<p>Himalaya CLI configuration for this email account.
+See <a class="link" href="https://pimalaya.org/himalaya/cli/latest/configuration/index.html#account-configuration"  target="_top">https://pimalaya.org/himalaya/cli/latest/configuration/index.html#account-configuration</a> for supported values.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 TOML value</p>
@@ -23626,7 +23579,7 @@ null or package</p>
  </span>
 </dt>
 <dd>
-<p>Whether to enable the Himalaya email client.</p>
+<p>Whether to enable the email client Himalaya CLI.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 boolean</p>
@@ -23677,8 +23630,8 @@ package</p>
  </span>
 </dt>
 <dd>
-<p>Himalaya global configuration.
-See <a class="link" href="https://pimalaya.org/himalaya/cli/configuration/global.html"  target="_top">https://pimalaya.org/himalaya/cli/configuration/global.html</a> for supported values.</p>
+<p>Himalaya CLI global configuration.
+See <a class="link" href="https://pimalaya.org/himalaya/cli/latest/configuration/index.html#global-configuration"  target="_top">https://pimalaya.org/himalaya/cli/latest/configuration/index.html#global-configuration</a> for supported values.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 TOML value</p>
@@ -57594,118 +57547,6 @@ null or string or (positive integer, meaning &gt;0)</p>
 </td></tr>
 </table>
 </dd>
-<dt>
- <span class="term">
- <a id="opt-services.himalaya-notify.enable"></a><a class="term" href="options.xhtml#opt-services.himalaya-notify.enable"><code class="option">services.himalaya-notify.enable</code>
-  </a>
- </span>
-</dt>
-<dd>
-<p>Whether to enable the Himalaya new emails notifier service.</p>
-
-<p><span class="emphasis"><em>Type:</em></span>
-boolean</p>
-
-<p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">false</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">true</code></p>
-
-<p><span class="emphasis"><em>Declared by:</em></span></p>
-<table border="0" summary="Simple list" class="simplelist">
-<tr><td>
-<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/programs/himalaya.nix" target="_top">
-&lt;home-manager/modules/programs/himalaya.nix&gt;
-</a></code>
-</td></tr>
-</table>
-</dd>
-<dt>
- <span class="term">
- <a id="opt-services.himalaya-notify.environment"></a><a class="term" href="options.xhtml#opt-services.himalaya-notify.environment"><code class="option">services.himalaya-notify.environment</code>
-  </a>
- </span>
-</dt>
-<dd>
-<p>Extra environment variables to be exported in the service.</p>
-
-<p><span class="emphasis"><em>Type:</em></span>
-attribute set of string</p>
-
-<p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">{ }</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span></p><pre><code class="programlisting">{
-  &quot;PASSWORD_STORE_DIR&quot; = &quot;~/.password-store&quot;;
-}
-
-</code></pre>
-
-<p><span class="emphasis"><em>Declared by:</em></span></p>
-<table border="0" summary="Simple list" class="simplelist">
-<tr><td>
-<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/programs/himalaya.nix" target="_top">
-&lt;home-manager/modules/programs/himalaya.nix&gt;
-</a></code>
-</td></tr>
-</table>
-</dd>
-<dt>
- <span class="term">
- <a id="opt-services.himalaya-notify.settings.account"></a><a class="term" href="options.xhtml#opt-services.himalaya-notify.settings.account"><code class="option">services.himalaya-notify.settings.account</code>
-  </a>
- </span>
-</dt>
-<dd>
-<p>Name of the account the notifier should be started for. If
-no account is given, the default one is used.</p>
-
-<p><span class="emphasis"><em>Type:</em></span>
-null or string</p>
-
-<p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">null</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">&quot;gmail&quot;</code></p>
-
-<p><span class="emphasis"><em>Declared by:</em></span></p>
-<table border="0" summary="Simple list" class="simplelist">
-<tr><td>
-<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/programs/himalaya.nix" target="_top">
-&lt;home-manager/modules/programs/himalaya.nix&gt;
-</a></code>
-</td></tr>
-</table>
-</dd>
-<dt>
- <span class="term">
- <a id="opt-services.himalaya-notify.settings.keepalive"></a><a class="term" href="options.xhtml#opt-services.himalaya-notify.settings.keepalive"><code class="option">services.himalaya-notify.settings.keepalive</code>
-  </a>
- </span>
-</dt>
-<dd>
-<p>Notifier lifetime of the IDLE session (in seconds).</p>
-
-<p><span class="emphasis"><em>Type:</em></span>
-null or signed integer</p>
-
-<p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">null</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">&quot;500&quot;</code></p>
-
-<p><span class="emphasis"><em>Declared by:</em></span></p>
-<table border="0" summary="Simple list" class="simplelist">
-<tr><td>
-<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/programs/himalaya.nix" target="_top">
-&lt;home-manager/modules/programs/himalaya.nix&gt;
-</a></code>
-</td></tr>
-</table>
-</dd>
 <dt>
  <span class="term">
  <a id="opt-services.himalaya-watch.enable"></a><a class="term" href="options.xhtml#opt-services.himalaya-watch.enable"><code class="option">services.himalaya-watch.enable</code>
@@ -57713,7 +57554,7 @@ null or signed integer</p>
  </span>
 </dt>
 <dd>
-<p>Whether to enable the Himalaya folder changes watcher service.</p>
+<p>Whether to enable the email client Himalaya CLI envelopes watcher service.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 boolean</p>
@@ -57770,8 +57611,8 @@ attribute set of string</p>
  </span>
 </dt>
 <dd>
-<p>Name of the account the watcher should be started for. If
-no account is given, the default one is used.</p>
+<p>Name of the account the watcher should be started for.
+If no account is given, the default one is used.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 null or string</p>
@@ -57780,34 +57621,7 @@ null or string</p>
 <code class="literal">null</code></p>
 
 <p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">&quot;gmail&quot;</code></p>
-
-<p><span class="emphasis"><em>Declared by:</em></span></p>
-<table border="0" summary="Simple list" class="simplelist">
-<tr><td>
-<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/programs/himalaya.nix" target="_top">
-&lt;home-manager/modules/programs/himalaya.nix&gt;
-</a></code>
-</td></tr>
-</table>
-</dd>
-<dt>
- <span class="term">
- <a id="opt-services.himalaya-watch.settings.keepalive"></a><a class="term" href="options.xhtml#opt-services.himalaya-watch.settings.keepalive"><code class="option">services.himalaya-watch.settings.keepalive</code>
-  </a>
- </span>
-</dt>
-<dd>
-<p>Watcher lifetime of the IDLE session (in seconds).</p>
-
-<p><span class="emphasis"><em>Type:</em></span>
-null or signed integer</p>
-
-<p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">null</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">&quot;500&quot;</code></p>
+<code class="literal">&quot;personal&quot;</code></p>
 
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">