diff --git a/options.html b/options.html
index f380f7f2..9b73af11 100644
--- a/options.html
+++ b/options.html
@@ -1101,7 +1101,7 @@ This is a python package with debugpy installed, see https://nixos.wiki/wiki/Pyt
                     <neovim-flake/modules/lsp/lspsaga/lspsaga.nix>
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.lsp.lspsaga.mappings.showLineDiagnostics"></a><a class="link" href="options.html#opt-vim.lsp.lspsaga.mappings.showLineDiagnostics"><code class="option">vim.lsp.lspsaga.mappings.showLineDiagnostics</code></a></span></dt><dd><p>Show line diagnostics [LSPSaga]</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"&lt;leader&gt;ll"</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/notashelf/neovim-flake/blob/main/modules/lsp/lspsaga/lspsaga.nix#blob-path" target="_top">
                     &lt;neovim-flake/modules/lsp/lspsaga/lspsaga.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.lsp.lspsaga.mappings.signatureHelp"></a><a class="link" href="options.html#opt-vim.lsp.lspsaga.mappings.signatureHelp"><code class="option">vim.lsp.lspsaga.mappings.signatureHelp</code></a></span></dt><dd><p>Signature help [LSPSaga]</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"&lt;ledaer&gt;ls"</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/notashelf/neovim-flake/blob/main/modules/lsp/lspsaga/lspsaga.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.lsp.lspsaga.mappings.signatureHelp"></a><a class="link" href="options.html#opt-vim.lsp.lspsaga.mappings.signatureHelp"><code class="option">vim.lsp.lspsaga.mappings.signatureHelp</code></a></span></dt><dd><p>Signature help [LSPSaga]</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"&lt;leader&gt;ls"</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/notashelf/neovim-flake/blob/main/modules/lsp/lspsaga/lspsaga.nix#blob-path" target="_top">
                     &lt;neovim-flake/modules/lsp/lspsaga/lspsaga.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.lsp.lspsaga.mappings.smartScrollDown"></a><a class="link" href="options.html#opt-vim.lsp.lspsaga.mappings.smartScrollDown"><code class="option">vim.lsp.lspsaga.mappings.smartScrollDown</code></a></span></dt><dd><p>Smart scroll up [LSPSaga]</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"&lt;C-b&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/notashelf/neovim-flake/blob/main/modules/lsp/lspsaga/lspsaga.nix#blob-path" target="_top">
                     &lt;neovim-flake/modules/lsp/lspsaga/lspsaga.nix&gt;
@@ -2114,7 +2114,29 @@ use the <code class="literal">vim.language.&lt;lang&gt;.treesitter</code> option
                     &lt;neovim-flake/modules/utility/motion/leap/leap.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.motion.leap.mappings.leapFromWindow"></a><a class="link" href="options.html#opt-vim.utility.motion.leap.mappings.leapFromWindow"><code class="option">vim.utility.motion.leap.mappings.leapFromWindow</code></a></span></dt><dd><p>Leap from window</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gs"</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/notashelf/neovim-flake/blob/main/modules/utility/motion/leap/leap.nix#blob-path" target="_top">
                     &lt;neovim-flake/modules/utility/motion/leap/leap.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.enable"></a><a class="link" href="options.html#opt-vim.utility.surround.enable"><code class="option">vim.utility.surround.enable</code></a></span></dt><dd><p>Whether to enable nvim-surround: add/change/delete surrounding delimiter pairs with ease.</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.enable"></a><a class="link" href="options.html#opt-vim.utility.surround.enable"><code class="option">vim.utility.surround.enable</code></a></span></dt><dd><p>nvim-surround: add/change/delete surrounding delimiter pairs with ease. Note that the default mappings deviate from upstreeam to avoid conflicts with nvim-leap.</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.change"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.change"><code class="option">vim.utility.surround.mappings.change</code></a></span></dt><dd><p>Change surrounding character</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gzr"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.delete"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.delete"><code class="option">vim.utility.surround.mappings.delete</code></a></span></dt><dd><p>Delete surrounding character</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gzd"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.insert"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.insert"><code class="option">vim.utility.surround.mappings.insert</code></a></span></dt><dd><p>Add surround character around the cursor</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"&lt;C-g&gt;z"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.insertLine"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.insertLine"><code class="option">vim.utility.surround.mappings.insertLine</code></a></span></dt><dd><p>Add surround character around the cursor on new lines</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"&lt;C-g&gt;Z"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.normal"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.normal"><code class="option">vim.utility.surround.mappings.normal</code></a></span></dt><dd><p>Surround motion with character</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gz"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.normalCur"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.normalCur"><code class="option">vim.utility.surround.mappings.normalCur</code></a></span></dt><dd><p>Surround motion with character on new lines</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gZ"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.normalCurLine"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.normalCurLine"><code class="option">vim.utility.surround.mappings.normalCurLine</code></a></span></dt><dd><p>Surround line with character on new lines</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gZZ"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.normalLine"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.normalLine"><code class="option">vim.utility.surround.mappings.normalLine</code></a></span></dt><dd><p>Surround line with character</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gzz"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.visual"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.visual"><code class="option">vim.utility.surround.mappings.visual</code></a></span></dt><dd><p>Surround selection with character</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gz"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.mappings.visualLine"></a><a class="link" href="options.html#opt-vim.utility.surround.mappings.visualLine"><code class="option">vim.utility.surround.mappings.visualLine</code></a></span></dt><dd><p>Surround selection with character on new lines</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"gZ"</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
+                    &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.surround.useVendoredKeybindings"></a><a class="link" href="options.html#opt-vim.utility.surround.useVendoredKeybindings"><code class="option">vim.utility.surround.useVendoredKeybindings</code></a></span></dt><dd><p>Use alternative set of keybindings that avoids conflicts with other popular plugins, e.g. nvim-leap</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/notashelf/neovim-flake/blob/main/modules/utility/surround/surround.nix#blob-path" target="_top">
                     &lt;neovim-flake/modules/utility/surround/surround.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-vim.utility.vim-wakatime.enable"></a><a class="link" href="options.html#opt-vim.utility.vim-wakatime.enable"><code class="option">vim.utility.vim-wakatime.enable</code></a></span></dt><dd><p>Whether to enable vim-wakatime: live code statistics.</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/notashelf/neovim-flake/blob/main/modules/utility/wakatime/vim-wakatime.nix#blob-path" target="_top">
                     &lt;neovim-flake/modules/utility/wakatime/vim-wakatime.nix&gt;
diff --git a/release-notes.html b/release-notes.html
index 883134c1..472a0d9d 100644
--- a/release-notes.html
+++ b/release-notes.html
@@ -223,4 +223,6 @@ Fixed scrollOffset not being used
 Updated clangd to 16
 </li><li class="listitem">
 Disabled <code class="literal">useSystemClipboard</code> by default
+</li></ul></div><p><a class="link" href="https://github.com/ksonj" target="_top">ksonj</a>:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+Add support to change mappings to utility/surround
 </li></ul></div></div></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="options.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Appendix A. Configuration Options </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
\ No newline at end of file