diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 38fe265..8fb38d2 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -3,9 +3,9 @@ map = vim.keymap.set
 vim.g.mapleader = " "
 vim.g.termguicolors = true
 -- mini.basics sets defaults see plugin folder for more
+vim.o.winborder = "single"
 vim.o.winblend = 0
 vim.o.pumblend = 0
-vim.o.winborder = 'rounded'
 vim.o.scrolloff = 20
 vim.o.shiftwidth = 4
 vim.o.tabstop = 4
diff --git a/config/nvim/lua/autocmds/init.lua b/config/nvim/lua/autocmds/init.lua
index 0cc8f5b..57d5f48 100644
--- a/config/nvim/lua/autocmds/init.lua
+++ b/config/nvim/lua/autocmds/init.lua
@@ -3,27 +3,29 @@ vim.api.nvim_create_autocmd("BufEnter", { pattern = "term://*", callback = funct
 
 -- Start treesitter
 vim.api.nvim_create_autocmd('FileType', {
-    pattern = '*',
-    callback = function()
-        pcall(vim.treesitter.start)
-    end,
+	pattern = '*',
+	callback = function(ev)
+		if ev.match ~= "odin" then
+			pcall(vim.treesitter.start)
+		end
+	end,
 })
 
 -- highlights yanked text
 vim.api.nvim_create_autocmd("TextYankPost", {
-    callback = function()
-        vim.highlight.on_yank({
-            higroup = "IncSearch",
-            timeout = 200,
-        })
-    end,
+	callback = function()
+		vim.highlight.on_yank({
+			higroup = "IncSearch",
+			timeout = 200,
+		})
+	end,
 })
 
 -- removes trailing whitespace on save
 vim.api.nvim_create_autocmd("BufWritePre", {
-    callback = function()
-        local save_cursor = vim.fn.getpos(".")
-        vim.cmd([[%s/\s\+$//e]])
-        vim.fn.setpos(".", save_cursor)
-    end,
+	callback = function()
+		local save_cursor = vim.fn.getpos(".")
+		vim.cmd([[%s/\s\+$//e]])
+		vim.fn.setpos(".", save_cursor)
+	end,
 })
diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua
index 0131694..2e3988e 100644
--- a/config/nvim/lua/plugins/init.lua
+++ b/config/nvim/lua/plugins/init.lua
@@ -10,15 +10,12 @@ vim.pack.add({
 require("tree-sitter-manager").setup()
 require('nvim-highlight-colors').setup()
 -- Mini setups
-require("mini.extra").setup({})
-require("mini.pairs").setup({})
-require("mini.statusline").setup({})
-require('mini.basics').setup({
-	options = { basic = true, extra_ui = true, win_borders = 'rounded', },
-	mappings = { basic = true },
-	autocommands = { basic = true },
-})
-require('mini.completion').setup({ lsp_completion = { auto_setup = true }, })
+require("mini.extra").setup()
+require("mini.pairs").setup()
+require('mini.surround').setup()
+require("mini.statusline").setup()
+require('mini.basics').setup({options = { extra_ui = true }})
+require('mini.completion').setup({lsp_completion = { auto_setup = true }})
 require("mini.pick").setup({
 	window = { config = function()
 		local height = math.floor(0.50 * vim.o.lines)
@@ -49,11 +46,11 @@ map("n", "<leader>ss", ":lua MiniPick.builtin.grep_live()<CR>")
 map("n", "<leader>tc", ":HighlightColors Toggle<CR>")
 
 -- Highlight Overrides
-local bg = "#1b1b1b"
-local border = "#96A6C8"
-vim.api.nvim_set_hl(0, "MiniPickBorder",	{ bg = bg, fg = border })
-vim.api.nvim_set_hl(0, "MiniPickNormal",	{ bg = bg })
+-- local bg = "#1b1b1b"
+-- local border = "#96A6C8"
+-- vim.api.nvim_set_hl(0, "MiniPickBorder",	{ bg = bg, fg = border })
+-- vim.api.nvim_set_hl(0, "MiniPickNormal",	{ bg = bg })
 -- Completion popup background
-vim.api.nvim_set_hl(0, "Pmenu", { bg = bg })
-vim.api.nvim_set_hl(0, "NormalFloat",		{ bg = bg })
-vim.api.nvim_set_hl(0, 'FloatBorder',		{ bg = bg, fg = border })
+-- vim.api.nvim_set_hl(0, "Pmenu", { bg = bg })
+-- vim.api.nvim_set_hl(0, "NormalFloat",		{ bg = bg })
+-- vim.api.nvim_set_hl(0, 'FloatBorder',		{ bg = bg, fg = border })