diff --git a/git/.gitconfig b/git/.gitconfig
index 01dcae8..9685735 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -37,9 +37,11 @@
     po = push origin
 [core]
 	autocrlf = false
-
+[icdiff]
+	options = --highlight --line-numbers
 [merge]
     tool = "nvim"
-
 [mergetool "nvim"]
 	cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
+[diff]
+	tool = icdiff
diff --git a/vim/.vim/lua/plugins/formatter.lua b/vim/.vim/lua/plugins/formatter.lua
index 69ff186..3fb83c2 100644
--- a/vim/.vim/lua/plugins/formatter.lua
+++ b/vim/.vim/lua/plugins/formatter.lua
@@ -3,6 +3,12 @@ return {
 	config = function()
 		-- Utilities for creating configurations
 		local util = require("formatter.util")
+		vim.cmd([[
+		augroup FormatAutogroup
+            autocmd!
+            autocmd BufWritePost * FormatWrite
+        augroup END
+        ]])
 
 		-- Provides the Format, FormatWrite, FormatLock, and FormatWriteLock commands
 		require("formatter").setup({
@@ -44,27 +50,34 @@ return {
 				html = {
 					require("formatter.defaults").prettier,
 				},
-				-- xml = {
-				--     function()
-				--         return {
-				--             exe = "tidy",
-				--             args = {
-				--                 "-quiet",
-				--                 "-xml",
-				--                 "--wrap yes",
-				--                 "--indent yes",
-				--                 "--indent-spaces 2",
-				--                 "--indent-attributes yes",
-				--                 "--sort-attributes alpha",
-				--                 "--wrap-attributes yes",
-				--                 "--vertical-space yes",
-				--                 "--tidy-mark no",
-				--             },
-				--             stdin = true,
-				--             try_node_modules = true,
-				--         }
-				--     end,
-				-- },
+				xml = {
+					function()
+						return {
+							exe = "tidy",
+							args = {
+								"-xml",
+								"-quiet",
+								"-wrap",
+								"--tidy-mark",
+								"no",
+								"--indent",
+								"yes",
+								"--indent-spaces",
+								"2",
+								"--indent-attributes",
+								"yes",
+								"--sort-attributes",
+								"alpha",
+								"--wrap-attributes",
+								"yes",
+								"--vertical-space",
+								"yes",
+								"-",
+							},
+							stdin = true,
+						}
+					end,
+				},
 				-- java = {
 				--     function()
 				--         return {
diff --git a/vim/.vim/lua/plugins/formatting.lua b/vim/.vim/lua/plugins/formatting.lua
deleted file mode 100644
index 1bde10e..0000000
--- a/vim/.vim/lua/plugins/formatting.lua
+++ /dev/null
@@ -1,67 +0,0 @@
-return {
-	"mhartington/formatter.nvim",
-	config = function()
-		-- Utilities for creating configurations
-		local util = require("formatter.util")
-		vim.cmd([[
-		augroup FormatAutogroup
-            autocmd!
-            autocmd BufWritePost * FormatWrite
-        augroup END
-        ]])
-
-		-- Provides the Format, FormatWrite, FormatLock, and FormatWriteLock commands
-		require("formatter").setup({
-			-- Enable or disable logging
-			logging = true,
-			-- Set the log level
-			log_level = vim.log.levels.WARN,
-			-- All formatter configurations are opt-in
-			filetype = {
-				-- Formatter configurations for filetype "lua" go here
-				-- and will be executed in order
-				lua = {
-					-- "formatter.filetypes.lua" defines default configurations for the
-					-- "lua" filetype
-					require("formatter.filetypes.lua").stylua,
-				},
-				xml = {
-					function()
-						return {
-							exe = "tidy",
-							args = {
-								"-xml",
-								"-quiet",
-								"-wrap",
-								"--tidy-mark",
-								"no",
-								"--indent",
-								"yes",
-								"--indent-spaces",
-								"2",
-								"--indent-attributes",
-								"yes",
-								"--sort-attributes",
-								"alpha",
-								"--wrap-attributes",
-								"yes",
-								"--vertical-space",
-								"yes",
-								"-",
-							},
-							stdin = true,
-						}
-					end,
-				},
-
-				-- Use the special "*" filetype for defining formatter configurations on
-				-- any filetype
-				["*"] = {
-					-- "formatter.filetypes.any" defines default configurations for any
-					-- filetype
-					require("formatter.filetypes.any").remove_trailing_whitespace,
-				},
-			},
-		})
-	end,
-}
diff --git a/vim/.vim/lua/plugins/mason.lua b/vim/.vim/lua/plugins/mason.lua
index 698f72d..4f4e5b4 100644
--- a/vim/.vim/lua/plugins/mason.lua
+++ b/vim/.vim/lua/plugins/mason.lua
@@ -69,6 +69,7 @@ return {
 								},
 							},
 							workspace = {
+								checkThirdParty = false, --# stop a anoying dialog on startup
 								-- Make the server aware of Neovim runtime files
 								library = vim.api.nvim_get_runtime_file("", true),
 							},