diff --git a/modules/nvim.lua b/modules/nvim.lua
index b4142cd..0cc8a03 100644
--- a/modules/nvim.lua
+++ b/modules/nvim.lua
@@ -48,6 +48,8 @@ local start_plugins = {
   ["copilot-cmp"] = { url = "https://github.com/zbirenbaum/copilot-cmp.git" },
   ["oil.nvim"] = { url = "https://github.com/stevearc/oil.nvim.git" },
   ["neoformat"] = { url = "https://github.com/sbdchd/neoformat" },
+  ["csharpls-extended-lsp"] = { url = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim" },
+  ["Ionide-vim"] = { url = "https://github.com/ionide/Ionide-vim" },
 }
 
 local opt_plugins = {
diff --git a/site-modules/core/files/vim/init.vim b/site-modules/core/files/vim/init.vim
index 53cade4..434659e 100644
--- a/site-modules/core/files/vim/init.vim
+++ b/site-modules/core/files/vim/init.vim
@@ -82,6 +82,8 @@ noremap <leader>; gcc
 inoremap jj <esc>:w<cr>
 nnoremap <leader><tab> <c-^>
 
+let g:fsharp#lsp_auto_setup = 0
+
 
 " Add mapping to "Run" tasks from the taskfile
 "
diff --git a/site-modules/core/files/vim/plugin/lsp.lua b/site-modules/core/files/vim/plugin/lsp.lua
index 2fa4cc6..444c248 100644
--- a/site-modules/core/files/vim/plugin/lsp.lua
+++ b/site-modules/core/files/vim/plugin/lsp.lua
@@ -35,6 +35,12 @@ local servers = {
       },
     },
   },
+  csharp_ls = {
+    handlers = {
+      ["textDocument/definition"] = require("csharpls_extended").handler,
+      ["textDocument/typeDefinition"] = require("csharpls_extended").handler,
+    },
+  },
 }
 
 local on_attach = function(_, bufnr)
@@ -89,6 +95,8 @@ for lsp, config in pairs(servers) do
   lspconfig[lsp].setup(config)
 end
 
+require("ionide").setup({ on_attach = on_attach, capabilities = capabilities })
+
 -- Change the diagnostic signs
 vim.fn.sign_define("DiagnosticSignHint", { text = "➤", texthl = "DiagnosticSignHint", numhl = "DiagnosticSignHint" })
 vim.fn.sign_define("DiagnosticSignInfo", { text = "ℹ", texthl = "DiagnosticSignInfo", numhl = "DiagnosticSignInfo" })