diff --git a/lazy-lock.json b/lazy-lock.json
index 1ae5866..011b06a 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,11 +1,12 @@
 {
+  "auto-session": { "branch": "main", "commit": "0a1318557c03845f2e0dde347bc54507d1d8c34d" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
   "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
   "colorful-menu.nvim": { "branch": "master", "commit": "f80feb8a6706f965321aff24d0ed3849f02a7f77" },
-  "conform.nvim": { "branch": "master", "commit": "b1a75324ddf96b7bb84963a297b1ed334db087c0" },
+  "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
@@ -13,21 +14,17 @@
   "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
   "mini.nvim": { "branch": "main", "commit": "d570e0b01aabfe949c097983ed6386af60db32ed" },
   "modus-themes.nvim": { "branch": "master", "commit": "b6c46f8066b2d96cb75d5bc7202a9a4c097b5e9f" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
-  "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
   "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
   "nvim-cmp": { "branch": "main", "commit": "059e89495b3ec09395262f16b1ad441a38081d04" },
-  "nvim-lspconfig": { "branch": "master", "commit": "f757438ead92b2ee7a0eb6bc1b18e1ead513a825" },
-  "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3b4afc104666d4451d9672ea7040cb9f0594f119" },
   "nvim-treesitter": { "branch": "master", "commit": "523a9e148919f58eb5a013f76787e57696e00c93" },
   "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
-  "oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "tabby.nvim": { "branch": "main", "commit": "6362aa9595428cefbb6556c05390e8444d1bcd12" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "vesper.nvim": { "branch": "main", "commit": "4e96a753a964192b5904598e64366a93eef5449d" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
diff --git a/lua/config/settings.lua b/lua/config/settings.lua
index e98ec21..d01831e 100644
--- a/lua/config/settings.lua
+++ b/lua/config/settings.lua
@@ -25,6 +25,8 @@ m.init = function()
     vim.o.clipboard = "unnamed"
 
     vim.o.background = "dark"
+
+    vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
 end
 
 return m
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index 1c91aa5..dbaa6f0 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -26,12 +26,10 @@ return {
             handlers = {
                 function(server_name)
                     vim.opt.signcolumn = "yes"
-                    local navic = require "nvim-navic"
 
                     local on_attach = function(client, bufnr)
                         require("lsp_signature").on_attach({}, bufnr)
                         if client.server_capabilities.documentSymbolProvider then
-                            navic.attach(client, bufnr)
                         end
                     end
 
@@ -145,12 +143,9 @@ return {
         },
         config = function()
             vim.opt.signcolumn = "yes"
-            local navic = require "nvim-navic"
 
             local on_attach = function(client, bufnr)
-                if client.server_capabilities.documentSymbolProvider then
-                    navic.attach(client, bufnr)
-                end
+                -- TODO: Impl
             end
 
             vim.filetype.add {
@@ -184,12 +179,6 @@ return {
             require("mason").setup {}
         end,
     },
-    {
-        "SmiteshP/nvim-navic",
-        config = function()
-            -- vim.o.winbar = "%{%v:lua.require'nvim-navic'.get_location()%}"
-        end,
-    },
     {
         "j-hui/fidget.nvim",
         opts = {},
diff --git a/lua/plugins/notes.lua b/lua/plugins/notes.lua
index 6bc0f13..e35423f 100644
--- a/lua/plugins/notes.lua
+++ b/lua/plugins/notes.lua
@@ -1,13 +1,2 @@
-return {
-  {
-    "stevearc/oil.nvim",
-    ---@module 'oil'
-    ---@type oil.SetupOpts
-    opts = {},
-    -- Optional dependencies
-    dependencies = { { "echasnovski/mini.icons", opts = {} } },
-    -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons
-    -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations.
-    lazy = false,
-  },
-}
+-- Used to use oil.nvim for stuff, didn't need it...
+return {}
diff --git a/lua/plugins/session.lua b/lua/plugins/session.lua
new file mode 100644
index 0000000..3ca714c
--- /dev/null
+++ b/lua/plugins/session.lua
@@ -0,0 +1,16 @@
+return {
+    {
+        {
+            'rmagatti/auto-session',
+            lazy = false,
+
+            ---enables autocomplete for opts
+            ---@module "auto-session"
+            ---@type AutoSession.Config
+            opts = {
+                suppressed_dirs = { '~/', '~/Downloads', '/tmp' },
+                -- log_level = 'debug',
+            }
+        }
+    }
+}
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index f022843..331d28e 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -72,7 +72,7 @@ return {
                 desc = "Telescope: Find files",
             },
             {
-                "<leader>fg",
+                "<leader>b",
                 function()
                     local builtin = require "telescope.builtin"
                     builtin.buffers()
@@ -94,10 +94,15 @@ return {
             -- Search with telescope and open with trouble
             local telescope = require "telescope"
             telescope.setup {
+                pickers = {
+                    buffers = {
+                        initial_mode = "normal"
+                    }
+                },
                 defaults = {
                     mappings = {
-                        i = { ["<c-t>"] = open_with_trouble },
-                        n = { ["<c-t>"] = open_with_trouble },
+                        i = { ["<c-a>"] = open_with_trouble, ["<c-d>"] = require('telescope.actions').delete_buffer },
+                        n = { ["<c-a>"] = open_with_trouble, ["<c-d>"] = require('telescope.actions').delete_buffer },
                     },
                 },
             }
diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
index 7068b56..2ecf793 100644
--- a/lua/plugins/ui.lua
+++ b/lua/plugins/ui.lua
@@ -6,15 +6,64 @@ return {
         enabled = true,
         config = function()
             require("modus-themes").setup({
-                line_nr_column_background = false
+                line_nr_column_background = false,
+                variant = "tinted",
+
+                ---@param highlight Highlights
+                ---@param color ColorScheme
+                on_highlights = function(highlight, color)
+                    highlight.WinSeparator = { fg = color.bg_main, bg = color.bg_main }
+                end,
+            })
+
+            vim.cmd [[ colorscheme modus_vivendi ]]
+        end
+    },
+    {
+        'nanozuki/tabby.nvim',
+        event = 'VimEnter', -- if you want lazy load, see below
+        dependencies = 'nvim-tree/nvim-web-devicons',
+        keys = {
+            {
+                "<leader>tg",
+                ":$tabnew<CR>",
+                desc = "Create a new tab"
+            },
+            {
+                "<leader>=",
+                ":tabclose<CR>",
+                desc = "Close the current tab"
+            },
+            {
+                "<leader>[",
+                ":tabprev<CR>",
+                desc = "Goto the previous tab"
+            },
+            {
+                "<leader>]",
+                ":tabnext<CR>",
+                desc = "Goto the next tab"
+            },
+            {
+                "<leader>-",
+                ":BufDel<CR>",
+                desc = "Close the current buffer"
+            }
+        },
+        config = function()
+            require("tabby").setup({
+                preset = "active_wins_at_tail",
+                option = {
+                    nerdfont = false,
+                }
             })
-            vim.cmd [[ colorscheme modus ]]
         end
     },
     {
         "akinsho/bufferline.nvim",
         version = "*",
         lazy = false,
+        enabled = false,
         dependencies = { "nvim-tree/nvim-web-devicons", "datsfilipe/vesper.nvim" },
         keys = {
             {
@@ -71,6 +120,7 @@ return {
     {
         "nvim-neo-tree/neo-tree.nvim",
         branch = "v3.x",
+        enabled = false,
         dependencies = {
             "nvim-lua/plenary.nvim",
             "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended