diff --git a/lua/conf/opts.lua b/lua/conf/opts.lua
index ce27b80..b6576e0 100644
--- a/lua/conf/opts.lua
+++ b/lua/conf/opts.lua
@@ -30,8 +30,9 @@ vim.o.udf = true
 -- searching
 vim.o.ic = true
 
--- make windows look nice
-vim.o.winborder = "solid"
+-- make windows look nice wrapped in pcall cause it's causing my setup to go
+-- bezerk inside of git commit buffers
+pcall(function() vim.o.winborder = '▄,▄,▄,█,▀,▀,▀,█' end)
 
 -- wild menus
 vim.o.ph = 20
diff --git a/lua/conf/plugins/oil.lua b/lua/conf/plugins/oil.lua
index 7d90c2f..f134083 100644
--- a/lua/conf/plugins/oil.lua
+++ b/lua/conf/plugins/oil.lua
@@ -27,10 +27,10 @@ return { "stevearc/oil.nvim",
       },
 
 			-- fix the damn border
-			confirmation = { border = vim.o.winborder },
-			progress = { border = vim.o.winborder },
-			ssh = { border = vim.o.winborder },
-			keymaps_help = { border = vim.o.winborder }
+			confirmation = { winborder = vim.o.winborder },
+			progress = { winborder = vim.o.winborder },
+			ssh = { winborder = vim.o.winborder },
+			keymaps_help = { winborder = vim.o.winborder }
 		}
 
     map("n", "-", "<cmd>Oil<CR>")