diff --git a/.config/nvim/lua/custom/plugins/leap.lua b/.config/nvim/lua/custom/plugins/leap.lua
index 7eae0c3..6d1eeeb 100644
--- a/.config/nvim/lua/custom/plugins/leap.lua
+++ b/.config/nvim/lua/custom/plugins/leap.lua
@@ -1,18 +1,15 @@
 return {
     'ggandor/leap.nvim',
+    lazy = false,
     dependencies = { 'tpope/vim-repeat' },
-    keys = {
-        { 's', '<Plug>(leap)', mode = { 'n', 'x', 'o' } },
-        { 'S', '<Plug>(leap-from-window)' },
-        {
-            'gs',
-            function()
-                require('leap.remote').action()
-            end,
-        },
-    },
     config = function()
         require('leap').opts.equivalence_classes = { ' \t\r\n', '([{', ')]}', '\'"`' }
         vim.api.nvim_set_hl(0, 'LeapBackdrop', { fg = '#777777' })
+
+        vim.keymap.set({ 'n', 'x' }, 's', '<Plug>(leap)')
+        vim.keymap.set('n', 'S', '<Plug>(leap-from-window)')
+        vim.keymap.set('n', 's', require('leap.remote').action)
+        vim.keymap.set('o', 'z', '<Plug>(leap-forward)')
+        vim.keymap.set('o', 'Z', '<Plug>(leap-backward)')
     end,
 }
diff --git a/.config/nvim/lua/custom/plugins/nvim-surround.lua b/.config/nvim/lua/custom/plugins/nvim-surround.lua
index 73fea73..54d8754 100644
--- a/.config/nvim/lua/custom/plugins/nvim-surround.lua
+++ b/.config/nvim/lua/custom/plugins/nvim-surround.lua
@@ -2,11 +2,11 @@ return {
     'kylechui/nvim-surround',
     version = '*',
     keys = {
-        { 'yS', '<Plug>(nvim-surround-normal)' },
-        { 'ySS', '<Plug>(nvim-surround-normal-cur)' },
-        { 'S', '<Plug>(nvim-surround-visual)', mode = 'v' },
-        { 'cS', '<Plug>(nvim-surround-change)' },
-        { 'dS', '<Plug>(nvim-surround-delete)' },
+        { 'ys' },
+        { 'yss' },
+        { 'S' },
+        { 'cs' },
+        { 'ds' },
         { '(', '<Plug>(nvim-surround-visual)(', mode = 'v' },
         { ')', '<Plug>(nvim-surround-visual))', mode = 'v' },
         { '{', '<Plug>(nvim-surround-visual){', mode = 'v' },
@@ -17,29 +17,5 @@ return {
         { '"', '<Plug>(nvim-surround-visual)"', mode = 'v' },
         { "'", "<Plug>(nvim-surround-visual)'", mode = 'v' },
     },
-    opts = {
-        keymaps = {
-            insert = false,
-            insert_line = false,
-            normal_line = false,
-            normal_cur_line = false,
-            visual_line = false,
-            normal = false,
-            normal_cur = false,
-            visual = false,
-            delete = false,
-            change = false,
-            change_line = false,
-        },
-        surrounds = {
-            ['('] = { add = { '(', ')' } },
-            [')'] = { add = { '( ', ' )' } },
-            ['{'] = { add = { '{', '}' } },
-            ['}'] = { add = { '{ ', ' }' } },
-            ['<'] = { add = { '<', '>' } },
-            ['>'] = { add = { '< ', ' >' } },
-            ['['] = { add = { '[', ']' } },
-            [']'] = { add = { '[ ', ' ]' } },
-        },
-    },
+    opts = {},
 }