diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 02f3d6a..6791287 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -5,7 +5,7 @@
 -- ── Install lazylazy ────────────────────────────────────────────────
 -- https://github.com/folke/lazy.nvim
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
-if not vim.loop.fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
   local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
   local out = vim.fn.system {
     'git',
diff --git a/config/nvim/lua/options.lua b/config/nvim/lua/options.lua
index 3c0fa88..668d85a 100644
--- a/config/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -7,6 +7,7 @@
 
 local g = vim.g -- A table to store global variables
 local o = vim.opt -- A table to store global options
+local a = vim.api -- A table to store API functions
 
 -- vim.global
 g.mapleader = ' ' -- Space as the leader key
@@ -27,6 +28,8 @@ g.loaded_java_provider = 0 -- Disable java provider
 o.confirm = true -- Confirm before closing unsaved buffers
 o.ignorecase = true -- Ignore case in search patterns
 o.inccommand = 'split' -- Preview substitutions live, as you type!
+o.list = true -- Show invisible characters
+o.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
 o.number = true -- Show line numbers
 o.numberwidth = 3 -- Set the width of the number column
 o.relativenumber = true -- Show relative line numbers
@@ -40,20 +43,24 @@ o.splitright = true -- vsplit to the right
 o.termguicolors = true -- Enable GUI colors
 o.timeoutlen = 250 -- Decrease mapped sequence wait time
 o.updatetime = 250 -- 250 ms = 2,5 seconds
-o.sessionoptions =
-  'buffers,curdir,folds,tabpages,winsize,winpos,terminal,localoptions'
+
+-- Session options
+-- This is a comma separated list of options that will be
+-- saved when a session ends.
+local so = 'buffers,curdir,folds,tabpages,winsize,winpos,terminal,localoptions'
+o.sessionoptions = so
 
 o.wildmode = 'longest:full,full' -- Command-line completion mode
 
 -- Enable the colorcolumn
-vim.api.nvim_set_option_value('colorcolumn', '+1', { scope = 'global' })
+a.nvim_set_option_value('colorcolumn', '+1', { scope = 'global' })
 
 -- Sync clipboard between OS and Neovim.
 --  Schedule the setting after `UiEnter` because it can increase startup-time.
 --  See `:help 'clipboard'`
 vim.schedule(function()
   local c = vim.env.SSH_TTY and '' or 'unnamedplus'
-  vim.opt.clipboard = c
+  o.clipboard = c
 end)
 
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/config/nvim/lua/plugins/blink.lua b/config/nvim/lua/plugins/blink.lua
index a11ec0a..20ad129 100644
--- a/config/nvim/lua/plugins/blink.lua
+++ b/config/nvim/lua/plugins/blink.lua
@@ -50,7 +50,6 @@ return {
       },
     },
     ---@module 'blink.cmp'
-    ---@type blink.cmp.Config
     opts = {
       snippets = { preset = 'luasnip' },
       -- 'default' for mappings similar to built-in completion
diff --git a/config/nvim/lua/plugins/folke.lua b/config/nvim/lua/plugins/folke.lua
index 723ee91..851fdfa 100644
--- a/config/nvim/lua/plugins/folke.lua
+++ b/config/nvim/lua/plugins/folke.lua
@@ -5,7 +5,6 @@ return {
     'folke/snacks.nvim',
     priority = 1000,
     lazy = false,
-    ---@type snacks.Config
     opts = {
       bigfile = { enabled = true },
       gitbrowse = { enabled = true },
@@ -44,8 +43,8 @@ return {
   {
     'folke/trouble.nvim',
     lazy = false,
+    cmd = 'Trouble',
     dependencies = { 'nvim-tree/nvim-web-devicons' },
-    ---@type trouble.Config
     opts = {
       auto_preview = true,
       auto_fold = true,
@@ -53,13 +52,13 @@ return {
       use_lsp_diagnostic_signs = true,
     },
   },
+
   -- Navigate your code with search labels, enhanced
   -- character motions and Treesitter integration
   -- https://github.com/folke/flash.nvim
   {
     'folke/flash.nvim',
     event = 'VeryLazy',
-    ---@type Flash.Config
     opts = {},
     keys = {
       {
diff --git a/config/nvim/lua/plugins/other.lua b/config/nvim/lua/plugins/other.lua
index 90694c1..ec3d7da 100644
--- a/config/nvim/lua/plugins/other.lua
+++ b/config/nvim/lua/plugins/other.lua
@@ -3,8 +3,6 @@ return {
     'rmagatti/auto-session',
     lazy = false,
     version = '*',
-    ---@module "auto-session"
-    ---@type AutoSession.Config
     opts = {
       suppressed_dirs = {
         '/',
diff --git a/config/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua
index 36da157..49a2a88 100644
--- a/config/nvim/lua/plugins/treesitter.lua
+++ b/config/nvim/lua/plugins/treesitter.lua
@@ -12,7 +12,6 @@ return {
     'nvim-treesitter/nvim-treesitter-context',
     'JoosepAlviste/nvim-ts-context-commentstring',
   },
-  ---@type TSConfig
   opts = {
     auto_install = true, -- Auto install the parser generators
     sync_install = false, -- Sync install the parser generators, install async