diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index f636e40..157f036 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -86,8 +86,8 @@ au VimLeave * set guicursor=a:ver100
 " Use Bash as shell for internal Vim commands (fish is slow)
 set shell=/bin/bash
 
-" Load plugins from separate file
-lua require("plugins")
-
 " Load default Coc config from separate file
 lua require("coc-defaults")
+
+" Load plugins from separate file
+lua require("plugins")
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 25a2312..b1994bd 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -6,7 +6,7 @@
   "copilot.vim": { "branch": "release", "commit": "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b" },
   "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" },
   "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" },
-  "lazy.nvim": { "branch": "main", "commit": "887eb75591520a01548134c4623617b639289d0b" },
+  "lazy.nvim": { "branch": "main", "commit": "690f9e88e2a7dc92bcb0cca85f778a3e99fe1f7e" },
   "leap.nvim": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" },
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
   "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" },
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 64f9edb..75c1780 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -17,7 +17,6 @@ require("lazy").setup({
   -- Color scheme
   {
     "sonph/onehalf",
-    lazy = false,
     priority = 1000,
     config = function(plugin)
       vim.opt.rtp:append(plugin.dir .. "/vim")
@@ -54,14 +53,13 @@ require("lazy").setup({
     end
   },
 
-  -- Enable dot repeat for plugins
-  {
-    "tpope/vim-repeat",
-  },
-
   -- Add two-character motions with s and S
   {
     "ggandor/leap.nvim",
+    keys = "s",
+    dependencies = {
+      "tpope/vim-repeat",
+    },
     config = function()
       require('leap').add_default_mappings()
     end
@@ -82,6 +80,9 @@ require("lazy").setup({
   -- Easy handling of surroundings
   {
     "tpope/vim-surround",
+    dependencies = {
+      "tpope/vim-repeat",
+    },
   },
 
   -- GitHub Copilot
@@ -138,17 +139,19 @@ require("lazy").setup({
       "nvim-lua/plenary.nvim",
       {"nvim-telescope/telescope-fzf-native.nvim", build = "make"},
     },
+    keys = {
+      {"<leader>p", "<cmd>Telescope find_files<CR>", noremap = true, silent = true},
+      {"<leader>f", "<cmd>Telescope live_grep<CR>", noremap = true, silent = true},
+      {"<leader>b", "<cmd>Telescope buffers<CR>", noremap = true, silent = true},
+      {"<leader>o", "<cmd>Telescope oldfiles<CR>", noremap = true, silent = true},
+      {"<leader>t", "<cmd>Telescope tags<CR>", noremap = true, silent = true},
+      {"<leader>:", "<cmd>Telescope commands<CR>", noremap = true, silent = true},
+      {"<leader>d", "<cmd>Telescope git_status<CR>", noremap = true, silent = true},
+      {"<leader><leader>", "<cmd>Telescope resume<CR>", noremap = true, silent = true},
+    },
     config = function()
       require("telescope").setup{}
       require("telescope").load_extension("fzf")
-      vim.keymap.set("n", "<leader>p", ":Telescope find_files<CR>", { noremap = true, silent = true })
-      vim.keymap.set("n", "<leader>f", ":Telescope live_grep<CR>", { noremap = true, silent = true })
-      vim.keymap.set("n", "<leader>b", ":Telescope buffers<CR>", { noremap = true, silent = true })
-      vim.keymap.set("n", "<leader>o", ":Telescope oldfiles<CR>", { noremap = true, silent = true })
-      vim.keymap.set("n", "<leader>t", ":Telescope tags<CR>", { noremap = true, silent = true })
-      vim.keymap.set("n", "<leader>:", ":Telescope commands<CR>", { noremap = true, silent = true })
-      vim.keymap.set("n", "<leader>d", ":Telescope git_status<CR>", { noremap = true, silent = true })
-      vim.keymap.set("n", "<leader><leader>", ":Telescope resume<CR>", { noremap = true, silent = true })
     end,
   },
 
@@ -171,6 +174,10 @@ require("lazy").setup({
   -- Run code with a keybinding
   {
     "CRAG666/code_runner.nvim",
+    cmd = "RunCode",
+    dependencies = {
+      "akinsho/nvim-toggleterm.lua"
+    },
     opts = {
       mode = "toggleterm",
       filetype = {