diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua
new file mode 100644
index 0000000..10c1efc
--- /dev/null
+++ b/ftplugin/dart.lua
@@ -0,0 +1,4 @@
+vim.bo.tabstop = 2 -- size of a hard tabstop (ts).
+vim.bo.shiftwidth = 2 -- size of an indentation (sw).
+vim.bo.expandtab = true -- always uses spaces instead of tab characters (et).
+vim.bo.softtabstop = 2 -- number of spaces a <Tab> counts for. When 0, feature is off (sts).
diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua
index e057a64..cb5c680 100644
--- a/lua/user/cmp.lua
+++ b/lua/user/cmp.lua
@@ -111,7 +111,8 @@ cmp.setup {
   },
   sources = {
     { name = "nvim_lsp" },
-    -- { name = "luasnip" },
+    { name = "nvim_lsp_signature_help" },
+    { name = "luasnip" },
     { name = "buffer" },
     { name = "path" },
   },
diff --git a/lua/user/dap.lua b/lua/user/dap.lua
index fac8796..e961609 100644
--- a/lua/user/dap.lua
+++ b/lua/user/dap.lua
@@ -7,7 +7,7 @@ end
 
 dap.adapters.coreclr = {
   type = 'executable',
-  command = '/home/cuqmbr/.local/bin/netcoredbg/netcoredbg',
+  command = 'netcoredbg',
   args = {'--interpreter=vscode'}
 }
 
@@ -16,12 +16,39 @@ dap.configurations.cs = {
     type = "coreclr",
     name = "launch - netcoredbg",
     request = "launch",
+    env = {
+      ASPNETCORE_ENVIRONMENT = "Development",
+      DOTNET_ENVIRONMENT = "Development"
+    },
     program = function()
-        return vim.fn.input('Path to dll', vim.fn.getcwd(), 'file')
+        return vim.fn.input('Path to dll ', vim.fn.getcwd(), 'file')
     end,
+    cwd = "${workspaceFolder}/ShoppingAssistantApi.Api",
   },
 }
 
+-- Flutter on Dart
+
+dap.adapters.dart = {
+  type = "executable",
+  command = "flutter",
+  -- This command was introduced upstream in https://github.com/dart-lang/sdk/commit/b68ccc9a
+  args = {"debug_adapter"}
+}
+
+dap.configurations.dart = {
+  {
+    type = "dart",
+    request = "launch",
+    name = "Launch Flutter Program",
+    -- The nvim-dap plugin populates this variable with the filename of the current buffer
+    program = "${file}",
+    -- The nvim-dap plugin populates this variable with the editor's current working directory
+    cwd = "${workspaceFolder}",
+    -- toolArgs = {"-d", "linux"}, -- Note for Dart apps this is args, for Flutter apps toolArgs
+  }
+}
+
 -- DapUI
 
 local dapui_status_ok, dapui = pcall(require, "dapui")
diff --git a/lua/user/indentline.lua b/lua/user/indentline.lua
index fdf5870..370dbcc 100644
--- a/lua/user/indentline.lua
+++ b/lua/user/indentline.lua
@@ -1,4 +1,4 @@
-local status_ok, indent_blankline = pcall(require, "indent_blankline")
+local status_ok, indent_blankline = pcall(require, "ibl")
 if not status_ok then
 	return
 end
@@ -60,7 +60,7 @@ vim.wo.colorcolumn = "99999"
 indent_blankline.setup({
 	-- show_end_of_line = true,
 	-- space_char_blankline = " ",
-	show_current_context = true,
+	-- show_current_context = true,
 	-- show_current_context_start = true,
 	-- char_highlight_list = {
 	--   "IndentBlanklineIndent1",
diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua
index f39836d..d88eaea 100644
--- a/lua/user/lsp/handlers.lua
+++ b/lua/user/lsp/handlers.lua
@@ -8,6 +8,7 @@ end
 M.capabilities = vim.lsp.protocol.make_client_capabilities()
 M.capabilities.textDocument.completion.completionItem.snippetSupport = true
 M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities)
+M.capabilities.offsetEncoding = 'utf-16'
 
 M.setup = function()
 	local signs = {
diff --git a/lua/user/lsp/mason.lua b/lua/user/lsp/mason.lua
index b47c2bc..551b2cc 100644
--- a/lua/user/lsp/mason.lua
+++ b/lua/user/lsp/mason.lua
@@ -1,6 +1,10 @@
 local servers = {
 	"lua_ls",
 	"omnisharp",
+  "bashls",
+  "jdtls",
+  "clangd",
+  "dartls",
 }
 
 local settings = {
diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua
index d32571a..8f3e432 100644
--- a/lua/user/lsp/null-ls.lua
+++ b/lua/user/lsp/null-ls.lua
@@ -1,20 +1,20 @@
-local null_ls_status_ok, null_ls = pcall(require, "null-ls")
-if not null_ls_status_ok then
-	return
-end
-
--- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting
-local formatting = null_ls.builtins.formatting
--- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
-local diagnostics = null_ls.builtins.diagnostics
-
-null_ls.setup({
-	debug = false,
-	sources = {
-		-- formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }),
-		-- formatting.black.with({ extra_args = { "--fast" } }),
-		-- formatting.stylua,
-    -- diagnostics.flake8
-    formatting.astyle
-	},
-})
+-- local null_ls_status_ok, null_ls = pcall(require, "null-ls")
+-- if not null_ls_status_ok then
+-- 	return
+-- end
+--
+-- -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting
+-- local formatting = null_ls.builtins.formatting
+-- -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
+-- local diagnostics = null_ls.builtins.diagnostics
+--
+-- null_ls.setup({
+-- 	debug = false,
+-- 	sources = {
+-- 		-- formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }),
+-- 		-- formatting.black.with({ extra_args = { "--fast" } }),
+-- 		-- formatting.stylua,
+--     -- diagnostics.flake8
+--     formatting.astyle
+-- 	},
+-- })
diff --git a/lua/user/lsp/settings/clangd.lua b/lua/user/lsp/settings/clangd.lua
new file mode 100644
index 0000000..04220c4
--- /dev/null
+++ b/lua/user/lsp/settings/clangd.lua
@@ -0,0 +1,3 @@
+return {
+  
+}
diff --git a/lua/user/lsp/settings/dartls.lua b/lua/user/lsp/settings/dartls.lua
new file mode 100644
index 0000000..282648a
--- /dev/null
+++ b/lua/user/lsp/settings/dartls.lua
@@ -0,0 +1,3 @@
+return {
+  cmd = { "dart", 'language-server', '--protocol=lsp' },
+}
diff --git a/lua/user/lsp/settings/jdtls.lua b/lua/user/lsp/settings/jdtls.lua
new file mode 100644
index 0000000..eb553d4
--- /dev/null
+++ b/lua/user/lsp/settings/jdtls.lua
@@ -0,0 +1,3 @@
+return {
+  root_dir = vim.loop.cwd,
+}
diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua
index e0bffac..c55ae65 100644
--- a/lua/user/nvim-tree.lua
+++ b/lua/user/nvim-tree.lua
@@ -3,13 +3,6 @@ if not status_ok then
   return
 end
 
-local config_status_ok, nvim_tree_config = pcall(require, "nvim-tree.config")
-if not config_status_ok then
-  return
-end
-
-local tree_cb = nvim_tree_config.nvim_tree_callback
-
 -- https://github.com/nvim-tree/nvim-tree.lua/wiki/Migrating-To-on_attach for assistance in migrating.
 local function on_attach(bufnr)
   local api = require('nvim-tree.api')
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index ea953e3..b1cf9ab 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -42,7 +42,7 @@ return packer.startup(function(use)
   use "nvim-lua/plenary.nvim" -- Useful lua functions used by lots of plugins
   use "windwp/nvim-autopairs" -- Autopairs, integrates with both cmp and treesitter
   use "numToStr/Comment.nvim"
-  use "kyazdani42/nvim-tree.lua"
+  use "nvim-tree/nvim-tree.lua"
   use "akinsho/bufferline.nvim"
 	use "moll/vim-bbye"
   use { "nvim-lualine/lualine.nvim", requires = { "nvim-tree/nvim-web-devicons" } }
@@ -63,10 +63,13 @@ return packer.startup(function(use)
   use "hrsh7th/nvim-cmp" -- The completion plugin
   use "hrsh7th/cmp-buffer" -- buffer completions
   use "hrsh7th/cmp-path" -- path completions
-	use "saadparwaiz1/cmp_luasnip" -- snippet completions
+  -- use "hrsh7th/cmp-cmdline"
 	use "hrsh7th/cmp-nvim-lsp"
+  use "hrsh7th/cmp-nvim-lsp-signature-help"
+  use "saadparwaiz1/cmp_luasnip" -- snippet completions
 	use "hrsh7th/cmp-nvim-lua"
 
+
 	-- Snippets
   use "L3MON4D3/LuaSnip" --snippet engine
   use "rafamadriz/friendly-snippets" -- a bunch of snippets to use
@@ -90,6 +93,10 @@ return packer.startup(function(use)
 	-- Git
 	use "lewis6991/gitsigns.nvim"
 
+  -- Flutter
+  -- use "neoclide/coc.nvim"
+  -- use "iamcco/coc-flutter"
+
 	-- Automatically set up your configuration after cloning packer.nvim
 	-- Put this at the end after all plugins
 	if packer_bootstrap then
diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua
index 0f28e2f..5c071d6 100644
--- a/lua/user/treesitter.lua
+++ b/lua/user/treesitter.lua
@@ -4,8 +4,9 @@ if not status_ok then
 end
 
 configs.setup {
-  -- ensure_installed = { "maintained" }, -- put the language you want in this array
-  -- ensure_installed = "c_sharp", -- one of "all" or a list of languages
+  modules = { "" },
+  auto_install = false,
+  ensure_installed = { "" }, -- put the language you want in this array
   ignore_install = { "" }, -- List of parsers to ignore installing
   sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
   highlight = {