diff --git a/init.lua b/init.lua
index ef49179..479f1b3 100644
--- a/init.lua
+++ b/init.lua
@@ -48,7 +48,7 @@ else
   vim.o.breakindent = true
 
   -- smart indenting
-  vim.o.smartindent = true
+  vim.o.smartindent = false
 
   -- Save undo history
   vim.o.undofile = true
@@ -79,10 +79,10 @@ else
 
   -- [[ Highlight on yank ]]
   -- See `:help vim.highlight.on_yank()`
-  local highlight_group = vim.api.nvim_create_augroup("highlight_yank", { clear = true })
+  local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
   vim.api.nvim_create_autocmd("TextYankPost", {
     callback = function()
-      vim.highlight.on_yank({ higroup = "IncSearch", timeout = 200 })
+      vim.highlight.on_yank()
     end,
     group = highlight_group,
     pattern = "*",