diff --git a/options.html b/options.html
index c83b9340e..33c542f43 100644
--- a/options.html
+++ b/options.html
@@ -311,17 +311,19 @@ directory.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span
                     &lt;home-manager/modules/accounts/email.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.aerc.enable"></a><a class="link" href="options.html#opt-accounts.email.accounts._name_.aerc.enable"><code class="option">accounts.email.accounts.&lt;name&gt;.aerc.enable</code></a></span></dt><dd><p>Whether to enable aerc.</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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.aerc.extraAccounts"></a><a class="link" href="options.html#opt-accounts.email.accounts._name_.aerc.extraAccounts"><code class="option">accounts.email.accounts.&lt;name&gt;.aerc.extraAccounts</code></a></span></dt><dd><p>Extra config added to the configuration of this account in
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.aerc.extraAccounts"></a><a class="link" href="options.html#opt-accounts.email.accounts._name_.aerc.extraAccounts"><code class="option">accounts.email.accounts.&lt;name&gt;.aerc.extraAccounts</code></a></span></dt><dd><p>Extra config added to the configuration section for this account in
 <code class="filename">$HOME/.config/aerc/accounts.conf</code>.
-See aerc-config(5).</p><p><span class="emphasis"><em>Type:</em></span> attribute set of (values (null, bool, int, string of float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ source = "maildir://~/Maildir/example"; }</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/aerc.nix#blob-path" target="_top">
+See <span class="citerefentry"><span class="refentrytitle">aerc-accounts</span>(5)</span>.</p><p><span class="emphasis"><em>Type:</em></span> attribute set of (values (null, bool, int, string, or float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ source = "maildir://~/Maildir/example"; }</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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.aerc.extraBinds"></a><a class="link" href="options.html#opt-accounts.email.accounts._name_.aerc.extraBinds"><code class="option">accounts.email.accounts.&lt;name&gt;.aerc.extraBinds</code></a></span></dt><dd><p>Extra bindings specific to this account, added to
-<code class="filename">$HOME/.config/aerc/accounts.conf</code>.
-See <span class="citerefentry"><span class="refentrytitle">aerc-config</span>(5)</span>.</p><p><span class="emphasis"><em>Type:</em></span> attribute set of attribute set of (values (null, bool, int, string of float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ messages = { d = ":move ${folder.trash}&lt;Enter&gt;"; }; }</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/aerc.nix#blob-path" target="_top">
+<code class="filename">$HOME/.config/aerc/binds.conf</code>.
+See <span class="citerefentry"><span class="refentrytitle">aerc-binds</span>(5)</span>.</p><p><span class="emphasis"><em>Type:</em></span> attribute set of attribute set of (values (null, bool, int, string, or float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ messages = { d = ":move ${folder.trash}&lt;Enter&gt;"; }; }</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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.aerc.extraConfig"></a><a class="link" href="options.html#opt-accounts.email.accounts._name_.aerc.extraConfig"><code class="option">accounts.email.accounts.&lt;name&gt;.aerc.extraConfig</code></a></span></dt><dd><p>Extra config specific to this account, added to
-<code class="filename">$HOME/.config/aerc/aerc.conf</code>.
-See <span class="citerefentry"><span class="refentrytitle">aerc-config</span>(5)</span>.</p><p><span class="emphasis"><em>Type:</em></span> attribute set of attribute set of (values (null, bool, int, string of float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ ui = { sidebar-width = 42; }; }</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/aerc.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.aerc.extraConfig"></a><a class="link" href="options.html#opt-accounts.email.accounts._name_.aerc.extraConfig"><code class="option">accounts.email.accounts.&lt;name&gt;.aerc.extraConfig</code></a></span></dt><dd><p>Config specific to this account, added to <code class="filename">$HOME/.config/aerc/aerc.conf</code>.
+Aerc only supports per-account UI configuration.
+For other sections of <code class="filename">$HOME/.config/aerc/aerc.conf</code>,
+use <code class="literal">programs.aerc.extraConfig</code>.
+See <span class="citerefentry"><span class="refentrytitle">aerc-config</span>(5)</span>.</p><p><span class="emphasis"><em>Type:</em></span> attribute set of attribute set of (values (null, bool, int, string, or float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ ui = { sidebar-width = 25; }; }</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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.aerc.imapAuth"></a><a class="link" href="options.html#opt-accounts.email.accounts._name_.aerc.imapAuth"><code class="option">accounts.email.accounts.&lt;name&gt;.aerc.imapAuth</code></a></span></dt><dd><p>Sets the authentication mechanism if imap is used as the incoming
 method.
@@ -1839,17 +1841,17 @@ Available configuration options are described in the abook repository:
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.aerc.package"></a><a class="link" href="options.html#opt-programs.aerc.package"><code class="option">programs.aerc.package</code></a></span></dt><dd><p>The aerc package to use.</p><p><span class="emphasis"><em>Type:</em></span> package</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">pkgs.aerc</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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.aerc.extraAccounts"></a><a class="link" href="options.html#opt-programs.aerc.extraAccounts"><code class="option">programs.aerc.extraAccounts</code></a></span></dt><dd><p>Extra lines added to <code class="filename">$HOME/.config/aerc/accounts.conf</code>.
-See aerc-config(5).</p><p><span class="emphasis"><em>Type:</em></span> strings concatenated with "\n" or attribute set of attribute set of (values (null, bool, int, string of float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ Work = { source = "maildir://~/Maildir/work"; }; }</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/aerc.nix#blob-path" target="_top">
+See aerc-config(5).</p><p><span class="emphasis"><em>Type:</em></span> strings concatenated with "\n" or attribute set of attribute set of (values (null, bool, int, string, or float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ Work = { source = "maildir://~/Maildir/work"; }; }</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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.aerc.extraBinds"></a><a class="link" href="options.html#opt-programs.aerc.extraBinds"><code class="option">programs.aerc.extraBinds</code></a></span></dt><dd><p>Extra lines added to <code class="filename">$HOME/.config/aerc/binds.conf</code>.
 Global keybindings can be set in the `global` section.
-See aerc-config(5).</p><p><span class="emphasis"><em>Type:</em></span> strings concatenated with "\n" or attribute set of attribute set of (values (null, bool, int, string of float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ messages = { q = ":quit&lt;Enter&gt;"; }; }</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/aerc.nix#blob-path" target="_top">
+See aerc-config(5).</p><p><span class="emphasis"><em>Type:</em></span> strings concatenated with "\n" or attribute set of attribute set of (values (null, bool, int, string, or float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ messages = { q = ":quit&lt;Enter&gt;"; }; }</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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.aerc.extraConfig"></a><a class="link" href="options.html#opt-programs.aerc.extraConfig"><code class="option">programs.aerc.extraConfig</code></a></span></dt><dd><p>Extra lines added to <code class="filename">$HOME/.config/aerc/aerc.conf</code>.
-See aerc-config(5).</p><p><span class="emphasis"><em>Type:</em></span> strings concatenated with "\n" or attribute set of attribute set of (values (null, bool, int, string of float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ ui = { sort = "-r date"; }; }</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/aerc.nix#blob-path" target="_top">
+See aerc-config(5).</p><p><span class="emphasis"><em>Type:</em></span> strings concatenated with "\n" or attribute set of attribute set of (values (null, bool, int, string, or float) or a list of values, that will be joined with a comma)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">{ ui = { sort = "-r date"; }; }</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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.aerc.stylesets"></a><a class="link" href="options.html#opt-programs.aerc.stylesets"><code class="option">programs.aerc.stylesets</code></a></span></dt><dd><p>Stylesets added to <code class="filename">$HOME/.config/aerc/stylesets/</code>.
-See aerc-stylesets(7).</p><p><span class="emphasis"><em>Type:</em></span> attribute set of ((attribute set of (values (null, bool, int, string of float) or a list of values, that will be joined with a comma)) or strings concatenated with "\n")</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> </p><pre class="programlisting">{ default = { ui = { "tab.selected.reverse" = toggle; }; }; };
+See aerc-stylesets(7).</p><p><span class="emphasis"><em>Type:</em></span> attribute set of ((attribute set of (values (null, bool, int, string, or float) or a list of values, that will be joined with a comma)) or strings concatenated with "\n")</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> </p><pre class="programlisting">{ default = { ui = { "tab.selected.reverse" = toggle; }; }; };
 </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/aerc.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/aerc.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.aerc.templates"></a><a class="link" href="options.html#opt-programs.aerc.templates"><code class="option">programs.aerc.templates</code></a></span></dt><dd><p>Templates added to <code class="filename">$HOME/.config/aerc/templates/</code>.