diff --git a/init.lua b/init.lua
index 93d8d730..2f4ac252 100644
--- a/init.lua
+++ b/init.lua
@@ -716,12 +716,7 @@ require('lazy').setup({
       --  - settings (table): Override the default settings passed when initializing the server.
       --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
       local servers = {
-        clangd = {},
-        gopls = {},
         pyright = {},
-        rust_analyzer = {},
-        jdtls = {},
-        svelte = {},
         marksman = {},
         -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
         --
diff --git a/lua/custom/plugins/catppuccin.lua b/lua/custom/plugins/catppuccin.lua
new file mode 100644
index 00000000..589901a7
--- /dev/null
+++ b/lua/custom/plugins/catppuccin.lua
@@ -0,0 +1,25 @@
+return {
+  'catppuccin/nvim',
+  name = 'catppuccin',
+  priority = 1000,
+  config = function()
+    require('catppuccin').setup {
+      flavour = 'mocha',
+      integrations = {
+        telescope = true,
+        treesitter = true,
+        cmp = true,
+        gitsigns = true,
+      },
+      custom_highlights = function(colors)
+        return {
+          LineNr = { fg = colors.mauve },
+          CursorLineNr = { fg = colors.lavender, bold = true },
+          Visual = { bg = colors.surface1 },
+          TelescopeSelection = { bg = colors.surface1 },
+        }
+      end,
+    }
+    vim.cmd.colorscheme 'catppuccin'
+  end,
+}
diff --git a/lua/custom/plugins/firenvim.lua b/lua/custom/plugins/firenvim.lua
new file mode 100644
index 00000000..78d03e49
--- /dev/null
+++ b/lua/custom/plugins/firenvim.lua
@@ -0,0 +1 @@
+return { 'glacambre/firenvim', build = ':call firenvim#install(0)' }
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 14264423..4cc6ac84 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -10,48 +10,10 @@ vim.opt.wrap = false
 vim.keymap.set('n', '<C-k>', '15k', { desc = 'Scroll up and center' })
 vim.keymap.set('n', '<C-j>', '15j', { desc = 'Scroll down and center' })
 vim.keymap.set('n', '<C-c>', 'ggVGy', { desc = 'Copy file' })
-vim.keymap.set('n', '<leader>e', ':Explore<CR>', { desc = 'Open explorer' })
+vim.keymap.set('n', '<leader>e', ':Neotree<CR>', { noremap = true, silent = true })
+-- vim.keymap.set('n', '<leader>e', ':Explore<CR>', { desc = 'Open explorer' })
 
 return {
-  {
-    'catppuccin/nvim',
-    name = 'catppuccin',
-    priority = 1000,
-    config = function()
-      require('catppuccin').setup {
-        flavour = 'mocha',
-        integrations = {
-          telescope = true,
-          treesitter = true,
-          cmp = true,
-          gitsigns = true,
-        },
-        custom_highlights = function(colors)
-          return {
-            LineNr = { fg = colors.mauve },
-            CursorLineNr = { fg = colors.lavender, bold = true },
-            Visual = { bg = colors.surface1 },
-            TelescopeSelection = { bg = colors.surface1 },
-          }
-        end,
-      }
-      vim.cmd.colorscheme 'catppuccin'
-    end,
-  },
-
-  {
-    -- Set lualine as statusline
-    'nvim-lualine/lualine.nvim',
-    -- See `:help lualine.txt`
-    opts = {
-      options = {
-        icons_enabled = false,
-        component_separators = '|',
-        section_separators = '',
-      },
-    },
-  },
-
   {
     'NeogitOrg/neogit',
     dependencies = {
@@ -62,14 +24,9 @@ return {
     },
     config = function()
       local neogit = require 'neogit'
-
       vim.keymap.set('n', '<leader>gg', neogit.open, { desc = 'Open Neogit' })
-
       neogit.setup {}
     end,
   },
-
-  {
-    'mfussenegger/nvim-jdtls',
-  },
 }
+
diff --git a/lua/custom/plugins/lualline.lua b/lua/custom/plugins/lualline.lua
new file mode 100644
index 00000000..8b7f1f53
--- /dev/null
+++ b/lua/custom/plugins/lualline.lua
@@ -0,0 +1,12 @@
+return {
+  -- Set lualine as statusline
+  'nvim-lualine/lualine.nvim',
+  -- See `:help lualine.txt`
+  opts = {
+    options = {
+      icons_enabled = false,
+      component_separators = '|',
+      section_separators = '',
+    },
+  },
+}
diff --git a/lua/custom/plugins/nvim-tree.lua b/lua/custom/plugins/nvim-tree.lua
new file mode 100644
index 00000000..2e719982
--- /dev/null
+++ b/lua/custom/plugins/nvim-tree.lua
@@ -0,0 +1,9 @@
+return {
+  'nvim-tree/nvim-tree.lua',
+  dependencies = {
+    'nvim-tree/nvim-web-devicons',
+  },
+  config = function()
+    require('nvim-tree').setup {}
+  end,
+}