diff --git a/nvim/.config/nvim/lua/mappings.lua b/nvim/.config/nvim/lua/mappings.lua
index b47583d..f690bf0 100644
--- a/nvim/.config/nvim/lua/mappings.lua
+++ b/nvim/.config/nvim/lua/mappings.lua
@@ -105,4 +105,4 @@ map("v", "g<C-x>", require("dial.map").dec_gvisual(), N)
 
 -- My plugins
 -- runfile
-map('n', '<leader><leader>r', '<cmd>lua require("runfile").run()<CR>', N)
+map('n', '<leader>x', '<cmd>lua require("runfile").run()<CR>', N)
diff --git a/nvim/.config/nvim/lua/plugins/plugins.lua b/nvim/.config/nvim/lua/plugins/plugins.lua
index 4ed9ade..2cda252 100644
--- a/nvim/.config/nvim/lua/plugins/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins/plugins.lua
@@ -24,10 +24,6 @@ return packer.startup(function(use)
     }
 
     -- Completion
-    use 'onsails/lspkind-nvim'
-    use 'ray-x/lsp_signature.nvim'
-    use 'honza/vim-snippets'
-
     use {
         'hrsh7th/nvim-cmp',
         config = [[
@@ -35,6 +31,9 @@ return packer.startup(function(use)
         require('plugins.config.snippets')
         ]],
         requires = {
+            { 'onsails/lspkind-nvim' },
+            { 'ray-x/lsp_signature.nvim' },
+            { 'honza/vim-snippets' },
             { 'L3MON4D3/LuaSnip' },
             { 'hrsh7th/cmp-buffer' },
             { 'hrsh7th/cmp-calc' },
@@ -58,18 +57,17 @@ return packer.startup(function(use)
         config = [[require('plugins.config.null-ls')]]
     }
 
-    use {
-        'windwp/nvim-autopairs',
-        after = 'nvim-cmp',
-        config = [[require('plugins.config.nvim-autopairs')]],
-    }
-
     -- Editing
     use "tpope/vim-repeat"
     use {
         'ur4ltz/surround.nvim',
         config = [[require "surround".setup {mappings_style = "surround", map_insert_mode = false}]]
     }
+    use {
+        'windwp/nvim-autopairs',
+        after = 'nvim-cmp',
+        config = [[require('plugins.config.nvim-autopairs')]],
+    }
     use 'wellle/targets.vim'
     use 'ggandor/lightspeed.nvim'
     use { 'mattn/emmet-vim', ft = { 'html', 'css', 'htmldjango', 'twig', 'php' } }
@@ -122,7 +120,7 @@ return packer.startup(function(use)
     use 'mhartington/oceanic-next'
 
     -- my dev plugins
-    use {'~/.config/nvim/lua/plugins_dev/runfile.nvim', config = [[require('plugins.config.runfile')]]}
+    use { '~/.config/nvim/lua/plugins_dev/runfile.nvim', config = [[require('plugins.config.runfile')]] }
 
 
     -- TEST ZONE