diff --git a/init.lua b/init.lua
index 292ec077..28d534d6 100644
--- a/init.lua
+++ b/init.lua
@@ -315,7 +315,7 @@ require('lazy').setup {
       -- Useful for getting pretty icons, but requires special font.
       --  If you already have a Nerd Font, or terminal set up with fallback fonts
       --  you can enable this
-      -- { 'nvim-tree/nvim-web-devicons' }
+      { 'nvim-tree/nvim-web-devicons' },
     },
     config = function()
       -- Telescope is a fuzzy finder that comes with a lot of different things that
@@ -531,7 +531,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 = {},
+        csharp_ls = {}, -- clangd = {},
         -- gopls = {},
         -- pyright = {},
         -- rust_analyzer = {},
@@ -814,7 +814,8 @@ require('lazy').setup {
   --
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
   --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
-  -- { import = 'custom.plugins' },
+  { import = 'custom.plugins' },
+  vim.keymap.set('n', '<C-b>', ':Neotree toggle last<CR>', { noremap = true, silent = true, desc = 'Toggle neotree' }),
 }
 
 -- The line beneath this is called `modeline`. See `:help modeline`
diff --git a/lua/custom/plugins/autopairs.lua b/lua/custom/plugins/autopairs.lua
new file mode 100644
index 00000000..6a9e751e
--- /dev/null
+++ b/lua/custom/plugins/autopairs.lua
@@ -0,0 +1,14 @@
+-- File: lua/custom/plugins/autopairs.lua
+
+return {
+  'windwp/nvim-autopairs',
+  -- Optional dependency
+  dependencies = { 'hrsh7th/nvim-cmp' },
+  config = function()
+    require('nvim-autopairs').setup {}
+    -- If you want to automatically add `(` after selecting a function or method
+    local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
+    local cmp = require 'cmp'
+    cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+  end,
+}
diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua
new file mode 100644
index 00000000..bec15faa
--- /dev/null
+++ b/lua/custom/plugins/filetree.lua
@@ -0,0 +1,15 @@
+-- Unless you are still migrating, remove the deprecated commands from v1.x
+vim.cmd [[ let g:neo_tree_remove_legacy_commands = 1 ]]
+
+return {
+  'nvim-neo-tree/neo-tree.nvim',
+  version = '*',
+  dependencies = {
+    'nvim-lua/plenary.nvim',
+    'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
+    'MunifTanjim/nui.nvim',
+  },
+  config = function()
+    require('neo-tree').setup {}
+  end,
+}
diff --git a/lua/custom/plugins/neotest-dotnet.lua b/lua/custom/plugins/neotest-dotnet.lua
new file mode 100644
index 00000000..f7be06c1
--- /dev/null
+++ b/lua/custom/plugins/neotest-dotnet.lua
@@ -0,0 +1,14 @@
+return {
+  'nvim-neotest/neotest',
+  dependencies = {
+    'Issafalcon/neotest-dotnet',
+  },
+  config = function()
+    require('neotest').setup {
+      adapters = {
+        require 'neotest-dotnet',
+      },
+      discovery_root = 'solution',
+    }
+  end,
+}
diff --git a/lua/custom/plugins/neotest.lua b/lua/custom/plugins/neotest.lua
new file mode 100644
index 00000000..ef5a1dcf
--- /dev/null
+++ b/lua/custom/plugins/neotest.lua
@@ -0,0 +1,19 @@
+return {
+  'nvim-neotest/neotest',
+  dependencies = {
+    'nvim-lua/plenary.nvim',
+    'antoinemadec/FixCursorHold.nvim',
+    'nvim-treesitter/nvim-treesitter',
+  },
+  config = function()
+    require('neotest').setup {
+      adapters = {
+        require 'neotest-dotnet' {
+          dap = { justMyCode = false },
+        },
+        require 'neotest-plenary',
+      },
+    }
+  end,
+  vim.keymap.set('n', 'ts', ':Neotest run suite=true<CR> :Neotest summary open<CR>', {}),
+}