diff --git a/init.lua b/init.lua
index 0279852..3b91b6c 100644
--- a/init.lua
+++ b/init.lua
@@ -7,7 +7,6 @@ vim.opt.signcolumn = 'yes'
 vim.opt.clipboard = '' -- don't just use the system clipboard
 vim.opt.wrap = false
 vim.opt.breakindent = false
-vim.opt.spell = false
 vim.opt.conceallevel = 2
 vim.opt.concealcursor = 'c'
 vim.opt.undofile = true
@@ -52,7 +51,7 @@ vim.opt.startofline = false -- Cursor in same column for few commands
 vim.opt.splitbelow = true -- Splits open bottom right
 vim.opt.splitright = true
 vim.opt.breakindentopt = { shift = 2, min = 20 }
-vim.opt.formatoptions = '' -- see :h fo-table & :h formatoptions
+vim.opt.formatoptions = 'trowacnlm1jp' -- see :h fo-table & :h formatoptions
 vim.opt.breakindent = true
 
 -- Diff
@@ -73,7 +72,7 @@ vim.o.guifont = 'FiraCode Nerd Font:h15'
 vim.opt.termguicolors = true
 vim.opt.shortmess = 'xsTOInfFitloCaAs'
 vim.opt.showmode = true -- Show mode in cmd window
-vim.opt.scrolloff = 10 -- Keep at least n lines above/below
+vim.opt.scrolloff = 6 -- Keep at least n lines above/below
 vim.opt.sidescrolloff = 10 -- Keep at least n lines left/right
 vim.opt.numberwidth = 2 -- Minimum number of columns to use for the line number
 vim.opt.number = true -- Show line numbers
@@ -136,8 +135,8 @@ vim.opt.pumblend = 10 -- Popup blend
 -- Spelling correction
 -- ===
 
-vim.opt.spell = false -- manually enable spell with `set spell` or `<leader>ts`
-vim.opt.spelllang = 'en,de_de,'
+vim.opt.spell = true -- manually enable spell with `set spell` or `<leader>ts`
+vim.opt.spelllang = 'en,de_de'
 vim.opt.spellsuggest = 'double,50,timeout:5000'
 
 -- autocommands
diff --git a/lua/custom/autocmds.lua b/lua/custom/autocmds.lua
index d0819df..7a5b89f 100644
--- a/lua/custom/autocmds.lua
+++ b/lua/custom/autocmds.lua
@@ -42,3 +42,14 @@ vim.api.nvim_create_autocmd('FileType', {
     vim.opt_local.concealcursor = ''
   end,
 })
+
+-- disable auto formatting for some filetypes
+vim.api.nvim_create_autocmd('FileType', {
+  group = augroup,
+  pattern = {
+    'TelescopePrompt',
+  },
+  callback = function()
+    vim.opt_local.formatoptions = ''
+  end,
+})
diff --git a/lua/custom/plugins/configs/lsp.lua b/lua/custom/plugins/configs/lsp.lua
index dc07126..35452be 100644
--- a/lua/custom/plugins/configs/lsp.lua
+++ b/lua/custom/plugins/configs/lsp.lua
@@ -185,7 +185,7 @@ local servers = {
     },
   },
   ltex = {
-    use_spellfile = false,
+    use_spellfile = true,
     settings = {
       ltex = {
         checkFrequency = 'save', -- shut up while i'm just editing, see <https://github.com/folke/noice.nvim/issues/166>
diff --git a/lua/custom/plugins/tools.lua b/lua/custom/plugins/tools.lua
new file mode 100644
index 0000000..6428029
--- /dev/null
+++ b/lua/custom/plugins/tools.lua
@@ -0,0 +1,13 @@
+return {
+  {
+    'kdheepak/lazygit.nvim',
+    keys = {
+      { '<leader>gg', '<cmd>LazyGit<cr>', desc = 'Open LazyGit' },
+    },
+    cmd = 'LazyGit',
+    -- optional for floating window border decoration
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+    },
+  },
+}
diff --git a/lua/custom/plugins/ui.lua b/lua/custom/plugins/ui.lua
index 42c910b..41821f6 100644
--- a/lua/custom/plugins/ui.lua
+++ b/lua/custom/plugins/ui.lua
@@ -127,17 +127,7 @@ return {
       }
     end,
   },
-  {
-    'kdheepak/lazygit.nvim',
-    keys = {
-      { '<leader>gg', '<cmd>LazyGit<cr>', desc = 'Open LazyGit' },
-    },
-    cmd = 'LazyGit',
-    -- optional for floating window border decoration
-    dependencies = {
-      'nvim-lua/plenary.nvim',
-    },
-  },
+  { 'echasnovski/mini.trailspace', lazy = false, version = false, opts = { only_in_normal_buffers = true } },
   {
     'folke/which-key.nvim',
     event = 'VimEnter', -- Sets the loading event to 'VimEnter'
@@ -632,6 +622,7 @@ return {
           vim.b.minitrailspace_disable = true
           vim.opt_local.list = false
           vim.opt_local.colorcolumn = '0'
+          vim.opt_local.spell = false
         end,
       })
     end,
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index c3b6821..01a8418 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -382,3 +382,5 @@ lemmy
 selfhosting
 ELO
 FIDE
+BDD
+Pentesting
diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl
index 2a84914..27db0ef 100644
Binary files a/spell/en.utf-8.add.spl and b/spell/en.utf-8.add.spl differ