diff --git a/lua/core/functions.lua b/lua/core/functions.lua
index 5fe9e22..6e2da4f 100644
--- a/lua/core/functions.lua
+++ b/lua/core/functions.lua
@@ -11,19 +11,25 @@ vim.api.nvim_create_user_command('ReloadConfig', function()
 end, {})
 
 -- Copy relative path
-vim.api.nvim_create_user_command('CRpath', function()
+vim.api.nvim_create_user_command('CopyRelativePath', function()
     local path = vim.fn.expand('%')
     vim.fn.setreg('+', path)
     vim.notify('Copied "' .. path .. '" to the clipboard!')
 end, {})
 
 -- Copy absolute path
-vim.api.nvim_create_user_command('CApath', function()
+vim.api.nvim_create_user_command('CopyAbsolutePath', function()
     local path = vim.fn.expand('%:p')
     vim.fn.setreg('+', path)
     vim.notify('Copied "' .. path .. '" to the clipboard!')
 end, {})
 
+vim.api.nvim_create_user_command('CopyFileName', function()
+    local path = vim.fn.expand('%:t')
+    vim.fn.setreg('+', path)
+    vim.notify('Copied "' .. path .. '" to the clipboard!')
+end, {})
+
 -- Switch to git root or file parent dir
 vim.api.nvim_create_user_command('RootDir', function()
     local root = require('lib.util').get_root_dir()
diff --git a/lua/core/keys.lua b/lua/core/keys.lua
index dc5ab9d..179bf20 100644
--- a/lua/core/keys.lua
+++ b/lua/core/keys.lua
@@ -206,7 +206,7 @@ map('i', '<M-c>', function() return vim.fn['codeium#Clear']() end, { expr = true
 
 
 -- Oil Explorer
-map('n', '<leader>e', function()
+map('n', '<leader>E', function()
 	require("oil").toggle_float()
 end, { desc = icons.documents.OpenFolder .. 'Oil File Explorer' })
 
diff --git a/lua/lib/icons.lua b/lua/lib/icons.lua
index 6a8d404..da4298a 100644
--- a/lua/lib/icons.lua
+++ b/lua/lib/icons.lua
@@ -108,13 +108,14 @@ return {
         History = ' ',
         Home = ' ',
         Incoming = ' ',
+        Jump = ' ',
         Keyboard = '  ',
         Ligthbulb = '󰌵 ',
         List = '',
         Lock = ' ',
         Minus = '‒ ',
         Music = '󰝚 ',
-        NeoVim = ' ',
+        Neovim = ' ',
         NewFile = ' ',
         None = ' ',
         Note = ' ',
@@ -140,6 +141,7 @@ return {
         Save = '󰆓 ',
         Search = ' ',
         Separator = '▊ ',
+        SeparatorLight = '▍',
         SignIn = ' ',
         SignOut = ' ',
         Sleep = '󰒲 ',
diff --git a/lua/plugins/lang/cmp.lua b/lua/plugins/lang/cmp.lua
index 3fd4283..9ca1946 100644
--- a/lua/plugins/lang/cmp.lua
+++ b/lua/plugins/lang/cmp.lua
@@ -37,31 +37,31 @@ local max_count = 15
 
       --   פּ ﯟ   some other good icons
       local kind_icons = {
-         Text          = "",
-         Method        = "m",
-         Function      = "",
-         Constructor   = "",
-         Field         = "",
-         Variable      = "",
-         Class         = "",
+         Text          = "",
+         Method        = " '",
+         Function      = "󰊕",
+         Constructor   = "󰈏",
+         Field         = "",
+         Variable      = "",
+         Class         = "",
          Interface     = "",
          Module        = "",
          Property      = "",
          Unit          = "",
-         Value         = "",
-         Enum          = "",
-         Keyword       = "",
+         Value         = " ",
+         Enum          = " ",
+         Keyword       = "",
          Snippet       = "",
-         Color         = "",
-         File          = "",
+         Color         = "",
+         File          = " ",
          Reference     = "",
-         Folder        = "",
-         EnumMember    = "",
-         Constant      = "",
+         Folder        = "",
+         EnumMember    = "",
+         Constant      = "",
          Struct        = "",
          Event         = "",
-         Operator      = "",
-         TypeParameter = "",
+         Operator      = "",
+         TypeParameter = "",
       }
 
 cmp.setup({
@@ -134,6 +134,7 @@ cmp.setup({
         { name = 'luasnip', keyword_length = 2 },
         { name = 'buffer', keyword_length = 3 },
         { name = 'codeium'},
+        { name = 'lazydev', group_index = 0 },
     },
     confirm_opts = {
         behavior = cmp.ConfirmBehavior.Replace,
diff --git a/lua/plugins/lang/neodev.lua b/lua/plugins/lang/neodev.lua
deleted file mode 100644
index d316e6c..0000000
--- a/lua/plugins/lang/neodev.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-local neodev = require('neodev')
-
-neodev.setup({
-    library = {
-        enabled = true,
-        runtime = true,
-        types = true,
-        plugins = true, -- installed opt or start plugins in packpath
-        -- you can also specify the list of plugins to make available as a workspace library
-        -- plugins = { "nvim-treesitter", "plenary.nvim", "telescope.nvim" },
-    },
-    setup_jsonls = true,
-    lspconfig = true,
-    pathStrict = true,
-})
diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua
index fb69861..94843c9 100644
--- a/lua/plugins/lazy.lua
+++ b/lua/plugins/lazy.lua
@@ -51,7 +51,7 @@ lazy.setup({
             loaded = icons.ui.CircleSmall,
             not_loaded = icons.ui.CircleSmallEmpty,
             plugin = icons.ui.Package,
-            runtime = icons.ui.NeoVim,
+            runtime = icons.ui.Neovim,
             source = icons.ui.Code,
             start = icons.ui.Play,
             task = icons.ui.Check,
diff --git a/lua/plugins/list.lua b/lua/plugins/list.lua
index 81a3192..4d7bbdd 100644
--- a/lua/plugins/list.lua
+++ b/lua/plugins/list.lua
@@ -165,9 +165,8 @@ local plugins = {
         event = { 'BufReadPre', 'BufNewFile' },
     },
     {
-        'folke/neodev.nvim',
-        ft = { 'lua', 'vim' },
-        config = load_config('lang.neodev'),
+        'folke/lazydev.nvim',
+        ft = 'lua',
     },
     {
         'nvimdev/lspsaga.nvim',
@@ -274,30 +273,6 @@ local plugins = {
                 end,
                 desc = 'Flash Treesitter',
             },
-            {
-                'r',
-                mode = 'o',
-                function()
-                    require('flash').remote()
-                end,
-                desc = 'Remote Flash',
-            },
-            {
-                'R',
-                mode = { 'o', 'x' },
-                function()
-                    require('flash').treesitter_search()
-                end,
-                desc = 'Treesitter Search',
-            },
-            {
-                '<c-s>',
-                mode = { 'c' },
-                function()
-                    require('flash').toggle()
-                end,
-                desc = 'Toggle Flash Search',
-            },
         },
     },
     {
@@ -451,6 +426,12 @@ local plugins = {
         dependencies = { 'stevearc/dressing.nvim' },
         cmd = 'Nerdy',
     },
+    {
+        -- 'chentoast/marks.nvim',
+        '2kabhishek/markit.nvim',
+        config = load_config('tools.marks'),
+        event = { 'BufReadPre', 'BufNewFile' },
+    },
 
     -- Git
     {
@@ -537,7 +518,7 @@ if util.is_present('gem') then
         keys = {
             {
                 '<leader>rc',
-                mode = { 'n', 'x', 'o' },
+                mode = { 'n' },
                 function()
                     vim.cmd('RorCommands')
                 end,
diff --git a/lua/plugins/lock.json b/lua/plugins/lock.json
index cfec700..a608647 100644
--- a/lua/plugins/lock.json
+++ b/lua/plugins/lock.json
@@ -25,18 +25,19 @@
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
   "lazy.nvim": { "branch": "main", "commit": "ad30030b6abca7dac5a493c58b4d183b3fe93202" },
+  "lazydev.nvim": { "branch": "main", "commit": "39eb1f81eaddafc14f2b5ed2e1463068a35d8f90" },
   "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
   "lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" },
   "lspsaga.nvim": { "branch": "main", "commit": "4e9d6162863d2f532751db91a1193cfe1f3a4361" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "markit.nvim": { "branch": "main", "commit": "6df58709124283c82275e67e512a9cfde4904b3d" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
   "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
   "mini.ai": { "branch": "main", "commit": "ee9446a17c160aba6a04ff22097389c41872c878" },
   "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" },
   "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" },
-  "neodev.nvim": { "branch": "main", "commit": "1f4ebcc10852518166ce165e57d425a4265a10d4" },
   "neotest": { "branch": "master", "commit": "6f35d797882c6ce0ab7c87dc86561512dc3d7aba" },
   "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" },
   "neotest-rspec": { "branch": "main", "commit": "48573d5882cbe8d8bcd3b735d9ee7705168b1b87" },
diff --git a/lua/plugins/tools/flash.lua b/lua/plugins/tools/flash.lua
index 7b2a988..f7cffa4 100644
--- a/lua/plugins/tools/flash.lua
+++ b/lua/plugins/tools/flash.lua
@@ -2,14 +2,56 @@ local flash = require('flash')
 local icons = require('lib.icons')
 
 flash.setup({
+    -- exact, fuzzy, regex, custom function
+    mode = 'fuzzy',
+    -- behave like `incsearch`
+    incremental = true,
+
+    jump = {
+        -- save location in the jumplist
+        jumplist = true,
+        -- automatically jump when there is only one match
+        autojump = true,
+    },
+    label = {
+        rainbow = {
+            enabled = true,
+            -- number between 1 and 9
+            shade = 4,
+        },
+    },
     prompt = {
         enabled = true,
         prefix = { { icons.ui.Separator .. icons.ui.Rocket .. icons.ui.ChevronRight .. ' ', 'FlashPromptIcon' } },
         win_config = { relative = 'editor', width = 1, height = 1, row = 1, col = 0, zindex = 1000 },
     },
     modes = {
+        search = {
+            enabled = true,
+        },
         char = {
+            enabled = false,
             jump_labels = false,
         },
     },
 })
+
+vim.api.nvim_create_user_command('FlashDiagnostics', function()
+    require('flash').jump({
+        matcher = function(win)
+            return vim.tbl_map(function(diag)
+                return {
+                    pos = { diag.lnum + 1, diag.col },
+                    end_pos = { diag.end_lnum + 1, diag.end_col - 1 },
+                }
+            end, vim.diagnostic.get(vim.api.nvim_win_get_buf(win)))
+        end,
+        action = function(match, state)
+            vim.api.nvim_win_call(match.win, function()
+                vim.api.nvim_win_set_cursor(match.win, match.pos)
+                vim.diagnostic.open_float()
+            end)
+            state:restore()
+        end,
+    })
+end, {})
diff --git a/lua/plugins/tools/gitsigns.lua b/lua/plugins/tools/gitsigns.lua
index b0ed801..f90ac6a 100644
--- a/lua/plugins/tools/gitsigns.lua
+++ b/lua/plugins/tools/gitsigns.lua
@@ -82,8 +82,6 @@ gitsigns.setup({
             return '<Ignore>'
         end, { expr = true, desc = 'Previous Change' })
 
-        map({ 'v' }, '<leader>ga', ':Gitsigns stage_hunk<CR>', { desc = 'Stage Hunk' })
-        map({ 'v' }, '<leader>gr', ':Gitsigns reset_hunk<CR>', { desc = 'Reset Hunk' })
         map('n', '<leader>gB', function()
             gs.blame_line({ full = true })
         end, { desc = 'Blame With Preview' })
diff --git a/lua/plugins/tools/marks.lua b/lua/plugins/tools/marks.lua
new file mode 100644
index 0000000..04e3d3b
--- /dev/null
+++ b/lua/plugins/tools/marks.lua
@@ -0,0 +1,37 @@
+local marks = require('marks')
+local icons = require('lib.icons')
+
+marks.setup({
+    default_mappings = true,
+    builtin_marks = { '.', '<', '>', '^' },
+    cyclic = true,
+    force_write_shada = false,
+    sign_priority = { lower = 10, upper = 15, builtin = 8, bookmark = 20 },
+    excluded_filetypes = {},
+    excluded_buftypes = { 'nofile' },
+    -- supports up to 10 bookmark groups
+    bookmark_1 = {
+        sign = icons.ui.Flag,
+        virt_text = 'flag',
+        annotate = false,
+    },
+    bookmark_2 = {
+        sign = icons.ui.Eye,
+        virt_text = 'watch',
+        annotate = false,
+    },
+    bookmark_3 = {
+        sign = icons.ui.Star,
+        virt_text = 'star',
+        annotate = false,
+    },
+    bookmark_4 = {
+        sign = icons.ui.Bug,
+        virt_text = 'bug',
+        annotate = false,
+    },
+    mappings = {
+        set = 'M',
+        toggle_mark = 'm',
+    },
+})
diff --git a/lua/plugins/tools/telescope.lua b/lua/plugins/tools/telescope.lua
index 5919f8e..8baf71d 100644
--- a/lua/plugins/tools/telescope.lua
+++ b/lua/plugins/tools/telescope.lua
@@ -161,6 +161,7 @@ telescope.setup({
 require('telescope').load_extension('fzf')
 require('telescope').load_extension('menufacture')
 require('telescope').load_extension('undo')
+telescope.load_extension('marks_nvim')
 require('telescope').load_extension('harpoon')
 require('telescope').load_extension('notify')
 require('telescope').load_extension('noice')
diff --git a/lua/plugins/tools/which-key.lua b/lua/plugins/tools/which-key.lua
index d994c25..5225bf5 100644
--- a/lua/plugins/tools/which-key.lua
+++ b/lua/plugins/tools/which-key.lua
@@ -41,9 +41,9 @@ local setup = {
         winblend = 10,
     },
     layout = {
-        height = { min = 4, max = 24 },
+        height = { min = 5, max = 26 },
         width = { min = 20, max = 50 },
-        spacing = 3,
+        spacing = 6,
         align = 'center',
     },
     ignore_missing = false,
@@ -116,26 +116,6 @@ local opts = {
 }
 
 local mappings = {
-    [','] = { '<cmd>b#<cr>', icons.ui.History .. 'Recent' },
-    q = { '<cmd>q<cr>', icons.ui.Close .. 'Quit' },
-    Q = { '<cmd>qa!<cr>', icons.ui.Power .. 'Force Quit!' },
-    w = { '<cmd>w<cr>', icons.ui.Save .. 'Save' },
-    x = { '<cmd>x<cr>', icons.ui.Pencil .. 'Write and Quit' },
-    S = { '<cmd>ASToggle<cr>', icons.ui.Save .. 'AutoSave Toggle' },
-    c = {
-        name = icons.ui.NeoVim .. 'Config',
-        c = { '<cmd>CccConvert<cr>', 'Convert Color' },
-        d = { '<cmd>RootDir<cr>', 'Root Directory' },
-        e = { '<cmd>e $MYVIMRC<cr>', 'Edit Config' },
-        f = { '<cmd>lua vim.lsp.buf.format({async = true})<cr>', 'Format File' },
-        F = { '<cmd>retab<cr>', 'Fix Tabs' },
-        i = { vim.show_pos, 'Inspect Position' },
-        l = { '<cmd>:g/^\\s*$/d<cr>', 'Clean Empty Lines' },
-        n = { '<cmd>set relativenumber!<cr>', 'Relative Numbers' },
-        p = { '<cmd>CccPick<cr>', 'Pick Color' },
-        r = { '<cmd>Telescope reloader<cr>', 'Reload Module' },
-        R = { '<cmd>ReloadConfig<cr>', 'Reload Configs' },
-    },
     b = {
         name = icons.ui.Bug .. 'Debug',
         b = { '<cmd>DapToggleBreakpoint<cr>', 'Breakpoint' },
@@ -150,13 +130,21 @@ local mappings = {
         x = { '<cmd>DapTerminate<cr>', 'Exit' },
     },
     c = {
-        name = icons.kind.Property .. 'QuickFix',
-        o = {"<cmd>copen<cr>","Open quickfix list"},
-        c = {"<cmd>cclose<cr>","Close quickfix list"},
-        f = {"<cmd>cfirst<cr>","Go to first item in quickfix list"},
-        l = {"<cmd>clast<cr>","Go to last item in quickfix list"},
-        n = {"<cmd>cnext<cr>","Go to next item in quickfix list"},
-        p = {"<cmd>cprev<cr>","Go to previous item in quickfix list"},
+        name = icons.ui.Neovim .. 'Code',
+        d = { '<cmd>RootDir<cr>', 'Root Directory' },
+        f = { '<cmd>lua vim.lsp.buf.format({async = true})<cr>', 'Format File' },
+        F = { '<cmd>retab<cr>', 'Fix Tabs' },
+        r = { '<cmd>Telescope reloader<cr>', 'Reload Module' },
+        R = { '<cmd>ReloadConfig<cr>', 'Reload Configs' },
+        o = { '<cmd>Dashboard<cr>', 'Dashboard' },
+        c = { '<cmd>CccHighlighterToggle<cr>', 'Highlight Colors' },
+        h = { '<cmd>Hardtime toggle<cr>', 'Hardtime' },
+        l = { '<cmd>:g/^\\s*$/d<cr>', 'Clean Empty Lines' },
+        m = { '<cmd>MarkdownPreviewToggle<cr>', 'Markdown Preview' },
+        n = { '<cmd>Telescope notify<cr>', 'Notifications' },
+        p = { '<cmd>CccPick<cr>', 'Pick Color' },
+        P = { '<cmd>CccConvert<cr>', 'Convert Color' },
+        x = { '<cmd>%SnipRun<cr>', 'Run File' },
     },
     d = {
         name = icons.ui.Database .. 'Database',
@@ -167,50 +155,46 @@ local mappings = {
         S = { '<cmd>lua require("dbee").store("json", "buffer", { extra_arg = 0 })<cr>', 'To JSON' },
         t = { '<cmd>lua require("dbee").store("table", "buffer", { extra_arg = 0 })<cr>', 'To Table' },
     },
-    E = {
-        name = icons.documents.OpenFolder .. 'Explorer',
-        e = { '<cmd>NvimTreeToggle<cr>', 'File Explorer' },
-        f = { '<cmd>NvimTreeFindFileToggle<CR>', 'Toggle file explorer on current file' },
-        r = { '<cmd>NvimTreeRefresh<CR>', 'Refresh file explorer' },
+    e = {
+        name = icons.ui.Pencil .. 'Edit',
+        a = { '<cmd>b#<cr>', 'Alternate File' },
+        c = { '<cmd>e $MYVIMRC<cr>', 'Config' },
+        d = { '<cmd>lua require("telescope.builtin").find_files({cwd = vim.fn.stdpath("config")})<cr>', 'Config Dir' },
+        E = { '<cmd>NvimTreeToggle<cr>', 'Explorer' },
+        f = { 'gf', 'File Under Cursor' },
+        l = { '<cmd>e ~/.config/shell/local.sh', 'Local Config' },
+        m = { '<cmd>e README.md<cr>', 'Readme' },
+        n = { '<cmd>enew<cr>', 'New File' },
+        z = { '<cmd>e $ZDOTDIR/.zshrc<cr>', 'Zsh Config' },
     },
     f = {
         name = icons.ui.Telescope .. 'Find',
-        b = { '<cmd>Telescope buffers<cr>', 'Buffers' },
         a = { '<cmd>lua require("telescope").extensions.menufacture.find_files()<cr>', 'All Files' },
-        d = { '<cmd>Telescope file_browser<cr>', 'Browse Folders' },
-        e = { '<cmd>Oil<cr>', 'Dir Editor' },
+        b = { '<cmd>Telescope buffers<cr>', 'Buffers' },
+        c = { '<cmd>Telescope git_bcommits<cr>', 'File Commits' },
         f = { '<cmd>lua require("telescope").extensions.menufacture.git_files()<cr>', 'Find files' },
         g = { '<cmd>lua require("telescope").extensions.menufacture.live_grep()<cr>', 'Find Text' },
-        G = { '<cmd>lua require("telescope").extensions.menufacture.grep_string()<cr>', 'Find Word' },
-        h = { '<cmd>Telescope help_tags<cr>', 'Help' },
-        H = { '<cmd>Telescope man_pages<cr>', 'Man Pages' },
-        k = { '<cmd>Telescope commands<cr>', 'Commands' },
-        K = { '<cmd>Telescope keymaps<cr>', 'Keymaps' },
-        l = { '<cmd>Telescope resume<cr>', 'Last Search' },
-        L = { '<cmd>Telescope loclist<cr>', 'Location List' },
-        n = { '<cmd>enew<cr>', 'New File' },
+        l = { '<cmd>Telescope loclist<cr>', 'Location List' },
         r = { '<cmd>Telescope oldfiles<cr>', 'Recent Files' },
-        p = { '<cmd>Telescope<cr>', 'Panel' },
-        s = { '<cmd>Telescope live_grep grep_open_files=true<cr>', 'Find in Open Files' },
-        t = { '<cmd>lua require("telescope").extensions.flutter.commands()<cr>', 'Flutter Tools' },
+        p = { '<cmd>Telescope resume<cr>', 'Last Search' },
+        q = { '<cmd>Telescope quickfix<cr>', 'Quickfix' },
+        s = { '<cmd>Telescope current_buffer_fuzzy_find<cr>', 'Fuzzy Find in File' },
+        S = { '<cmd>Telescope live_grep grep_open_files=true<cr>', 'Find in Open Files' },
+        t = { '<cmd>Telescope<cr>', 'Panel' },
         u = { '<cmd>Telescope undo<cr>', 'Undo History' },
-        U = { '<cmd>Telescope colorscheme<cr>', 'Colorscheme' },
-        ['"'] = { '<cmd>Telescope registers<cr>', 'Registers' },
-        ['.'] = { '<cmd>Telescope symbols<cr>', 'Emojis' },
-        [','] = { '<cmd>Nerdy<cr>', 'Nerd Glyphs' },
+        w = { '<cmd>lua require("telescope").extensions.menufacture.grep_string()<cr>', 'Find Word' },
     },
     g = {
         name = icons.git.Octoface .. 'Git',
         a = { '<cmd>Gitsigns stage_hunk<cr>', 'Stage Hunk' },
         A = { '<cmd>Gitsigns stage_buffer<cr>', 'Stage Buffer' },
-        b = { '<cmd>Gitsigns blame_line<cr>', 'Blame' },
+        b = { "<cmd>lua require('gitsigns').blame_line({full = true})<cr>", 'Blame' },
         B = { '<cmd>Telescope git_branches<cr>', 'Branches' },
-        c = { '<cmd>Telescope git_bcommits<cr>', 'File Commits' },
-        C = { '<cmd>Telescope git_commits<cr>', 'Commits' },
-        f = { '<cmd>Git<cr>', 'Fugitive' },
-        F = { '<cmd>CoAuthor<cr>', 'Find Co Author' },
+        c = { '<cmd>Git<cr>', 'Git Console' },
+        C = { '<cmd>CoAuthor<cr>', 'Co-Authors' },
         d = { '<cmd>Gitsigns preview_hunk<cr>', 'Preview Hunk' },
         D = { '<cmd>Gitsigns diffthis HEAD<cr>', 'Diff' },
+        f = { '<cmd>Telescope git_commits<cr>', 'Find Commits' },
         g = { '<cmd>Fterm lazygit<cr>', 'Lazygit' },
         j = { '<cmd>Gitsigns next_hunk<cr>', 'Next Hunk' },
         k = { '<cmd>Gitsigns prev_hunk<cr>', 'Prev Hunk' },
@@ -232,42 +216,111 @@ local mappings = {
         u = { '<cmd>Gitsigns undo_stage_hunk<cr>', 'Undo Stage Hunk' },
         v = { '<cmd>Gitsigns select_hunk<cr>', 'Select Hunk' },
     },
-    h = { name = icons.ui.Bookmark .. 'Harpoon' },
+    h = {
+        name = icons.ui.Question .. 'Help',
+        h = { '<cmd>Telescope help_tags<cr>', 'Help Pages' },
+        i = { vim.show_pos, 'Inspect Position' },
+        k = { '<cmd>Lspsaga hover_doc<cr>', 'Hover Doc' },
+        m = { '<cmd>Telescope man_pages<cr>', 'Man Pages' },
+    },
+    i = {
+        name = icons.ui.Download .. 'Insert',
+        d = { "<cmd>put =strftime('## %a %d %b %r')<cr>", 'Date' },
+        e = { '<cmd>Telescope symbols<cr>', 'Emojis' },
+        f = { "<cmd>put =expand('%:t')<cr>", 'File Name' },
+        n = { '<cmd>Nerdy<cr>', 'Nerd Glyphs' },
+        p = { '<cmd>put %<cr>', 'Relative Path' },
+        P = { '<cmd>put %:p<cr>', 'Absolute Path' },
+        r = { '<cmd>Telescope registers<cr>', 'Registers' },
+        t = { "<cmd>put =strftime('## %r')<cr>", 'Time' },
+    },
+    j = {
+        name = icons.ui.Jump .. 'Jump',
+        c = { '*', 'Word' },
+        d = { '<cmd>FlashDiagnostics<cr>', 'Diagnostics' },
+        f = { '<cmd>Telescope jumplist<cr>', 'Jumplist' },
+        h = { '<C-o>', 'Backward' },
+        j = { "<cmd>lua require('flash').remote()<cr>", 'Remote' },
+        k = { "<cmd>lua require('flash').treesitter()<cr>", 'Treesitter' },
+        l = { '<C-i>', 'Forward' },
+        n = {
+            "<cmd>lua require('flash').jump({search = { forward = true, wrap = false, multi_window = false },})<cr>",
+            'Search Forward',
+        },
+        N = {
+            "<cmd>lua require('flash').jump({search = { forward = false, wrap = false, multi_window = false },})<cr>",
+            'Search Backward',
+        },
+        p = { "<cmd>lua require('flash').jump({continue = true})<cr>", 'Previous Jump' },
+        s = { "<cmd>lua require('flash').jump()<cr>", 'Search' },
+        t = { "<cmd>lua require('flash').treesitter_search()<cr>", 'Remote Treesitter' },
+        w = { '<cmd>lua require("flash").jump({ pattern = vim.fn.expand("<cword>")})<cr>', 'Current Word' },
+    },
+    k = {
+        name = icons.ui.Keyboard .. 'Keys',
+        k = { '<cmd>Telescope keymaps<cr>', 'Keymaps' },
+        c = { '<cmd>Telescope commands<cr>', 'Commands' },
+        h = { '<cmd>Telescope command_history<cr>', 'Command History' },
+        s = { '<cmd>Telescope search_history<cr>', 'Search History' },
+    },
     l = {
-        name = icons.ui.Gear .. 'LSP',
+        name = icons.kind.TypeParameter .. 'LSP',
         a = { '<cmd>Lspsaga code_action<cr>', 'Code Action' },
         d = { '<cmd>Lspsaga peek_definition<cr>', 'Peek Definition' },
-        D = { '<cmd>Lspsaga goto_definition<cr>', 'Goto Definition' },
         f = { '<cmd>Lspsaga finder<cr>', 'Finder' },
-        F = { '<cmd>Telescope lsp_references<cr>', 'References' },
+        F = { '<cmd>Telescope lsp_references layout_strategy=vertical<cr>', 'References' },
+        g = { '<cmd>Lspsaga goto_definition<cr>', 'Goto Definition' },
         h = { '<cmd>Lspsaga hover_doc<cr>', 'Hover' },
-        i = { '<cmd>Telescope diagnostics<cr>', 'Diagnostics' },
-        I = { '<cmd>Lspsaga show_workspace_diagnostics<cr>', 'Workspace Diagnostics' },
+        i = { '<cmd>LspInfo<cr>', 'LSP Info' },
         j = { '<cmd>Lspsaga diagnostic_jump_next<cr>', 'Next Diagnostic' },
         k = { '<cmd>Lspsaga diagnostic_jump_prev<cr>', 'Prev Diagnostic' },
-        l = { "<cmd>lua require('lsp_lines').toggle()<cr>", 'Toggle LSP Lines' },
-        L = { '<cmd>LspInfo<cr>', 'LSP Info' },
+        l = { '<cmd>Telescope diagnostics layout_strategy=vertical<cr>', 'File Diagnostics' },
+        L = { '<cmd>Lspsaga show_workspace_diagnostics<cr>', 'Workspace Diagnostics' },
         o = { '<cmd>Lspsaga outline<cr>', 'Outline' },
         p = { '<cmd>Telescope lsp_incoming_calls<cr>', 'Incoming Calls' },
         P = { '<cmd>Telescope lsp_outgoing_calls<cr>', 'Outgoing Calls' },
         r = { '<cmd>Lspsaga rename<cr>', 'Rename' },
         R = { '<cmd>Lspsaga project_replace<cr>', 'Replace' },
-        s = { '<cmd>Telescope lsp_document_symbols<cr>', 'Document Symbols' },
+        s = { '<cmd>Telescope lsp_document_symbols theme=get_ivy<cr>', 'Document Symbols' },
         S = { '<cmd>Telescope lsp_dynamic_workspace_symbols<cr>', 'Workspace Symbols' },
         t = { '<cmd>Lspsaga peek_type_definition<cr>', 'Peek Type Definition' },
         T = { '<cmd>Lspsaga goto_type_definition<cr>', 'Goto Type Definition' },
     },
     m = {
-        name = icons.kind.Field .. 'Modes',
-        c = { '<cmd>CccHighlighterToggle<cr>', 'Highlight Colors' },
-        d = { '<cmd>Dashboard<cr>', 'Dashboard' },
-        h = { '<cmd>Hardtime toggle<cr>', 'Hardtime' },
-        m = { '<cmd>MarkdownPreviewToggle<cr>', 'Markdown Preview' },
-        n = { '<cmd>Telescope notify<cr>', 'Notifications' },
-        r = { '<cmd>%SnipRun<cr>', 'Run File' },
-        s = { '<cmd>set spell!<cr>', 'Spellcheck' },
-        z = { '<cmd>ZenMode<cr>', 'ZenMode' },
-        Z = { '<cmd>Twilight<cr>', 'Twilight' },
+        name = icons.ui.Bookmark .. 'Marks',
+        b = { "<cmd>lua require('telescope').extensions.marks_nvim.bookmarks_list_all()<cr>", 'Bookmarks' },
+        D = { "<cmd>lua require('marks').delete_buf()<cr>", 'Delete Buffer' },
+        d = { "<cmd>lua require('marks').delete_line()<cr>", 'Delete Line' },
+        P = { "<cmd>lua require('marks').preview()<cr>", 'Preview' },
+        x = { "<cmd>lua require('marks').delete_bookmark()<cr>", 'Delete Bookmark' },
+        h = { "<cmd>lua require('marks').next_bookmark()<cr>", 'Next Bookmark' },
+        j = { "<cmd>lua require('marks').next()<cr>", 'Next' },
+        k = { "<cmd>lua require('marks').prev()<cr>", 'Previous' },
+        l = { "<cmd>lua require('marks').prev_bookmark()<cr>", 'Previous Bookmark' },
+        m = { '<cmd>Telescope marks<cr>', 'All Marks' },
+        s = { "<cmd>lua require('marks').set_next()<cr>", 'Set Next' },
+        t = { "<cmd>lua require('marks').toggle()<cr>", 'Toggle' },
+
+        ['1'] = { "<cmd>lua require('marks').toggle_bookmark1()<cr>", 'Toggle Bookmark 0' },
+        ['2'] = { "<cmd>lua require('marks').toggle_bookmark2()<cr>", 'Toggle Bookmark 2' },
+        ['3'] = { "<cmd>lua require('marks').toggle_bookmark3()<cr>", 'Toggle Bookmark 3' },
+        ['4'] = { "<cmd>lua require('marks').toggle_bookmark4()<cr>", 'Toggle Bookmark 4' },
+
+        n = {
+            name = 'Next Bookmark Group',
+            ['1'] = { "<cmd>lua require('marks').next_bookmark1()<cr>", 'Next Bookmark 1' },
+            ['2'] = { "<cmd>lua require('marks').next_bookmark2()<cr>", 'Next Bookmark 2' },
+            ['3'] = { "<cmd>lua require('marks').next_bookmark3()<cr>", 'Next Bookmark 3' },
+            ['4'] = { "<cmd>lua require('marks').next_bookmark4()<cr>", 'Next Bookmark 4' },
+        },
+
+        p = {
+            name = 'Previous Bookmark Group',
+            ['1'] = { "<cmd>lua require('marks').prev_bookmark1()<cr>", 'Previous Bookmark 1' },
+            ['2'] = { "<cmd>lua require('marks').prev_bookmark2()<cr>", 'Previous Bookmark 2' },
+            ['3'] = { "<cmd>lua require('marks').prev_bookmark3()<cr>", 'Previous Bookmark 3' },
+            ['4'] = { "<cmd>lua require('marks').prev_bookmark4()<cr>", 'Previous Bookmark 4' },
+        },
     },
     n = {
         name = icons.ui.Note .. 'Notes',
@@ -276,10 +329,6 @@ local mappings = {
         f = { '<cmd>TdoFiles<cr>', 'All Notes' },
         g = { '<cmd>TdoFind<cr>', 'Find Notes' },
         h = { '<cmd>Tdo -1<cr>', "Yesterday's Todo" },
-        j = { "<cmd>put =strftime('%a %d %b %r')<cr>", 'Insert Human Date' },
-        J = { "<cmd>put =strftime('%F')<cr>", 'Insert Date' },
-        k = { "<cmd>put =strftime('%r')<cr>", 'Insert Human Time' },
-        K = { "<cmd>put =strftime('%F-%H-%M')<cr>", 'Insert Time' },
         l = { '<cmd>Tdo 1<cr>', "Tomorrow's Todo" },
         n = { '<cmd>TdoNote<cr>', 'New Note' },
         s = {
@@ -289,6 +338,13 @@ local mappings = {
         t = { '<cmd>TdoTodos<cr>', 'Incomplete Todos' },
         x = { '<cmd>TdoToggle<cr>', 'Toggle Todo' },
     },
+    o = {
+        name = icons.ui.Gear .. 'Options',
+        c = { '<cmd>Telescope colorscheme<cr>', 'Colorscheme' },
+        h = { '<cmd>Telescope highlights<cr>', 'Highlight Colors' },
+        n = { '<cmd>set relativenumber!<cr>', 'Relative Numbers' },
+        o = { '<cmd>Telescope vim_options<cr>', 'All Options' },
+    },
     p = {
         name = icons.ui.Package .. 'Packages',
         c = { '<cmd>Lazy check<cr>', 'Check' },
@@ -303,8 +359,16 @@ local mappings = {
         u = { '<cmd>Lazy update<cr>', 'Update' },
         x = { '<cmd>Lazy clean<cr>', 'Clean' },
     },
+    q = {
+        name = icons.ui.Close .. 'Quit',
+        a = { '<cmd>qall<cr>', 'Quit All' },
+        b = { '<cmd>bw<cr>', 'Close Buffer' },
+        d = { '<cmd>bdelete<cr>', 'Delete Buffer' },
+        f = { '<cmd>qall!<cr>', 'Force Quit' },
+        q = { '<cmd>q<cr>', 'Quit' },
+    },
     r = {
-        name = icons.diagnostics.Hint .. 'Refactor',
+        name = icons.ui.Code .. 'Refactor',
         b = { "<cmd>lua require('spectre').open_file_search()<cr>", 'Replace Buffer' },
         e = { "<cmd>lua require('refactoring').refactor('Extract Block')<CR>", 'Extract Block' },
         f = { "<cmd>lua require('refactoring').refactor('Extract Block To File')<CR>", 'Extract To File' },
@@ -323,23 +387,6 @@ local mappings = {
         v = { "<cmd>lua require('refactoring').refactor('Extract Variable')<CR>", 'Extract Variable' },
         w = { "<cmd>lua require('spectre').open_visual({select_word=true})<cr>", 'Replace Word' },
     },
-    t = {
-        name = icons.ui.Terminal .. 'Terminal',
-        ['`'] = { '<cmd>Sterm<cr>', 'Horizontal Terminal' },
-        n = { '<cmd>Sterm node<cr>', 'Node' },
-        p = { '<cmd>Sterm bpython<cr>', 'Python' },
-        r = { '<cmd>Sterm irb<cr>', 'Ruby' },
-        s = { '<cmd>Sterm<cr>', 'Horizontal Terminal' },
-        t = { '<cmd>Fterm<cr>', 'Terminal' },
-        v = { '<cmd>Vterm<cr>', 'Vertical Terminal' },
-    },
-    T = {
-        name = icons.ui.Test .. 'Test',
-        f = { '<cmd>lua require("neotest").run.run(vim.fn.expand("%"))<cr>', 'Run Test' },
-        F = { '<cmd>lua require("neotest").run.run()<cr>', 'Run Current Test' },
-        o = { '<cmd>Neotest output-panel<cr>', 'Test Output' },
-        O = { '<cmd>Neotest summary<cr>', 'Test Summary' },
-    },
     s = {
         name = icons.ui.Windows .. 'Split',
         [','] = { '<cmd>NavigatorPrevious<cr>', 'Previous Split' },
@@ -352,23 +399,54 @@ local mappings = {
         j = { '<C-w>j', 'Move Down' },
         k = { '<C-w>k', 'Move Up' },
         l = { '<C-w>l', 'Move Right' },
-        L = { '<cmd>tablast<cr>', 'Last Tab' },
-        o = { '<cmd>tabnext<cr>', 'Next Tab' },
-        O = { '<cmd>tabprevious<cr>', 'Previous Tab' },
         p = { '<C-w>p', 'Previous Window' },
-        q = { '<cmd>bw<cr>', 'Close Current Buf' },
         s = { '<cmd>split<cr>', 'Horizontal Split File' },
-        t = { '<cmd>tabnew<cr>', 'New Tab' },
         v = { '<cmd>vsplit<cr>', 'Vertical Split File' },
-        W = { "<cmd>lua require'utils'.sudo_write()<cr>", 'Force Write' },
-        w = { '<cmd>w<cr>', 'Write' },
-        x = { '<cmd>x<cr>', 'Write and Quit' },
     },
+    t = {
+        name = icons.ui.Terminal .. 'Terminal',
+        ['`'] = { '<cmd>Sterm<cr>', 'Horizontal Terminal' },
+        n = { '<cmd>Sterm node<cr>', 'Node' },
+        p = { '<cmd>Sterm bpython<cr>', 'Python' },
+        r = { '<cmd>Sterm irb<cr>', 'Ruby' },
+        s = { '<cmd>Sterm<cr>', 'Horizontal Terminal' },
+        t = { '<cmd>Fterm<cr>', 'Terminal' },
+        v = { '<cmd>Vterm<cr>', 'Vertical Terminal' },
+    },
+    u = {
+        name = icons.ui.Test .. 'Test',
+        f = { '<cmd>lua require("neotest").run.run(vim.fn.expand("%"))<cr>', 'Run Test' },
+        F = { '<cmd>lua require("neotest").run.run()<cr>', 'Run Current Test' },
+        o = { '<cmd>Neotest output-panel<cr>', 'Test Output' },
+        O = { '<cmd>Neotest summary<cr>', 'Test Summary' },
+    },
+    v = {
+        name = icons.ui.Star .. 'Select',
+        p = { 'vip', 'Paragraph' },
+        P = { 'vap', 'Around Para' },
+        q = { 'viq', 'Quote' },
+        Q = { 'vaq', 'Around Quote' },
+        b = { 'vib', 'Bracket' },
+        B = { 'vab', 'Around Bracket' },
+    },
+    w = {
+        name = icons.kind.File .. 'Writing',
+        f = { "<cmd>lua require'utils'.sudo_write()<cr>", 'Force Write' },
+        j = { ']s', 'Next Misspell' },
+        k = { '[s', 'Prev Misspell' },
+        c = { '<cmd>set spell!<cr>', 'Spellcheck' },
+        s = { '<cmd>Telescope spell_suggest<cr>', 'Suggestions' },
+        t = { '<cmd>Twilight<cr>', 'Twilight' },
+        w = { '<cmd>w<cr>', 'Write' },
+        z = { '<cmd>ZenMode<cr>', 'ZenMode' },
+    },
+    x = { '<cmd>x<cr>', icons.ui.SignOut .. 'Save and Quit' },
     y = {
         name = icons.ui.Clipboard .. 'Yank',
-        f = { '<cmd>%y+<cr>', 'Copy Whole File' },
-        p = { '<cmd>CRpath<cr>', 'Copy Relative Path' },
-        P = { '<cmd>CApath<cr>', 'Copy Absolute Path' },
+        a = { '<cmd>%y+<cr>', 'Copy Whole File' },
+        f = { '<cmd>CopyFileName<cr>', 'File Name' },
+        p = { '<cmd>CopyRelativePath<cr>', 'Relative Path' },
+        P = { '<cmd>CopyAbsolutePath<cr>', 'Absolute Path' },
         g = { '<cmd>lua require"gitlinker".get_buf_range_url()<cr>', 'Copy Git URL' },
     },
 }
@@ -383,12 +461,54 @@ local vopts = {
 }
 
 local vmappings = {
+    a = {
+        name = icons.ui.Copilot .. 'AI',
+        c = { '<cmd>CopilotChatToggle<cr>', 'Copilot Chat' },
+        d = { '<cmd>CopilotChatDocs<cr>', 'Docs' },
+        e = { '<cmd>CopilotChatExplain<cr>', 'Explain' },
+        f = { '<cmd>CopilotChatFix<cr>', 'Fix' },
+        F = { '<cmd>CopilotChatFixDiagnostic<cr>', 'Fix Diagnostic' },
+        g = { '<cmd>CopilotChatCommit<cr>', 'Commit' },
+        G = { '<cmd>CopilotChatCommitStaged<cr>', 'Commit Staged' },
+        o = { '<cmd>CopilotChatOptimize<cr>', 'Optimize' },
+        r = { '<cmd>CopilotChatReview<cr>', 'Review' },
+        t = { '<cmd>CopilotChatTests<cr>', 'Tests' },
+    },
+    c = {
+        name = icons.ui.Neovim .. 'Code',
+        s = { ':sort<cr>', 'Sort Asc' },
+        S = { ':sort!<cr>', 'Sort Desc' },
+        u = { ':!uniq<cr>', 'Unique' },
+    },
+    g = {
+        name = icons.git.Octoface .. 'Git',
+        a = { '<cmd>Gitsigns stage_hunk<cr>', 'Stage Hunk' },
+        r = { '<cmd>Gitsigns reset_hunk<cr>', 'Reset Hunk' },
+    },
+    j = {
+        name = icons.ui.Jump .. 'Jump',
+        d = { '<cmd>FlashDiagnostics<cr>', 'Diagnostics' },
+        j = { "<cmd>lua require('flash').remote()<cr>", 'Remote' },
+        k = { "<cmd>lua require('flash').treesitter()<cr>", 'Treesitter' },
+        n = {
+            "<cmd>lua require('flash').jump({search = { forward = true, wrap = false, multi_window = false },})<cr>",
+            'Search Forward',
+        },
+        N = {
+            "<cmd>lua require('flash').jump({search = { forward = false, wrap = false, multi_window = false },})<cr>",
+            'Search Backward',
+        },
+        p = { "<cmd>lua require('flash').jump({continue = true})<cr>", 'Previous Jump' },
+        s = { "<cmd>lua require('flash').jump()<cr>", 'Search' },
+        t = { "<cmd>lua require('flash').treesitter_search()<cr>", 'Remote Treesitter' },
+        w = { '<cmd>lua require("flash").jump({ pattern = vim.fn.expand("<cword>")})<cr>', 'Current Word' },
+    },
     l = {
-        name = icons.ui.Gear .. 'LSP',
+        name = icons.kind.TypeParameter .. 'LSP',
         a = '<cmd><C-U>Lspsaga range_code_action<CR>',
     },
     r = {
-        name = icons.diagnostics.Hint .. 'Refactor',
+        name = icons.ui.Code .. 'Refactor',
         r = { "<Esc><cmd>lua require('telescope').extensions.refactoring.refactors()<CR>", 'Refactor Commands' },
         e = { "<esc><cmd>lua require('refactoring').refactor('Extract Function')<CR>", 'Extract Function' },
         f = { "<esc><cmd>lua require('refactoring').refactor('Extract Function To File')<CR>", 'Extract To File' },
@@ -396,9 +516,6 @@ local vmappings = {
         i = { "<esc><cmd>lua require('refactoring').refactor('Inline Variable')<CR>", 'Inline Variable' },
     },
     s = { "<esc><cmd>'<,'>SnipRun<cr>", icons.ui.Play .. 'Run Code' },
-    q = { '<cmd>q<cr>', icons.ui.Close .. 'Quit' },
-    Q = { '<cmd>qa!<cr>', icons.ui.Power .. 'Force Quit!' },
-    x = { '<cmd>x<cr>', icons.ui.Pencil .. 'Write and Quit' },
     y = {
         name = icons.ui.Clipboard .. 'Yank',
         g = { '<cmd>lua require"gitlinker".get_buf_range_url("v")<cr>', 'Copy Git URL' },
diff --git a/lua/plugins/ui/onedark.lua b/lua/plugins/ui/onedark.lua
index 6534f1f..f0275b9 100644
--- a/lua/plugins/ui/onedark.lua
+++ b/lua/plugins/ui/onedark.lua
@@ -7,7 +7,7 @@ onedark.setup({
     ending_tildes = false,
     cmp_itemkind_reverse = false,
 
-    toggle_style_key = '<leader>ct',
+    toggle_style_key = '<leader>ot',
     toggle_style_list = { 'dark', 'darker', 'cool', 'warm', 'warmer', 'deep', 'light' },
 
     -- Options are italic, bold, underline, none and combos 'italic,bold'