diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 804c003..238baed 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,8 +1,23 @@
+require('options')
 require('plugins') -- Install plugins with Lazy
-require('options') -- Basic vim options
-require('appearance') -- Appearance
 require('completion') -- Completion
 require('lsp') -- LSP
 require('remap') -- Keymaps
 require('tree') -- Nvim-tree
 require('treesitter') -- Treesitter
+require('appearance') -- Appearance
+
+require('telescope').setup{
+  defaults = {
+    vimgrep_arguments = {
+      'rg',
+      '--color=never',
+      '--no-heading',
+      '--with-filename',
+      '--line-number',
+      '--column',
+      '--smart-case',
+      '--hidden',
+    }
+  }
+}
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 2464f27..5f25a04 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -11,22 +11,25 @@
   "cmp-treesitter": { "branch": "master", "commit": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d" },
   "cmp_kitty": { "branch": "main", "commit": "a0716db2efb4c452600ef1e4a3ca610889279118" },
   "codeium.vim": { "branch": "main", "commit": "fd440cd718742daab162241c5bd5857cd92f5f72" },
-  "feline.nvim": { "branch": "main", "commit": "6cfbe0608d2552a7d947c6f521670b10379fbe42" },
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
   "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
+  "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
   "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" },
   "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
   "nvim-html-css": { "branch": "main", "commit": "c072b05c56a40d3ec7874fa487723e6bef5d97f8" },
+  "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
   "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" },
   "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" },
-  "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" },
+  "nvim-treesitter": { "branch": "master", "commit": "b444afa1dacd3d031c0ffe4763671d89afda5ddb" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
   "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "sttusline": { "branch": "main", "commit": "133bb40d249e0167c89bb352ff8442b821fb07e9" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
+  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
   "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" },
   "vim-rails": { "branch": "master", "commit": "1ad9663ce31e8c08134849d04184cda94bb42aba" },
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index da0db18..5eb8c64 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -74,3 +74,6 @@ dap.configurations.ruby = {
   },
 }
 
+require("nvim-lightbulb").setup({
+  autocmd = { enabled = true },
+})
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 5ac74c0..3430b58 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -7,6 +7,7 @@ set.expandtab = true
 set.number = true
 set.relativenumber = true
 set.cursorline = true
+set.termguicolors = true
 
 -- Improve terminal setup
 vim.api.nvim_command("autocmd TermOpen * startinsert")
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 056a864..3fcd80a 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -46,7 +46,6 @@ require("lazy").setup({
   "kdheepak/cmp-latex-symbols",
   "hrsh7th/cmp-emoji",
   "Jezda1337/nvim-html-css",
-
   -- LSP setup
   "neovim/nvim-lspconfig",
   -- Icons for Treesitter/nvim-tree
@@ -72,6 +71,8 @@ require("lazy").setup({
   "Eandrju/cellular-automaton.nvim",
   -- Auto disable search highlight
   "romainl/vim-cool",
+  -- Wiki
+  "vimwiki/vimwiki",
   -- Focus on current buffer
   {
     "folke/zen-mode.nvim",
@@ -80,6 +81,52 @@ require("lazy").setup({
         tmux = { enabled = true },
       }
     }
-  }
+  },
+  {
+    "sontungexpt/sttusline",
+    dependencies = {
+      "nvim-tree/nvim-web-devicons",
+    },
+    event = { "BufEnter" },
+    config = function(_, opts)
+      require("sttusline").setup {
+        statusline_color = "#504945",
+
+        -- | 1 | 2 | 3
+        -- recommended: 3
+        laststatus = 3,
+        disabled = {
+          filetypes = {
+            "NvimTree",
+            -- "lazy",
+          },
+          buftypes = {
+            -- "terminal",
+          },
+        },
+        components = {
+          "mode",
+          "filename",
+          "git-branch",
+          "git-diff",
+          "%=",
+          "diagnostics",
+          "lsps-formatters",
+          "indent",
+          "encoding",
+          "pos-cursor",
+          "pos-cursor-progress",
+        },
+      }
+    end,
+  },
+  "kosayoda/nvim-lightbulb",
+  {
+    "folke/trouble.nvim",
+    dependencies = "nvim-tree/nvim-web-devicons",
+    config = function()
+      require("trouble").setup()
+    end
+  },
 })
 
diff --git a/.tmux.conf b/.tmux.conf
index 45d7e61..4430b2a 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -7,8 +7,8 @@ bind-key C-o last-window
 set-option -g prefix C-o
 unbind-key C-b
 
-set -g default-terminal "tmux"
-set -as terminal-features ",kitty:RGB"
+set -g default-terminal "tmux-256color"
+set-option -sa terminal-features ',xterm-kitty:RGB'
 
 set -g history-limit 10000
 
@@ -16,6 +16,9 @@ set -g history-file ~/.dotfiles/.tmux_history
 
 set -g window-size smallest
 
+set-option -sg escape-time 10
+set-option -sg focus-events on
+
 bind-key j select-pane -D
 bind-key k select-pane -U
 bind-key l select-pane -R