diff --git a/options.html b/options.html
index 332acd94c..28daac075 100644
--- a/options.html
+++ b/options.html
@@ -9191,9 +9191,9 @@ This must to correspond to the value of the keybinding of the default workspace.
                     <home-manager/modules/services/window-managers/i3-sway/sway.nix>
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-wayland.windowManager.sway.config.focus.followMouse"></a><a class="term" href="options.html#opt-wayland.windowManager.sway.config.focus.followMouse"><code class="option">wayland.windowManager.sway.config.focus.followMouse</code></a></span></dt><dd><p>Whether focus should follow the mouse.</p><p><span class="emphasis"><em>Type:</em></span> one of "yes", "no", "always" or boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"yes"</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/services/window-managers/i3-sway/sway.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/window-managers/i3-sway/sway.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-wayland.windowManager.sway.config.focus.forceWrapping"></a><a class="term" href="options.html#opt-wayland.windowManager.sway.config.focus.forceWrapping"><code class="option">wayland.windowManager.sway.config.focus.forceWrapping</code></a></span></dt><dd><p>Whether to force focus wrapping in tabbed or stacked container.
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-wayland.windowManager.sway.config.focus.forceWrapping"></a><a class="term" href="options.html#opt-wayland.windowManager.sway.config.focus.forceWrapping"><code class="option">wayland.windowManager.sway.config.focus.forceWrapping</code></a></span></dt><dd><p>Whether to force focus wrapping in tabbed or stacked containers.
 
-See <a class="link" href="https://i3wm.org/docs/userguide.html#_focus_wrapping" target="_top">https://i3wm.org/docs/userguide.html#_focus_wrapping</a></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>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/services/window-managers/i3-sway/sway.nix#blob-path" target="_top">
+This option is deprecated, use <code class="option">focus.wrapping</code> instead.</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>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/services/window-managers/i3-sway/sway.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/window-managers/i3-sway/sway.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-wayland.windowManager.sway.config.focus.mouseWarping"></a><a class="term" href="options.html#opt-wayland.windowManager.sway.config.focus.mouseWarping"><code class="option">wayland.windowManager.sway.config.focus.mouseWarping</code></a></span></dt><dd><p>Whether mouse cursor should be warped to the center of the window when switching focus
 to a window on a different output.</p><p><span class="emphasis"><em>Type:</em></span> boolean or one of "container", "output"</p><p><span class="emphasis"><em>Default:</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/services/window-managers/i3-sway/sway.nix#blob-path" target="_top">
@@ -9202,6 +9202,10 @@ to a window on a different output.</p><p><span class="emphasis"><em>Type:</em></
 
 See <a class="link" href="https://i3wm.org/docs/userguide.html#focus_on_window_activation" target="_top">https://i3wm.org/docs/userguide.html#focus_on_window_activation</a></p><p><span class="emphasis"><em>Type:</em></span> one of "smart", "urgent", "focus", "none"</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"smart"</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"none"</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/services/window-managers/i3-sway/sway.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/window-managers/i3-sway/sway.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-wayland.windowManager.sway.config.focus.wrapping"></a><a class="term" href="options.html#opt-wayland.windowManager.sway.config.focus.wrapping"><code class="option">wayland.windowManager.sway.config.focus.wrapping</code></a></span></dt><dd><p>Whether the window focus commands automatically wrap around the edge of containers.
+
+See <a class="link" href="https://i3wm.org/docs/userguide.html#_focus_wrapping" target="_top">https://i3wm.org/docs/userguide.html#_focus_wrapping</a></p><p><span class="emphasis"><em>Type:</em></span> one of "yes", "no", "force", "workspace"</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"no"</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/services/window-managers/i3-sway/sway.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/services/window-managers/i3-sway/sway.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-wayland.windowManager.sway.config.fonts"></a><a class="term" href="options.html#opt-wayland.windowManager.sway.config.fonts"><code class="option">wayland.windowManager.sway.config.fonts</code></a></span></dt><dd><p>Font configuration for window titles, nagbar...</p><p><span class="emphasis"><em>Type:</em></span> (list of string) or (submodule)</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">{
   names = [ "DejaVu Sans Mono" "FontAwesome5Free" ];
   style = "Bold Semi-Condensed";
@@ -10092,9 +10096,9 @@ This must to correspond to the value of the keybinding of the default workspace.
                     &lt;home-manager/modules/services/window-managers/i3-sway/i3.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xsession.windowManager.i3.config.focus.followMouse"></a><a class="term" href="options.html#opt-xsession.windowManager.i3.config.focus.followMouse"><code class="option">xsession.windowManager.i3.config.focus.followMouse</code></a></span></dt><dd><p>Whether focus should follow the mouse.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</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/services/window-managers/i3-sway/i3.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/window-managers/i3-sway/i3.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xsession.windowManager.i3.config.focus.forceWrapping"></a><a class="term" href="options.html#opt-xsession.windowManager.i3.config.focus.forceWrapping"><code class="option">xsession.windowManager.i3.config.focus.forceWrapping</code></a></span></dt><dd><p>Whether to force focus wrapping in tabbed or stacked container.
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xsession.windowManager.i3.config.focus.forceWrapping"></a><a class="term" href="options.html#opt-xsession.windowManager.i3.config.focus.forceWrapping"><code class="option">xsession.windowManager.i3.config.focus.forceWrapping</code></a></span></dt><dd><p>Whether to force focus wrapping in tabbed or stacked containers.
 
-See <a class="link" href="https://i3wm.org/docs/userguide.html#_focus_wrapping" target="_top">https://i3wm.org/docs/userguide.html#_focus_wrapping</a></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>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/services/window-managers/i3-sway/i3.nix#blob-path" target="_top">
+This option is deprecated, use <code class="option">focus.wrapping</code> instead.</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>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/services/window-managers/i3-sway/i3.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/window-managers/i3-sway/i3.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xsession.windowManager.i3.config.focus.mouseWarping"></a><a class="term" href="options.html#opt-xsession.windowManager.i3.config.focus.mouseWarping"><code class="option">xsession.windowManager.i3.config.focus.mouseWarping</code></a></span></dt><dd><p>Whether mouse cursor should be warped to the center of the window when switching focus
 to a window on a different output.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</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/services/window-managers/i3-sway/i3.nix#blob-path" target="_top">
@@ -10103,6 +10107,10 @@ to a window on a different output.</p><p><span class="emphasis"><em>Type:</em></
 
 See <a class="link" href="https://i3wm.org/docs/userguide.html#focus_on_window_activation" target="_top">https://i3wm.org/docs/userguide.html#focus_on_window_activation</a></p><p><span class="emphasis"><em>Type:</em></span> one of "smart", "urgent", "focus", "none"</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"smart"</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"none"</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/services/window-managers/i3-sway/i3.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/window-managers/i3-sway/i3.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xsession.windowManager.i3.config.focus.wrapping"></a><a class="term" href="options.html#opt-xsession.windowManager.i3.config.focus.wrapping"><code class="option">xsession.windowManager.i3.config.focus.wrapping</code></a></span></dt><dd><p>Whether the window focus commands automatically wrap around the edge of containers.
+
+See <a class="link" href="https://i3wm.org/docs/userguide.html#_focus_wrapping" target="_top">https://i3wm.org/docs/userguide.html#_focus_wrapping</a></p><p><span class="emphasis"><em>Type:</em></span> one of "yes", "no", "force", "workspace"</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"yes"</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/services/window-managers/i3-sway/i3.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/services/window-managers/i3-sway/i3.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xsession.windowManager.i3.config.fonts"></a><a class="term" href="options.html#opt-xsession.windowManager.i3.config.fonts"><code class="option">xsession.windowManager.i3.config.fonts</code></a></span></dt><dd><p>Font configuration for window titles, nagbar...</p><p><span class="emphasis"><em>Type:</em></span> (list of string) or (submodule)</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">{
   names = [ "DejaVu Sans Mono" "FontAwesome5Free" ];
   style = "Bold Semi-Condensed";